Merge branch 'develop_station' into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -76,10 +76,8 @@ public class MetaHandler implements MetaObjectHandler {
             this.setFieldValByName("recDate", currentDate, metaObject);
         }
 
-
-
         //以下为装备中转移过来的
-        if (isExistField("userId", entity)&&isStringField(metaObject,"userId")) {
+        if (isExistField("userId", entity) && isStringField(metaObject,"userId")) {
             this.setFieldValByName("userId", String.valueOf(agencyUserModel.getUserId()), metaObject);
         }
 
@@ -122,24 +120,19 @@ public class MetaHandler implements MetaObjectHandler {
         }
         return jsonObj.containsKey(field);
     }
-    private Boolean isStringField(MetaObject metaObject,String fieldName) {
 
+    private Boolean isStringField(MetaObject metaObject, String fieldName) {
         Class clazz = metaObject.getOriginalObject().getClass();
         Field[] fields = clazz.getDeclaredFields();
-
         for (Field field : fields) {
-            if (fieldName.equals(field.getName()) &&("class java.lang.String").equals(field.getGenericType().toString())) {
+            if (fieldName.equals(field.getName()) && ("class java.lang.String").equals(field.getGenericType().toString())) {
                 return true;
             }
-
-
         }
         return false;
     }
 
 
-
-
     /**
      * 更新拦截
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -146,6 +146,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     FireFightingSystemMapper fireFightingSystemMapper;
 
     @Autowired
+    @Lazy
     IEquipmentSpecificAlarmService equipmentSpecificAlarmService;
 
     @Value("${systemctl.sync.switch}")