item：新增报警推送

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
@@ -30,16 +7,9 @@ import com.google.common.collect.Sets;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.action.model.FireEquimentDataRo;
-import com.yeejoin.amos.fas.business.action.model.SetpEnum;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttSubscribe;
-import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.FireEquipPointMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.FmeaEquipmentPointMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.FmeaMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.FmeaPointInputitemMapper;
-import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEvaluationModelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
@@ -53,19 +23,28 @@ import com.yeejoin.amos.fas.business.util.RpnUtils;
 import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificForRiskVo;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
-import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.business.vo.Toke;
 import com.yeejoin.amos.fas.business.vo.TopicEntityVo;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.common.enums.EquipmentRiskTypeEnum;
-import com.yeejoin.amos.fas.common.enums.View3dRefreshAreaEum;
-import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
-import com.yeejoin.amos.fas.dao.entity.Equipment;
-import com.yeejoin.amos.fas.dao.entity.EvaluationModel;
-import com.yeejoin.amos.fas.dao.entity.Fmea;
-import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
-import com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem;
-import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
+import com.yeejoin.amos.fas.dao.entity.*;
+import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author keyong
@@ -157,14 +136,25 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         deviceData.setMonitor(equipment != null ? equipment.getName() : "");
         deviceData.setId(String.valueOf(equipmentSpecific.getId()));
         deviceData.setCode(equipmentSpecific.getCode());
-        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(equipmentSpecificIndex.getType())) { //设备告警处理逻辑
-            log.info("(报警)Message type is: " + equipmentSpecificIndex.getType());
+        String specificIndexType = equipmentSpecificIndex.getType();
+        if (EquipmentRiskTypeEnum.HZGJ.getCode().equals(specificIndexType)) { //设备告警处理逻辑
+            log.info("(报警)Message type is: " + specificIndexType);
+
+            //通知刷新3d页面告警数据
+//            iDataRefreshService.refreshViewData(DataRefreshTypeEum.alarm.getCode());
+            /**
+             * 推送告警数据
+             * 影响区域：消防安全=>火灾告警
+             */
+            String title = String.format("/%s/%s/%s/%s", serviceName, stationName,"data/refresh","fireSafety");
+            webMqttComponent.publish(title, JSON.toJSONString(view3dService.getSafetyExecuteListTop5("fire", equipmentSpecific.getOrgCode())));
 
             // 报警触发调用规则服务
-            executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke);
-
-        } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(equipmentSpecificIndex.getType())) { // 设备故障处理逻辑
-            log.info("(故障)Message type is: " + equipmentSpecificIndex.getType());
+            if(!ObjectUtils.isEmpty(equipment) && !ObjectUtils.isEmpty(equipment.getReservePlan())){
+                executeDynamicPlan(deviceData, equipment, equipmentSpecific, toke);
+            }
+        } else if (EquipmentRiskTypeEnum.GZ.getCode().equals(specificIndexType)) { // 设备故障处理逻辑
+            log.info("(故障)Message type is: " + specificIndexType);
             long equipId = 0;
             if(StringUtil.isNotEmpty(equipment)) {
                 equipId = equipment.getId();
@@ -186,7 +176,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
             }
 
         } else { // 向三维推送实时值修改
-            log.info("(监测)Message type is: " + equipmentSpecificIndex.getType());
+            log.info("(监测)Message type is: " + specificIndexType);
             // 是否关联风险点
             notifyAlarm(equipmentSpecificIndex, 0);
             Map<String, Object> content = new HashMap<>();
@@ -197,7 +187,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
             content.put("orgCode", equipmentSpecific.getOrgCode());
             content.put("indexKey", equipmentSpecificIndex.getNameKey());
             content.put("status", equipmentSpecificIndex.getValue());
-            iDataRefreshService.sendRefreshDataWithArea(View3dRefreshAreaEum.monitor_data.getCode(), content);
+//            iDataRefreshService.sendRefreshDataWithArea(View3dRefreshAreaEum.monitor_data.getCode(), content);
             String title = String.format("/%s/%s/%s", serviceName, stationName,"data/refresh/monitorData");
             webMqttComponent.publish(title, JSON.toJSONString(view3dService.getEquipStatusList(equipmentSpecific.getOrgCode())));
         }
@@ -396,7 +386,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         contingencyRo.setEquipmentName(equipment.getName());
         contingencyRo.setFireEquipmentId(String.valueOf(equipmentSpecific.getId()));
         contingencyRo.setFireEquipmentName(equipmentSpecific.getName());
-        contingencyRo.setStep(SetpEnum.STEP0.getValue());
+        contingencyRo.setStep("0");
         contingencyRo.setConfirm("NONE");
         contingencyRo.setFireTruckRoute(equipment.getFireTruckRoute());
         contingencyRo.setRunstep(false);

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -56,9 +56,6 @@ equipManage.fegin.name=AMOS-EQUIPMANAGE
 #jpush 服务名称
 Push.fegin.name=AMOS-JPUSH
 
-spring.http.multipart.maxFileSize = 10480000
-spring.http.multipart.MaxRequestSize = 50480000
-
 param.safetyIndexChange.cron = 0 0 2 * * ?
 param.weather.url = http://wthrcdn.etouch.cn/weather_mini?citykey=