Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

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

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-
+import java.lang.reflect.Field;
 import java.util.Date;
 
 /**
@@ -75,7 +75,7 @@ public class MetaHandler implements MetaObjectHandler {
             this.setFieldValByName("recDate", currentDate, metaObject);
         }
         //以下为装备中转移过来的
-        if (isExistField("userId", entity)) {
+        if (isExistField("userId", entity) && isStringField(metaObject,"userId")) {
             this.setFieldValByName("userId", String.valueOf(agencyUserModel.getUserId()), metaObject);
         }
         if (isExistField("creatorId", entity)) {
@@ -118,6 +118,18 @@ public class MetaHandler implements MetaObjectHandler {
         return jsonObj.containsKey(field);
     }
 
+    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())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
     /**
      * 更新拦截
      *

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

@@ -16,10 +16,7 @@ import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
 import com.yeejoin.equipmanage.common.entity.vo.AlamVideoVO;
-import com.yeejoin.equipmanage.common.enums.AlarmCleanTypeEnum;
-import com.yeejoin.equipmanage.common.enums.AlarmStatusEnum;
-import com.yeejoin.equipmanage.common.enums.AlarmTypeEnum;
-import com.yeejoin.equipmanage.common.enums.TopicEnum;
+import com.yeejoin.equipmanage.common.enums.*;
 import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.Token;
@@ -112,6 +109,9 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
     @Autowired
     private EquipmentSpecificAlarmMapper equipmentSpecificAlarmMapper;
 
+    @Autowired
+    private ISignalClassifyService signalClassifyService;
+
 
 
 
@@ -129,6 +129,11 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             return res;
         }
         EquipmentSpecificAlarmLog specificAlarm = confirmAlarmMapper.getDetailsById(alarmId, equipId);
+        if (!ObjectUtils.isEmpty(specificAlarm.getConfirmType())) {
+            String handleTypeName = ConfirmAlamEnum.getTypeByCode(String.valueOf(specificAlarm.getConfirmType()));
+            specificAlarm.setConfirmTypeName(StringUtil.isNotEmpty(handleTypeName)
+                    ? handleTypeName : signalClassifyService.getTypeNameByCode(String.valueOf(specificAlarm.getConfirmType())).getTypeName());
+        }
         List<AlamVideoVO> videoBySpeId;
         if (specificAlarm == null) {
             videoBySpeId = videoMapper.getVideoBySpeId(equipId);

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

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