Merge remote-tracking branch 'origin/dev_upgrade-1225' into dev_upgrade-1225

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EquipmentSpecificController.java

@@ -94,8 +94,12 @@ public class EquipmentSpecificController  extends BaseController{
             @RequestParam(value = "name",required = false) String name,
             @RequestParam(value = "pageNumber",required = false) int pageNumber,
             @RequestParam(value = "pageSize",required = false) int pageSize,
-            @RequestParam(value = "equipmentId",required = false) Long equipmentId ) {
-        return  CommonResponseUtil.success(equipmentSpecificService.getEquipmentBySpeV2(name, pageNumber, pageSize,equipmentId));
+            @RequestParam(value = "equipmentId",required = false) String  equipmentId ) {
+        Long aLong = null;
+        if (!"null".equals(equipmentId) && equipmentId != null && !"".equals(equipmentId.trim())){
+             aLong = Long.valueOf(equipmentId);
+        }
+        return  CommonResponseUtil.success(equipmentSpecificService.getEquipmentBySpeV2(name, pageNumber, pageSize,aLong));
     }
 
     @GetMapping(value = "/list-tree", produces = "application/json;charset=UTF-8")

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

@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.fas.business.util.DataSyncUtil;
 import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -226,6 +227,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Autowired
     private  PlanDetailMapper planDetailMapper;
 
+    @Autowired
+    private DataSyncUtil dataSyncUtil;
+
     public static String cacheKeyForCanBeRunning() {
         return Redis.genKey(CacheType.ERASABLE.name(), "CONTINGENCYRUNING");
     }
@@ -233,6 +237,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Autowired
     private IDataRefreshService iDataRefreshService;
 
+    @Autowired
+    private WebMqttComponent webMqttComponent;
+
     @Override
     public RiskSource editRiskSource(HashMap<String, Object> map) throws Exception {
         RiskSource riskSource = (RiskSource) map.get("param");
@@ -259,10 +266,12 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             riskSource.setStatus(oldRiskSource.getStatus());
         }
         iRiskSourceDao.saveAndFlush(riskSource);
+        dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_SAVE.getValue(), String.valueOf(riskSource.getId())), JSON.toJSONString(riskSource));
         return riskSource;
     }
 
     @Override
+    @Transactional
     public void deleteRiskSource(String appKey, String product, String token, String success, Long[] riskSourceId) throws Exception {
         Set<Long> parentIds = new LinkedHashSet<>();
         for (Long rId : riskSourceId) {
@@ -278,6 +287,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             }
             //1、删除风险点
             iRiskSourceDao.deleteById(rId);
+            dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_DELETE_BY_ID.getValue(), String.valueOf(rId)), String.valueOf(rId));
             //2.删除关联建筑关系，防止对站服务有问题，捕获异常，不影响业务正常秩序
             try {
                 rs.ifPresent(r->{
@@ -302,6 +312,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     public void deleteById(Long id) {
         iRiskSourceDao.deleteById(id);
+        dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_DELETE_BY_ID.getValue(), String.valueOf(id)), String.valueOf(id));
     }
 
     @Override
@@ -322,6 +333,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             fillBasicParams(userId, orgCode, synBo.getId(), riskSource);
             riskSource = iRiskSourceDao.save(riskSource);
         }
+        dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_SAVE.getValue(), String.valueOf(riskSource.getId())), JSON.toJSONString(riskSource));
         //2.同步下级(只有一级)
         if(!CollectionUtils.isEmpty(synBo.getChildren())){
             RiskSource finalRiskSource = riskSource;
@@ -333,6 +345,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 return t;
             }).collect(Collectors.toList());
             iRiskSourceDao.saveAll(children);
+            dataSyncUtil.astDataSync(com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_SAVE_ALL.getValue(), JSON.toJSONString(children));
         }
         return riskSource;
     }
@@ -354,6 +367,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             RiskSource riskSource = exist.get();
             riskSource.setSourceId(null);
             iRiskSourceDao.save(riskSource);
+            dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_SAVE.getValue(), String.valueOf(riskSource.getId())), JSON.toJSONString(riskSource));
         }
         return exist.isPresent();
     }
@@ -1293,8 +1307,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 //        }
 //    }
 
-    @Autowired
-    private WebMqttComponent webMqttComponent;
     @Value("${autoSys.push.type}")
     private String pushType;
     @Value("${spring.application.name}")
