维修告知接口调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintainNoticeServiceImpl.java

@@ -29,7 +29,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -49,6 +48,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -78,8 +78,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     JgMaintainNoticeEqMapper jgMaintainNoticeEqMapper;
     @Autowired
     private JgMaintainNoticeMapper jgMaintainNoticeMapper;
+//    @Autowired
+//    private ICreateCodeService iCreateCodeService;
+
     @Autowired
-    private ICreateCodeService iCreateCodeService;
+    TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
     RegistrationInfoMapper tzsJgRegistrationInfoMapper;
 
@@ -87,9 +90,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     OtherInfoMapper tzsJgOtherInfoMapper;
 
     @Autowired
-    TzsServiceFeignClient tzsServiceFeignClient;
-
-    @Autowired
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
 
     @Autowired
@@ -386,13 +386,18 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         // 获取告知设备列表
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
-            return;
+            log.error(" 获取告知设备列表");
+            throw new RuntimeException();
         }
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());
-        if (CollectionUtils.isEmpty(applyNoList)) {
-            return;
+//        List<String> applyNoList = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());
+        ResponseModel<List<String>> applyNoResult =tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), deviceList.size());
+
+        if (CollectionUtils.isEmpty(applyNoResult.getResult())) {
+            log.error(" 获取告知单号失败");
+            throw new RuntimeException();
         }
+        List<String> applyNoList = applyNoResult.getResult();
         ArrayList<String> roleListFirst = new ArrayList<>();
         ArrayList<String> roleListSecond = new ArrayList<>();
         // 判断当前是否为提交
@@ -411,7 +416,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
-
             try {
                 FeignClientResult result = Workflow.taskV2Client.startByVariableBatch(actWorkflowBatchDTO);
                 List<Object> returnList = (List<Object>) result.getResult();
@@ -453,7 +457,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 log.error("提交失败：{}", e);
             }
         }
-
         List<JgMaintainNotice> list = new ArrayList<>();
         List<JgMaintainNoticeEq> equipList = new ArrayList<>();
         deviceList.forEach(obj -> {
@@ -486,17 +489,13 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
-
         jgMaintainNoticeMapper.insertBatchSomeColumn(list);
-
         List<JgMaintainNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
             List<JgMaintainNotice> collect = list.stream().filter(JgMaintainNotice -> jgRelationEquip.getEquipTransferId().equals(JgMaintainNotice.getApplyNo())).collect(Collectors.toList());
             Long sequenceNbr = collect.get(0).getSequenceNbr();
             return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
         }).collect(Collectors.toList());
-
         jgMaintainNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-
     }
 
     void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {