fix(监管)：历史设备登记

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

@@ -2141,7 +2141,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             param.put("CYLINDER_CATEGORY", dataMap.get("cylinderCategory"));
             param.put("FACTORY_NUM", MapUtil.getStr(dataMap, "factoryNum"));
             ESEquipmentCategoryDto categoryDto = op.get();
+            log.info("1.设备数据使用登记更新，更新前数据：{}",JSONObject.toJSONString(categoryDto) );
             BeanUtil.copyProperties(param, categoryDto, true);
+            log.info("2.设备数据使用登记更新，待更新为：{}",JSONObject.toJSONString(categoryDto) );
             return categoryDto;
         }
         log.error("办理使用登记的设备{},在es中不存在", dataMap.get("equipId"));
@@ -4828,6 +4830,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                             .build());
                 }
                 esEquipmentCategory.saveWithFallback(equipmentCategoryDto);
+                log.info("3.设备数据使用登记更新，更新后数据：{}",JSONObject.toJSONString(this.findLastEquipEs(equipId)));
                 eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_EQUIP.name(), Sets.newHashSet(equipId), EquipCreateOrEditEvent.EquipType.equip));
                 return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
             }
@@ -4844,6 +4847,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    private ESEquipmentCategoryDto findLastEquipEs(String equipId) {
+        try {
+            return esEquipmentCategory.findById(equipId).orElse(new ESEquipmentCategoryDto());
+        } catch (Exception e) {
+            log.error("查询设备信息失败：{}", equipId, e);
+            return new ESEquipmentCategoryDto();
+        }
+    }
+
     public String buildTaskModel(JgUseRegistration jgUseRegistration, JSONObject map, ReginParams reginParams) {
         TaskModelDto modelDto = new TaskModelDto();
         modelDto.setNextExecuteUser(jgUseRegistration.getNextExecuteUserIds());