diff --git a/op-modules/op-mes/op-modules-mes.iml b/op-modules/op-mes/op-modules-mes.iml index 84a484f12..c65dbc08b 100644 --- a/op-modules/op-mes/op-modules-mes.iml +++ b/op-modules/op-mes/op-modules-mes.iml @@ -1,5 +1,5 @@ - + diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java index b7b2f47fd..918020eb3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/ProRfidProcessDetailController.java @@ -28,7 +28,7 @@ import com.op.common.core.web.page.TableDataInfo; * @date 2023-08-18 */ @RestController -@RequestMapping("/detail") +@RequestMapping("/rfidProcess") public class ProRfidProcessDetailController extends BaseController { @Autowired private IProRfidProcessDetailService proRfidProcessDetailService; @@ -36,7 +36,7 @@ public class ProRfidProcessDetailController extends BaseController { /** * 查询生产rfid流程列表 */ - @RequiresPermissions("system:detail:list") + @RequiresPermissions("mes:detail:list") @GetMapping("/list") public TableDataInfo list(ProRfidProcessDetail proRfidProcessDetail) { startPage(); @@ -47,7 +47,7 @@ public class ProRfidProcessDetailController extends BaseController { /** * 导出生产rfid流程列表 */ - @RequiresPermissions("system:detail:export") + @RequiresPermissions("mes:detail:export") @Log(title = "生产rfid流程", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ProRfidProcessDetail proRfidProcessDetail) { @@ -59,7 +59,7 @@ public class ProRfidProcessDetailController extends BaseController { /** * 获取生产rfid流程详细信息 */ - @RequiresPermissions("system:detail:query") + @RequiresPermissions("mes:detail:query") @GetMapping(value = "/{recordId}") public AjaxResult getInfo(@PathVariable("recordId") String recordId) { return success(proRfidProcessDetailService.selectProRfidProcessDetailByRecordId(recordId)); @@ -68,7 +68,7 @@ public class ProRfidProcessDetailController extends BaseController { /** * 新增生产rfid流程 */ - @RequiresPermissions("system:detail:add") + @RequiresPermissions("mes:detail:add") @Log(title = "生产rfid流程", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ProRfidProcessDetail proRfidProcessDetail) { @@ -78,7 +78,7 @@ public class ProRfidProcessDetailController extends BaseController { /** * 修改生产rfid流程 */ - @RequiresPermissions("system:detail:edit") + @RequiresPermissions("mes:detail:edit") @Log(title = "生产rfid流程", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ProRfidProcessDetail proRfidProcessDetail) { @@ -88,7 +88,7 @@ public class ProRfidProcessDetailController extends BaseController { /** * 删除生产rfid流程 */ - @RequiresPermissions("system:detail:remove") + @RequiresPermissions("mes:detail:remove") @Log(title = "生产rfid流程", businessType = BusinessType.DELETE) @DeleteMapping("/{recordIds}") public AjaxResult remove(@PathVariable String[] recordIds) { diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRfidProcessDetailServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRfidProcessDetailServiceImpl.java index 74ec7c0cb..4b758589b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRfidProcessDetailServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProRfidProcessDetailServiceImpl.java @@ -1,6 +1,8 @@ package com.op.mes.service.impl; import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,6 +28,7 @@ public class ProRfidProcessDetailServiceImpl implements IProRfidProcessDetailSer * @return 生产rfid流程 */ @Override + @DS("#header.poolName") public ProRfidProcessDetail selectProRfidProcessDetailByRecordId(String recordId) { return proRfidProcessDetailMapper.selectProRfidProcessDetailByRecordId(recordId); } @@ -37,6 +40,7 @@ public class ProRfidProcessDetailServiceImpl implements IProRfidProcessDetailSer * @return 生产rfid流程 */ @Override + @DS("#header.poolName") public List selectProRfidProcessDetailList(ProRfidProcessDetail proRfidProcessDetail) { return proRfidProcessDetailMapper.selectProRfidProcessDetailList(proRfidProcessDetail); } @@ -48,6 +52,7 @@ public class ProRfidProcessDetailServiceImpl implements IProRfidProcessDetailSer * @return 结果 */ @Override + @DS("#header.poolName") public int insertProRfidProcessDetail(ProRfidProcessDetail proRfidProcessDetail) { proRfidProcessDetail.setCreateTime(DateUtils.getNowDate()); return proRfidProcessDetailMapper.insertProRfidProcessDetail(proRfidProcessDetail); @@ -60,6 +65,7 @@ public class ProRfidProcessDetailServiceImpl implements IProRfidProcessDetailSer * @return 结果 */ @Override + @DS("#header.poolName") public int updateProRfidProcessDetail(ProRfidProcessDetail proRfidProcessDetail) { proRfidProcessDetail.setUpdateTime(DateUtils.getNowDate()); return proRfidProcessDetailMapper.updateProRfidProcessDetail(proRfidProcessDetail); @@ -72,6 +78,7 @@ public class ProRfidProcessDetailServiceImpl implements IProRfidProcessDetailSer * @return 结果 */ @Override + @DS("#header.poolName") public int deleteProRfidProcessDetailByRecordIds(String[] recordIds) { return proRfidProcessDetailMapper.deleteProRfidProcessDetailByRecordIds(recordIds); } @@ -83,6 +90,7 @@ public class ProRfidProcessDetailServiceImpl implements IProRfidProcessDetailSer * @return 结果 */ @Override + @DS("#header.poolName") public int deleteProRfidProcessDetailByRecordId(String recordId) { return proRfidProcessDetailMapper.deleteProRfidProcessDetailByRecordId(recordId); }