@@ -1818,6 +1830,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     riskSource.setRpni(null);
                     riskSource.setRiskLevelId(null);
                     iRiskSourceDao.save(riskSource);
+                    dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_SAVE.getValue(), String.valueOf(riskSource.getId())), JSON.toJSONString(riskSource));
                     return;
                 }
                 BigDecimal rpn = rpnValueBo.getRpn();
@@ -1831,6 +1844,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 }
             }
             iRiskSourceDao.save(riskSource);
+            dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_SAVE.getValue(), String.valueOf(riskSource.getId())), JSON.toJSONString(riskSource));
             this.updateParentRpn(riskSource.getParentId());
         }
     }

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

@@ -16,6 +16,7 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.fas.business.util.DataSyncUtil;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -118,6 +119,9 @@ public class View3dServiceImpl implements IView3dService {
     @Autowired
     private RemoteSecurityService remoteSecurityService;
 
+    @Autowired
+    private DataSyncUtil dataSyncUtil;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResponse setPoint3dPosition(List<BindPointBo> pointBoList) {
@@ -248,6 +252,7 @@ public class View3dServiceImpl implements IView3dService {
             if(ue4Rotation != null) riskSource.setUe4Rotation(pointBo.getUe4Rotation());
             if(position3d != null) riskSource.setPosition3d(position3d);
             iRiskSourceDao.save(riskSource);
+            dataSyncUtil.astDataSync(String.join("_", com.yeejoin.dataprocess.common.enums.AstDataSyncTopic.AST_REGION_SAVE.getValue(), String.valueOf(riskSource.getId())), JSON.toJSONString(riskSource));
         }
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/util/DataSyncUtil.java

+package com.yeejoin.amos.fas.business.util;
+
+import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ProjectName: YeeAmosFireAutoSysRoot
+ * @Package: com.yeejoin.amos.fas.business.util
+ * @ClassName: DataSyncUtil
+ * @Author: Jianqiang Gao
+ * @Description: 数据同步工具类
+ * @Date: 2021/3/24 15:31
+ * @Version: 1.0
+ */
+@Component
+public class DataSyncUtil {
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+
+    @Autowired
+    private WebMqttComponent webMqttComponent;
+
+    public void astDataSync(String topic, String message) {
+        redisTemplate.opsForValue().set(topic, message);
+        webMqttComponent.publish(topic.substring(0, topic.lastIndexOf("_")), message);
+    }
+
+}
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/enums/AstDataSyncTopic.java

+package com.yeejoin.dataprocess.common.enums;
+
+/**
+ * @ProjectName: YeeFireDataProcessRoot
+ * @Package: com.yeejoin.dataprocess.common.enums
+ * @ClassName: TopicName
+ * @Author: Jianqiang Gao
+ * @Description: TopicName
+ * @Date: 2021/3/23 15:55
+ * @Version: 1.0
+ */
+public enum AstDataSyncTopic {
+    AST_REGION_SAVE(10, "ast_save"),
+    AST_REGION_SAVE_ALL(11, "ast_save_all"),
+    AST_REGION_DELETE_BY_ID(12, "ast_delete_by_id");
+
+    private final Integer key;
+    private final String value;
+
+    private AstDataSyncTopic(Integer key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml

@@ -51,6 +51,7 @@
         left join wl_equipment_category as cate on equ.category_id = cate.id
         left join f_fire_fighting_system as manage on spe.system_id = manage.id
         where sto.amount <![CDATA[>]]> 0
+        and  spe.id is not null
         <if test="name != null and name!='null' ">
             and (det.name like CONCAT('%',#{name},'%') or ware.full_name like CONCAT('%',#{name},'%') or spe.iot_code like CONCAT('%',#{name},'%') or spe.code like CONCAT('%',#{name},'%'))
         </if>
@@ -83,6 +84,7 @@
         left join wl_equipment_category as cate on equ.category_id = cate.id
         left join f_fire_fighting_system as manage on spe.system_id = manage.id
         where sto.amount <![CDATA[>]]> 0
+        and  spe.id is not null
         <if test="name != null and name!='null' ">
             and (det.name like CONCAT('%',#{name},'%') or ware.full_name like CONCAT('%',#{name},'%') or spe.iot_code like CONCAT('%',#{name},'%') or spe.code like CONCAT('%',#{name},'%'))
         </if>