Merge branch 'develop_dl_jiangxi' into develop_dl

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -11,7 +11,7 @@ public class RedisKey {
     /**根据动态表单code获取动态表单列表*/
     public static final String FORM_CODE = "form_code_";
     /**根据字典code获取数据字典列表*/
-    public static final String DATA_DICTIONARY_CODE= "data_dictionary_code_";    
+    public static final String DATA_DICTIONARY_CODE= "data_dictionary_code_";
     /**根据字典code获取数据字典列表*/
     public static final String DATA_DICTIONARY_CODE_XIN= "data_dictionary_code_xin_";
     /**根据id获取消防人员基本信息*/
@@ -42,7 +42,12 @@ public class RedisKey {
 
     /** 企业用户注册前缀 */
     public static final String FLC_USER_TEL = "flc_tel_";
-    
+
+    /**
+     * 装备指标Key值
+     */
+    public static final String EQUIP_INDEX_ADDRESS = "equip_index_address";
+
     /** 驼峰转下划线(简单写法，效率低于 ) */
 	public static String humpToLine(String str) {
 		return str.replaceAll("[A-Z]", "_$0").toLowerCase();
@@ -69,7 +74,7 @@ public class RedisKey {
     public static String buildPatternKey(String token) {
         return REGION_REDIS_PREFIX + "*" + "_" + token;
     }
-    
+
     /**
      * 判断str1中包含str2的个数
       * @param str1

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentIndexVO.java

@@ -69,4 +69,13 @@ public class EquipmentIndexVO {
     @ApiModelProperty(value = "指标枚举")
     private String valueEnum;
 
+    @ApiModelProperty(value = "信号的索引键key，用于唯一索引信号")
+    private String indexAddress;
+
+    @ApiModelProperty(value = "测点类型，analog/state")
+    private String dataType;
+
+    @ApiModelProperty(value = "网关标识")
+    private String gatewayId;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/EquipmentIndexCacheRunner.java

+package com.yeejoin.equipmanage.config;
+
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificIndexMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author LiuLin
+ * @date 2023/6/15
+ * @apiNote
+ */
+@Component
+@Slf4j
+public class EquipmentIndexCacheRunner implements CommandLineRunner {
+
+    @Resource
+    private EquipmentSpecificIndexMapper equipmentSpecificIndexMapper;
+    @Resource
+    private RedisUtils redisUtils;
+
+    @Override
+    public void run(String... args) throws Exception {
+        log.info(">>服务启动执行，执行预加载数据等操作");
+        redisUtils.del(RedisKey.EQUIP_INDEX_ADDRESS);
+        List<EquipmentIndexVO> equipSpecificIndexList = equipmentSpecificIndexMapper.getEquipSpecificIndexList(null);
+        Map<String, Object> equipmentIndexVOMap = equipSpecificIndexList.stream()
+                .filter(v -> v.getGatewayId() != null)
+                .collect(Collectors.toMap(vo -> vo.getIndexAddress() + "_" + vo.getGatewayId(), Function.identity()));
+
+        redisUtils.hmset(RedisKey.EQUIP_INDEX_ADDRESS, equipmentIndexVOMap);
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/EquipmentIotMqttReceiveConfig.java

@@ -64,10 +64,10 @@ public class EquipmentIotMqttReceiveConfig {
     @Value("${patrol.center.risk.topic}")
     private String riskMsgCenterPatrolTopic;
 
-    private  EquipmentSpecificMapper equipmentSpecificMapper;
+    private EquipmentSpecificMapper equipmentSpecificMapper;
 
 
-    private  MqttEventReceiveService mqttEventReceiveService;
+    private MqttEventReceiveService mqttEventReceiveService;
 
 
     private ISyncDataService iSyncDataService;
@@ -76,10 +76,12 @@ public class EquipmentIotMqttReceiveConfig {
     public void setEquipmentSpecificMapper(EquipmentSpecificMapper equipmentSpecificMapper) {
         this.equipmentSpecificMapper = equipmentSpecificMapper;
     }
+
     @Autowired
     public void setMqttEventReceiveService(MqttEventReceiveService mqttEventReceiveService) {
         this.mqttEventReceiveService = mqttEventReceiveService;
     }
+
     @Autowired
     public void setiSyncDataService(ISyncDataService iSyncDataService) {
         this.iSyncDataService = iSyncDataService;
@@ -156,10 +158,10 @@ public class EquipmentIotMqttReceiveConfig {
                     mqttReceiveService.handlerMqttIncrementMessage(topic, msg);
                 } else if (dataType.equals("event") && StringUtil.isNotEmpty(msg)) {
                     mqttEventReceiveService.handlerMqttIncrementMessage(topic, msg);
-                }else if (dataType.equals("transmit") && StringUtil.isNotEmpty(msg)){
-                    mqttReceiveService.handlerMqttRomaMessage(topic,msg);
-                }else if (dataType.equals("perspective") && StringUtil.isNotEmpty(msg)){
-                    mqttReceiveService.handlerMqttIotMessage(topic,msg);
+                } else if (dataType.equals("transmit") && StringUtil.isNotEmpty(msg)) {
+                    mqttReceiveService.handlerMqttRomaMessage(topic, msg);
+                } else if (dataType.equals("perspective") && StringUtil.isNotEmpty(msg)) {
+                    mqttReceiveService.handlerIotMessage(topic, msg);
                 } else if (dataType.equals("trigger") && StringUtil.isNotEmpty(msg)) {
                     mqttReceiveService.handleDataToRiskModel(topic, msg);
                 }

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

@@ -13,28 +13,41 @@ public interface MqttReceiveService {
 
     /**
      * 增量数据处理
-     * @param topic 主题
+     *
+     * @param topic   主题
      * @param message 消息内容
      */
     void handlerMqttIncrementMessage(String topic, String message);
 
     /**
      * 处理交换站消息数据
-     * @param topic 主题
+     *
+     * @param topic   主题
      * @param message 消息内容
      */
     void handlerMqttRomaMessage(String topic, String message);
 
     /**
      * 处理Iot消息数据
-     * @param topic 主题
+     *
+     * @param topic   主题
      * @param message 消息内容
      */
     void handlerMqttIotMessage(String topic, String message);
-     /**
+
+    /**
      * 中心级接收消息发送至消息服务
+     *
      * @param topic
      * @param message
      */
     void handleDataToRiskModel(String topic, String message);
+
+    /**
+     * 处理Iot消息数据
+     *
+     * @param topic   主题
+     * @param message 消息内容
+     */
+    void handlerIotMessage(String topic, String message);
 }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -324,10 +324,13 @@
         ei.`name` AS perfQuotaName,
         si.`value`,
         ei.is_iot,
-        ei.unit AS unitName,
+        si.unit AS unitName,
         ei.sort_num,
         si.create_date,
-        si.update_date
+        si.update_date,
+        si.index_address,
+        si.gateway_id,
+        si.data_type
         FROM
         wl_equipment_specific_index si
         LEFT JOIN wl_equipment_index ei ON si.equipment_index_id = ei.id