Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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/JgEnableDisableServiceImpl.java

@@ -42,6 +42,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -101,6 +102,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     @Autowired
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
+    @Autowired
+    private Sequence sequence;
+
     /**
      * 设备状态:启用
      */
@@ -121,11 +125,12 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             // 获取申请编号
             ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
             jgEnableDisable.setApplyNo(listResponseModel.getResult().get(0));
+            jgEnableDisable.setSequenceNbr(sequence.nextId());
         }
         jgEnableDisable.setCreateDate(new Date());
         String submit = String.valueOf(map.get("submit"));
         String pageType = String.valueOf(map.get("formType"));
-        String record = String.valueOf(map.get("record"));
+        List<Map<String, Object>> equipments = (List<Map<String, Object>>) map.get("equipments");
         String businessCode = ObjectUtils.isEmpty(map.get("applyType"))?String.valueOf(map.get("businessCode")):String.valueOf(map.get("applyType"));
         // 接收机构
         String[] receiveOrgCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
@@ -134,12 +139,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         WorkflowResultDto workflowResultDto = new WorkflowResultDto();
         List<ProcessTaskDTO> processTaskDTOS = new ArrayList<>();
         jgEnableDisable.setOtherAccessories(JSONObject.toJSONString(Optional.ofNullable(map.get("otherAccessories")).orElse(Collections.emptyMap())));
-        jgEnableDisable.setEquList("null".equals(record) ? "null" : String.valueOf(map.get("equListDesc")));
-        jgEnableDisable.setSupervisoryCode("null".equals(record) ? "null" : String.valueOf(map.get("supervisoryCode")));
-
-        jgEnableDisable.setEquCategory(ObjectUtils.isEmpty(map.get("equCategoryDesc")) ? null : map.get("equCategoryDesc").toString());
-        jgEnableDisable.setProductName(ObjectUtils.isEmpty(map.get("productName")) ? null : map.get("productName").toString());
-        jgEnableDisable.setAddress(ObjectUtils.isEmpty(map.get("fullAddress")) ? null : map.get("fullAddress").toString());
 
         if (SUBMIT_TYPE_FLOW.equals(submit)) {
             if (map.containsKey("instanceId") && !ObjectUtils.isEmpty(map.get("instanceId"))){
@@ -201,9 +200,17 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                 }
             } else {
                 // 启动工作流并返回信息
-                workflowResultList = workFlowInfo(submit, record,receiveOrgCode[0]);
+                workflowResultList = workFlowInfo(submit, jgEnableDisable,receiveOrgCode[0]);
                 //业务数据组装等
                 businessData(submit, reginParams, jgEnableDisable, map, workflowResultList);
+
+                // 关联设备表
+                for (Map<String, Object> equipment : equipments) {
+                    JgEnableDisableEq jgEnableDisableEq = new JgEnableDisableEq();
+                    jgEnableDisableEq.setEquId(String.valueOf(equipment.get("SEQUENCE_NBR")));
+                    jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
+                    jgEnableDisableEqService.saveOrUpdate(jgEnableDisableEq);
+                }
             }
 
             commonService.saveExecuteFlowData2Redis(jgEnableDisable.getInstanceId(), buildInstanceRuntimeData(jgEnableDisable));
@@ -238,15 +245,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         } else {
             buildTask(Arrays.asList(jgEnableDisable), businessCode, workflowResultList, Boolean.TRUE);
         }
-        if(!"null".equals(record)){
-            // 关联设备表
-            JgEnableDisableEq jgEnableDisableEq = new JgEnableDisableEq();
-            jgEnableDisableEq.setEquId(record);
-            jgEnableDisableEq.setEnableDisableApplyId(jgEnableDisable.getSequenceNbr().toString());
-            jgEnableDisableEqService.saveOrUpdate(jgEnableDisableEq);
-        }
         // 保存历史表
-        commonService.saveOrUpdateHistory(this.getRegistrationClass(jgEnableDisable), map, record, jgEnableDisable.getSequenceNbr().toString());
+        commonService.saveOrUpdateHistory(this.getRegistrationClass(jgEnableDisable), map, null, jgEnableDisable.getSequenceNbr().toString());
         return Collections.singletonList(jgEnableDisable);
     }
 
@@ -402,16 +402,16 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     /**
      * 工作流启动并执行
      * @param submitType 是否提交
-     * @param record 设备record
+     * @param jgEnableDisable 业务数据
      * @return 工作流返回相关数据
      */
-    private List<WorkflowResultDto> workFlowInfo(String submitType, String record,String receiveOrgCode) {
+    private List<WorkflowResultDto> workFlowInfo(String submitType, JgEnableDisable jgEnableDisable,String receiveOrgCode) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
             ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
             dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-            dto.setBusinessKey(record);
+            dto.setBusinessKey(jgEnableDisable.getApplyNo());
             dto.setCompleteFirstTask(Boolean.TRUE);
             dto.setNextExecuteUserCompanyCode(receiveOrgCode);
             list.add(dto);
@@ -724,25 +724,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     public Map<String, Object> getDetail(Long sequenceNbr) {
         Map<String, Object> resultMap = new HashMap<>();
         JgEnableDisable enableDisable = this.getById(sequenceNbr);
-        Map<String, Object> beanMap = BeanUtil.beanToMap(enableDisable, false, true);
-        if(enableDisable.getAuditStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
-            // 完成状态查询历史表
-            JSONObject jsonObject = commonService.queryHistoryData(sequenceNbr);
-            // 兼容老数据
-            if(jsonObject == null){
-                // 新数据逻辑
-                fillRuntimeEquipInfoData(sequenceNbr, resultMap);
-            } else {
-                // 老数据逻辑
-                CommonServiceImpl.formatTime2StrDateForEquip(jsonObject);
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new LambdaQueryWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr));
+        if (jgRegistrationHistory != null) {
+            JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
             resultMap.putAll(jsonObject);
         }
-            resultMap.putAll(beanMap);
-        } else {
-            // 其他状态显示实时数据
-            fillRuntimeEquipInfoData(sequenceNbr, resultMap);
-            resultMap.putAll(beanMap);
-        }
         resultMap.put("receiveOrgCode", enableDisable.getReceiveCompanyCode() + '_' + enableDisable.getReceiveOrgName());
         commonService.convertStringToJsonobject(resultMap, new String[]{"otherAccessories"});
         return resultMap;