fix(jg):修复设备变更与使用登记逻辑中的空值判断问题

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -802,7 +802,7 @@ public class XiAnDataDockServiceImpl {
                                 .filter(item -> item instanceof String)
                                 .forEach(item -> importResult.add((String) item));
                     }
-                    if (resultMap.containsKey("status") && resultMap.get("status") != "200") {
+                    if (resultMap.containsKey("status") && Integer.parseInt(resultMap.get("status").toString()) != 200) {
                         throw new RuntimeException(resultMap.get("message").toString());
                     }
                 } catch (Exception e) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/config/DataSourceConfiguration.java

@@ -40,6 +40,7 @@ public class DataSourceConfiguration {
         dataSource.setConnectionTimeout(hikariDataSourceProperties.getConnectionTimeout());
         dataSource.setIdleTimeout(hikariDataSourceProperties.getIdleTimeout());
         dataSource.setConnectionInitSql(hikariDataSourceProperties.getConnectionInitSql());
+        dataSource.setRegisterMbeans(hikariDataSourceProperties.getRegisterMbeans());
         return new DataSourceProxy(dataSource);
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterUpdateService.java

@@ -103,6 +103,9 @@ public class UseRegisterUpdateService {
      */
     public void updateUseRegistrationInfo(String bizId, List<FieldChangeMeta> allChangeColumns) {
         Map<String, Object> useRegistrationMap = jgUseRegistrationService.getJgUseRegistrationMapper().getUseRegistrationDetail(bizId);
+        if (ValidationUtil.isEmpty(useRegistrationMap)) {
+            return;
+        }
         JgUseRegistration jgUseRegistration = jgUseRegistrationService.getById(Objects.toString(useRegistrationMap.get("UseRegistratSequenceNbr")));
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getDteailByRecord(bizId, MapUtil.getStr(useRegistrationMap,"UseRegistratSequenceNbr"));
         allChangeColumns.forEach(meta -> {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -74,7 +74,7 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
         CommonEquipDataProcessService.castMap2Bean(changeJson, registerInfoNew);
         registerInfoNew.setSequenceNbr(registerInfoOld.getSequenceNbr());
 
-        if (registerInfoOld.getUseOrgCode() != null) {
+        if (!ValidationUtil.isEmpty(registerInfoOld.getUseOrgCode())) {
             JgUseRegistrationManage jgUseRegistrationManage = commonEquipDataProcessService.getJgUseRegistrationManageService().lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfoOld.getUseOrgCode())
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();