数据完善

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/process/ProcessGroupApiImpl.java

@@ -1,6 +1,12 @@
 package com.cf.imes.module.system.api.process;
 
+import com.cf.imes.framework.common.util.object.BeanUtils;
+import com.cf.imes.module.system.api.process.dto.ProcessListReqDTO;
+import com.cf.imes.module.system.api.process.dto.ProcessRespDTO;
+import com.cf.imes.module.system.dal.dataobject.process.ProcessDO;
+import com.cf.imes.module.system.dal.dataobject.process.ProcessGroupDO;
 import com.cf.imes.module.system.dal.mysql.process.ProcessGroupMapper;
+import com.cf.imes.module.system.dal.mysql.process.ProcessMapper;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,10 +22,27 @@ public class ProcessGroupApiImpl implements ProcessGroupApi {
     @Resource
     private ProcessGroupMapper processGroupMapper;
 
+    @Resource
+    private ProcessMapper processMapper;
+
     @Override
     public Boolean getProcessGroup(Long groupId) {
         if (processGroupMapper.selectById(groupId) == null)
             return false;
         return true;
     }
+
+    @Override
+    public ProcessListReqDTO getProcessGroupDetail(Long groupId) {
+        ProcessGroupDO processGroupDO = processGroupMapper.selectById(groupId);
+        if (processGroupDO == null)
+            throw exception(PROCESS_GROUP_NOT_EXISTS);
+        String[] items = processGroupDO.getItems().split(",");
+        ProcessListReqDTO processListReqDTO = BeanUtils.toBean(processGroupDO, ProcessListReqDTO.class);
+        for (String item : items) {
+            ProcessDO processDO = processMapper.selectById(Long.parseLong(item));
+            processListReqDTO.getLists().add(BeanUtils.toBean(processDO, ProcessRespDTO.class));
+        }
+        return processListReqDTO;
+    }
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/rpc/config/RpcConfiguration.java

@@ -1,11 +1,12 @@
 package com.cf.imes.module.system.framework.rpc.config;
 
+import com.cf.imes.module.executor.api.orderProcess.OrderProcessApi;
 import com.cf.imes.module.infra.api.file.FileApi;
 import com.cf.imes.module.infra.api.websocket.WebSocketSenderApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class})
+@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, OrderProcessApi.class})
 public class RpcConfiguration {
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java

@@ -2,6 +2,7 @@ package com.cf.imes.module.system.service.process;
 
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
+import com.cf.imes.module.executor.api.orderProcess.OrderProcessApi;
 import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSimpleRespVO;
 import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupPageReqVO;
 import com.cf.imes.module.system.controller.admin.process.vo.group.ProcessGroupRespVO;
@@ -48,6 +49,9 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
     @Resource
     private ProcessMapper processMapper;
 
+    @Resource
+    private OrderProcessApi orderProcessApi;
+
     @Override
     public Long createProcessGroup(ProcessGroupSaveReqVO createReqVO) {
         // 插入
@@ -78,10 +82,18 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
     public void deleteProcessGroup(Long id) {
         // 校验存在
         validateProcessGroupExists(id);
+        // 判断是否在生产中使用这个加工组，如果使用则不能删除
+//        checkProcessGroupUsed(id);
         // 删除
         processGroupMapper.deleteById(id);
     }
 
+    // 判断是否在生产中使用这个加工组
+    private void checkProcessGroupUsed(Long id) {
+        if (orderProcessApi.getOrderProcessByProcessGroupId(id) != null){
+            throw exception(PROCESS_GROUP_USED);
+        }
+    }
     private void validateProcessGroupExists(Long id) {
         if (processGroupMapper.selectById(id) == null) {
             throw exception(PROCESS_GROUP_NOT_EXISTS);

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java

@@ -56,6 +56,7 @@ public class GroupServiceImplTest extends BaseDbUnitTest {
         assertPojoEquals(createReqVO, group, "id");
     }
 
+
 /*    @Test
     public void testUpdateGroup_success() {
         // mock 数据
@@ -145,6 +146,6 @@ public class GroupServiceImplTest extends BaseDbUnitTest {
        assertEquals(1, pageResult.getTotal());
        assertEquals(1, pageResult.getList().size());
        assertPojoEquals(dbGroup, pageResult.getList().get(0));
-    }
+    }*/
 
 }