1.维保记录按照rec_date 排序取最新的，创建设备时不再，新增空白的维保记录，维保记录的创建只要维保备案业务、历史设备的录入。

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

@@ -12,5 +12,10 @@ public interface IIdxBizJgMaintenanceRecordInfoService {
 
     boolean saveOrUpdateData(IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo);
 
+    /**
+     * 按照创建日期倒叙排列，查询最新的一条维保信息
+     * @param record 设备唯一标识
+     * @return 查询最新的一条维保信息
+     */
     IdxBizJgMaintenanceRecordInfo queryNewestDetailByRecord(String record);
 }

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

@@ -25,16 +25,19 @@ public class IdxBizJgMaintenanceRecordInfoServiceImpl extends BaseService<IdxBiz
         return this.saveOrUpdate(maintenanceRecordInfo);
     }
 
-    //查询最新的记录
+    /**
+     * 查询最新的维保记录
+     */
+    @Override
     public IdxBizJgMaintenanceRecordInfo queryNewestDetailByRecord(String record) {
-        IdxBizJgMaintenanceRecordInfo result = new IdxBizJgMaintenanceRecordInfo();
         QueryWrapper<IdxBizJgMaintenanceRecordInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord,record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getInformEnd);
-        List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = list(queryWrapper);
-        if(!ValidationUtil.isEmpty(maintenanceRecordInfoList)){
-            BeanUtils.copyProperties(maintenanceRecordInfoList.get(0),result);
+        queryWrapper.lambda().eq(IdxBizJgMaintenanceRecordInfo::getRecord,record).orderByDesc(IdxBizJgMaintenanceRecordInfo::getRecDate).last("limit 1");
+        IdxBizJgMaintenanceRecordInfo init = new IdxBizJgMaintenanceRecordInfo();
+        IdxBizJgMaintenanceRecordInfo last = getOne(queryWrapper);
+        if(last != null){
+            init = last;
         }
-        return result;
+        return init;
     }
 
 

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

@@ -2316,8 +2316,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgConstructionInfo.class);
         // 注册登记信息
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgRegisterInfo.class);
-        // 维保备案
-        IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgMaintenanceRecordInfo.class);
         // 监督管理
         IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgSupervisionInfo.class);
         // 其他信息
@@ -2442,12 +2440,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         registerInfo.setUseOrgCode(isCopy ? "" : registerInfo.getUseOrgCode());
         this.saveOrUpdate(registerInfo);
 
-        // 维保备案
-        maintenanceRecordInfo.setRecord(record);
-        maintenanceRecordInfo.setRecDate(date);
-        maintenanceRecordInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("MAINTENANCERECORDINFO_SEQ")));
-        iIdxBizJgMaintenanceRecordInfoService.saveOrUpdateData(maintenanceRecordInfo);
-
         // 监督管理
         supervisionInfo.setRecord(record);
         supervisionInfo.setRecDate(date);

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

@@ -697,27 +697,28 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
         lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
         List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
-        ArrayList<IdxBizJgMaintenanceRecordInfo> data = new ArrayList<>();
+        List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = new ArrayList<>();
         // 循环设备
         list.forEach(item -> {
-            IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(item.getEquId());
-            if (!ObjectUtils.isEmpty(info)) {
-                info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
-                info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
-                info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
-                info.setMeMasterPhone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOnePhone()) ? null : jgMaintenanceContract.getMaintenanceManagerOnePhone());
-                info.setMeMasterId(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneIdNum()) ? null : jgMaintenanceContract.getMaintenanceManagerOneIdNum());
-                info.setMeMaster1(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoName()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoName());
-                info.setMeMaster1Phone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoPhone()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoPhone());
-                info.setMeMaster1Id(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoIdNum()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoIdNum());
-                info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
-                info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
-                info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
-                data.add(info);
-            }
+            IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+            info.setRecord(item.getEquId());
+            info.setRecDate(new Date());
+            info.setRecUserId(RequestContext.getExeUserId());
+            info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
+            info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
+            info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
+            info.setMeMasterPhone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOnePhone()) ? null : jgMaintenanceContract.getMaintenanceManagerOnePhone());
+            info.setMeMasterId(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneIdNum()) ? null : jgMaintenanceContract.getMaintenanceManagerOneIdNum());
+            info.setMeMaster1(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoName()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoName());
+            info.setMeMaster1Phone(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoPhone()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoPhone());
+            info.setMeMaster1Id(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerTwoIdNum()) ? null : jgMaintenanceContract.getMaintenanceManagerTwoIdNum());
+            info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
+            info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
+            info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
+            maintenanceRecordInfoList.add(info);
         });
-        idxBizJgMaintenanceRecordInfoService.updateBatchById(data);
-        emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(data), 2, false);
+        idxBizJgMaintenanceRecordInfoService.saveBatch(maintenanceRecordInfoList);
+        emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(maintenanceRecordInfoList), 2, false);
     }
 
 

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

@@ -600,13 +600,13 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         return useFlagParamDto;
     }
 
