Merge remote-tracking branch 'origin/develop_dl' into develop_dl

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

@@ -138,33 +138,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     private RuleTrigger ruleTrigger;
 
-    /**
-     * 泡沫罐KEY
-     */
-    private final static String CAFS_FoamTank_FoamTankLevel = "CAFS_FoamTank_FoamTankLevel";
-    /**
-     * 泡沫罐KEY
-     */
-    private final static String FHS_PipePressureDetector_PipePressure = "FHS_PipePressureDetector_PipePressure";
-
-    /**
-     * 水池信息
-     */
-    private final static String FHS_FirePoolDevice_WaterLevel = "FHS_FirePoolDevice_WaterLevel";
-
-    /**
-     * 水池信息
-     */
-    private final static String FHS_WirelessliquidDetector_WaterLevel = "FHS_WirelessliquidDetector_WaterLevel";
-
-    /**
-     * 水箱液位
-     */
-    private final static String CAFS_WaterTank_WaterTankLevel = "CAFS_WaterTank_WaterTankLevel";
-
-
-    static EquipmentSpecificMapper equipmentSpecificMapper;
-
     @Autowired
     CarMapper carMapper;
     @Autowired
@@ -174,8 +147,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     private IotFeign iotFeign;
     @Autowired
-    private InfluxDbConnection influxDbConnection;
-    @Autowired
     private RedisUtils redisUtils;
     @Autowired
     private ISyncDataService syncDataService;
@@ -218,13 +189,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${equip.center.risk.topic}")
     private String riskTopicCenter;
 
-    private static String canvasTopic;
-
-    @Value("${equip.point.equipmentdata.topic}")
-    public void setCanvasTopic(String canvasTopic) {
-        MqttReceiveServiceImpl.canvasTopic = canvasTopic;
-    }
-
     @Value("${equip.index.topic}")
     private String indexTopic;
     @Value("${spring.redis.expire.time}")
@@ -357,8 +321,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${equip.message.create.topic}")
     private String riskMsgCreateTopic;
 
-    private static Boolean bool = Boolean.FALSE;
-
     @Autowired
     public void setFireFightingSystemService(IFireFightingSystemService fireFightingSystemService) {
         MqttReceiveServiceImpl.fireFightingSystemService = fireFightingSystemService;
@@ -471,27 +433,6 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         List<EquipmentSpecificAlarm> equipmentSpecificAlarms = new ArrayList<>();
         List<IndexStateVo> indexStateList = new ArrayList<>();
         JSONObject jsonObject = JSONObject.parseObject(message);
-        String dataType = jsonObject.getString("datatype");
-
-        String indexAddress = null, value, timeStamp, quality = null;
-
-        //如果消息是遥信类型，进行指标转换
-        assert dataType != null;
-        if (dataType.equals("state")) {
-            indexAddress = jsonObject.getString("scadaid");
-            value = jsonObject.getInteger("value") == 1 ? "true" : "false";
-            timeStamp = jsonObject.getString("timestamp");
-        }else if (dataType.equals("discreate")){
-            indexAddress = jsonObject.getString("key");
-            value = jsonObject.getFloat("value") == 0.0 ? "false" : "true";
-            timeStamp = jsonObject.getString("time_stamp");
-            quality = jsonObject.getString("quality");
-        }else {
-            indexAddress = jsonObject.getString("key");
-            value = jsonObject.getFloat("value")+"";
-            timeStamp = jsonObject.getString("time_stamp");
-            quality = jsonObject.getString("quality");
-        }
 
         StationMessage stationMessage = JSON.parseObject(String.valueOf(message), StationMessage.class);
         String indexAddress = null, value = null, timeStamp = null, quality = null, dataType = null;