fix(equip):江西数据中心字段添加指标名称、装备名称

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

@@ -78,4 +78,9 @@ public class EquipmentIndexVO {
     @ApiModelProperty(value = "网关标识")
     private String gatewayId;
 
+    @ApiModelProperty(value = "装备名称")
+    private String equipmentSpecificName;
+
+    @ApiModelProperty(value = "指标名称")
+    private String equipmentIndexName;
 }

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.influxdb.InfluxDbConnection;
-import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentDefectAlarm;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFaultAlarm;
@@ -30,9 +29,7 @@ import com.yeejoin.equipmanage.quartz.QuartzManager;
 import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
 import com.yeejoin.equipmanage.utils.BeanUtil;
-import javafx.scene.control.Tab;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.utils.Lists;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +52,6 @@ import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Executor;
@@ -661,7 +657,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         Map<String, Object> fieldsMap = new HashMap<>();
                         EquipmentIndexVO equipmentSpeIndex = (EquipmentIndexVO) equipmentIndexVOMap.get(key);
 
-                        tagsMap.put("key", key);
+                        tagsMap.put("equipmentsIdx", key);
                         String valueLabel = valueTranslate(value, equipmentSpeIndex.getValueEnum());
 
                         fieldsMap.put("traceId", traceId);
@@ -671,6 +667,8 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         fieldsMap.put("gatewayId", gatewayId);
                         fieldsMap.put("dataType", dataType);
                         fieldsMap.put("equipmentId", equipmentSpeIndex.getEquipmentId());
+                        fieldsMap.put("equipmentSpecificName", equipmentSpeIndex.getEquipmentSpecificName());
+                        fieldsMap.put("equipmentIndexName", equipmentSpeIndex.getEquipmentIndexName());
                         fieldsMap.put("unit", equipmentSpeIndex.getUnitName());
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         fieldsMap.put("createdTime", simpleDateFormat.format(new Date()));

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

@@ -330,7 +330,9 @@
         si.update_date,
         si.index_address,
         si.gateway_id,
-        si.data_type
+        si.data_type,
+        si.equipment_specific_name,
+        si.equipment_index_name
         FROM
         wl_equipment_specific_index si
         LEFT JOIN wl_equipment_index ei ON si.equipment_index_id = ei.id