-    public void setInspectField(String record, UseFlagParamDto useFlagParamDto) {
+    private void setInspectField(String record, UseFlagParamDto useFlagParamDto) {
         Map<String, Object> inspectDetail = jgUseRegistrationMapper.getInspectDetail(record, null);
         useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
         useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
     }
 
-    public void setMainInfoField(String record, UseFlagParamDto useFlagParamDto) {
+    private void setMainInfoField(String record, UseFlagParamDto useFlagParamDto) {
         IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(record);
 
         useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));

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

@@ -2333,13 +2333,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return useFlagParamDto;
     }
 
-    public void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+    private void setInspectField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
         Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(registerInfo.getRecord(), null);
         useFlagParamDto.setInspectionUnitName(inspectDetail.get("inspectOrgName") == null ? "" : inspectDetail.get("inspectOrgName").toString());
         useFlagParamDto.setNextInspectionDate(inspectDetail.get("nextInspectDate") == null ? null : (Date) inspectDetail.get("nextInspectDate"));
     }
 
-    public void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
+    private void setMainInfoField(IdxBizJgRegisterInfo registerInfo, UseFlagParamDto useFlagParamDto) {
         IdxBizJgMaintenanceRecordInfo idxBizJgMaintenanceRecordInfo = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(registerInfo.getRecord());
 
         useFlagParamDto.setEmergencyTel(this.buildEmergencyTel(idxBizJgMaintenanceRecordInfo));
@@ -2519,10 +2519,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private void clearMainInfo(String record) {
         maintenanceRecordInfoMapper.delete(new LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo>().eq(IdxBizJgMaintenanceRecordInfo::getRecord, record));
-        IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = new IdxBizJgMaintenanceRecordInfo();
-        maintenanceRecordInfo.setRecord(record);
-        maintenanceRecordInfo.setRecDate(new Date());
-        maintenanceRecordInfoMapper.insert(maintenanceRecordInfo);
     }
 
     private void clearConstructionInfo(String record) {
@@ -3081,27 +3077,28 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private void historyEquUpdateMaintenanceInfo(JSONObject map) {
         SimpleDateFormat format = new SimpleDateFormat();
-        IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
-        if (!ValidationUtil.isEmpty(info.getSequenceNbr())) {
-            String meUnitName = String.valueOf(map.get("meUnitName"));
-            info.setMeUnitName(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[1] : null);
-            info.setMeUnitCreditCode(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[0] : null);
-            info.setMeMaster(ValidationUtil.isEmpty(map.get("maintenanceManagerOneName")) ? null : String.valueOf(map.get("maintenanceManagerOneName")));
-            info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("maintenanceManagerOnePhone")) ? null : String.valueOf(map.get("maintenanceManagerOnePhone")));
-            info.setMeMasterId(ValidationUtil.isEmpty(map.get("maintenanceManagerOneID")) ? null : String.valueOf(map.get("maintenanceManagerOneID")));
-            info.setMeMaster1(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoName")) ? null : String.valueOf(map.get("maintenanceManagerTwoName")));
-            info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoPhone")) ? null : String.valueOf(map.get("maintenanceManagerTwoPhone")));
-            info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoID")) ? null : String.valueOf(map.get("maintenanceManagerTwoID")));
-            try {
-                info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : format.parse(String.valueOf(map.get("informStart"))));
-                info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : format.parse(String.valueOf(map.get("informEnd"))));
-            } catch (Exception exception) {
-                exception.printStackTrace();
-                log.info("date转化失败");
-            }
-            info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
-            idxBizJgMaintenanceRecordInfoService.getBaseMapper().updateById(info);
-        }
+        IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+        info.setRecord(String.valueOf(map.get("equipId")));
+        String meUnitName = String.valueOf(map.get("meUnitName"));
+        info.setRecDate(new Date());
+        info.setRecUserId(RequestContext.getExeUserId());
+        info.setMeUnitName(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[1] : null);
+        info.setMeUnitCreditCode(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[0] : null);
+        info.setMeMaster(ValidationUtil.isEmpty(map.get("maintenanceManagerOneName")) ? null : String.valueOf(map.get("maintenanceManagerOneName")));
+        info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("maintenanceManagerOnePhone")) ? null : String.valueOf(map.get("maintenanceManagerOnePhone")));
+        info.setMeMasterId(ValidationUtil.isEmpty(map.get("maintenanceManagerOneID")) ? null : String.valueOf(map.get("maintenanceManagerOneID")));
+        info.setMeMaster1(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoName")) ? null : String.valueOf(map.get("maintenanceManagerTwoName")));
+        info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoPhone")) ? null : String.valueOf(map.get("maintenanceManagerTwoPhone")));
+        info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoID")) ? null : String.valueOf(map.get("maintenanceManagerTwoID")));
+        try {
+            info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : format.parse(String.valueOf(map.get("informStart"))));
+            info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : format.parse(String.valueOf(map.get("informEnd"))));
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            log.info("date转化失败");
+        }
+        info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
+        idxBizJgMaintenanceRecordInfoService.save(info);
     }
 
     /**