1.设备推送数据-全景监控

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/DataRefreshTypeEum.java

@@ -11,6 +11,7 @@ public enum DataRefreshTypeEum {
     dateChange("日切","dateChange"),
     rpn("rpn变化","rpn"),
     alarm("设备报警","alarm"),
+    monitor("监测数据","monitor"),
     planTask("检查任务","planTask"),
     check("巡检","check"),
     trouble("设备故障","trouble"),

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/View3dRefreshAreaEum.java

@@ -14,6 +14,7 @@ public enum View3dRefreshAreaEum {
     all("全部区域", "all", "dateChange"),
     today_safety_index("今日安全指数", "today_safety_index", "rpn,check,trouble"),
     fire_safety("消防安全执行", "fire_safety", "alarm,rpn,check,trouble"),
+    monitor_data("设备状态检测数据","monitor_data","monitor"),
     error_status("异常区域", "error_status", "rpn,trouble"),
     week_safety_index("一周安全指数趋势", "week_safety_index", "rpn"),
     today_check_status("今日巡检情况", "today_check_status", "planTask,check"),

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

@@ -39,6 +39,14 @@ public class DataRefreshServiceImpl implements IDataRefreshService {
         });
     }
 
+    @Override
+    public void sendRefreshDataWithArea(String areaType, Map content) {
+        Map<String,Object> sendData = new HashMap<>(2);
+        sendData.put("refreshType",areaType);
+        sendData.put("content",content);
+        this.notifyDataRefresh(sendData);
+    }
+
 
     private void notifyDataRefresh(Map<String, Object> param) {
         try {

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

 package com.yeejoin.amos.fas.business.service.impl;
 
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import javax.annotation.PostConstruct;
-
-import com.yeejoin.amos.fas.business.service.intfc.*;
-import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.redis.core.HashOperations;
-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.springframework.util.StringUtils;
-import org.typroject.tyboot.component.cache.Redis;
-import org.typroject.tyboot.component.cache.enumeration.CacheType;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
@@ -46,27 +7,9 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.yeejoin.amos.fas.business.bo.BindRegionBo;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
-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.RiskSourceMapper;
+import com.yeejoin.amos.fas.business.dao.mapper.*;
 import com.yeejoin.amos.fas.business.dao.mongo.EquipCommunicationDao;
-import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
-import com.yeejoin.amos.fas.business.dao.repository.IDictDao;
-import com.yeejoin.amos.fas.business.dao.repository.IEvaluationModelDao;
-import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
-import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDataDao;
-import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentPointDao;
-import com.yeejoin.amos.fas.business.dao.repository.IFmeaDao;
-import com.yeejoin.amos.fas.business.dao.repository.IPPointDao;
-import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
-import com.yeejoin.amos.fas.business.dao.repository.IRiskFactorDao;
-import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
-import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
-import com.yeejoin.amos.fas.business.dao.repository.IRpnChangeLogDao;
+import com.yeejoin.amos.fas.business.dao.repository.*;
 import com.yeejoin.amos.fas.business.feign.RemoteRuleServer;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.feign.RemoteWebSocketServer;
@@ -76,38 +19,41 @@ import com.yeejoin.amos.fas.business.jpush.PushMsgParam;
 import com.yeejoin.amos.fas.business.param.AlarmParam;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.param.FmeaBindParam;
-import com.yeejoin.amos.fas.business.service.model.CheckInputItemRo;
-import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
-import com.yeejoin.amos.fas.business.service.model.ContingencyRo;
-import com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo;
-import com.yeejoin.amos.fas.business.service.model.ProtalDataRo;
-import com.yeejoin.amos.fas.business.service.model.RiskSourceRo;
-import com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo;
+import com.yeejoin.amos.fas.business.service.intfc.*;
+import com.yeejoin.amos.fas.business.service.model.*;
 import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.util.JexlUtil;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
+import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
-import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
-import com.yeejoin.amos.fas.dao.entity.Dict;
-import com.yeejoin.amos.fas.dao.entity.Equipment;
-import com.yeejoin.amos.fas.dao.entity.EvaluationModel;
-import com.yeejoin.amos.fas.dao.entity.FireEquipment;
-import com.yeejoin.amos.fas.dao.entity.FireEquipmentData;
-import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
-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.PPoint;
-import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
-import com.yeejoin.amos.fas.dao.entity.RiskFactor;
-import com.yeejoin.amos.fas.dao.entity.RiskLevel;
-import com.yeejoin.amos.fas.dao.entity.RiskSource;
-import com.yeejoin.amos.fas.dao.entity.RpnChangeLog;
+import com.yeejoin.amos.fas.dao.entity.*;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.redis.core.HashOperations;
+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.springframework.util.StringUtils;
+import org.typroject.tyboot.component.cache.Redis;
+import org.typroject.tyboot.component.cache.enumeration.CacheType;
+
+import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 
 @Service("riskSourceService")
@@ -1240,6 +1186,14 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             fireEquipmentData.setType("monitor");
         }
         iFireEquipmentDataDao.save(fireEquipmentData);
+        if (!"alarm_type_fire".equals(fireEquipmentPointType)) {
+            Map<String,Object> content = new HashMap<>();
+            content.put("id",fireEquipmentData.getId());
+            content.put("label",fireEquipmentData.getEqPointName());
+            content.put("changeDate",fireEquipmentData.getCreateDate());
+            iDataRefreshService.sendRefreshDataWithArea(DataRefreshTypeEum.monitor.getCode(),content);
+        }
+
     }
 
     @Override

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IDataRefreshService.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
+import java.util.Map;
+
 /**
  * @author suhg
  */
@@ -11,4 +13,11 @@ public interface IDataRefreshService {
      */
     void refreshViewData(String dataType);
 
+    /**
+     * 推送刷新数据
+     * @param areaType 刷新区域
+     * @param content 数据对象
+     */
+    void sendRefreshDataWithArea(String areaType, Map content);
+
 }