消息发送去掉遥测

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

@@ -39,6 +39,7 @@ import org.springframework.util.StringUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -323,45 +324,43 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     jsonObjectXf.put("data_class", "realdata");
                     // 遥测
                     if(equipmentSpeIndex.getIsTrend() == 1) {
-                        jsonObjectXf.put("data_type", "analog");
                     } else {
                         jsonObjectXf.put("data_type", "state");
+                        String date = DateUtils.date2LongStr(new Date());
+                        jsonObjectXf.put("op_type", "subscribe_emergency");
+                        JSONObject jsonObjectCondition = new JSONObject();
+                        jsonObjectCondition.put("station_psr_id", stationCode);
+                        jsonObjectCondition.put("station_name", stationName);
+                        jsonObjectCondition.put("data_upload_time", date );
+                        jsonObjectXf.put("condition",jsonObjectCondition);
+
+                        JSONObject jsonObjectData = new JSONObject();
+                        jsonObjectData.put("psrId", stationCode);
+                        jsonObjectData.put("astId", equipmentSpecificIndex.getSpecificCode());
+                        jsonObjectData.put("equipType", equipmentSpecificIndex.getEquipmentCode());
+                        jsonObjectData.put("name", equipmentSpecificIndex.getEquipmentSpecificName()+"-"+equipmentSpecificIndex.getEquipmentSpecificIndexName());
+                        if(value.equals("true")) {
+                            jsonObjectData.put("value","1");
+                        } else if (value.equals("false")) {
+                            jsonObjectData.put("value","0");
+                        } else {
+                            jsonObjectData.put("value", value);
+                        }
+                        jsonObjectData.put("measurementType",equipmentSpecificIndex.getEquipmentIndexKey());
+                        jsonObjectData.put("dateTime",date);
+                        jsonObjectData.put("quality","0"); // 量测质量码：0 有效，1 无效
+                        List<JSONObject> jsonObjects = Arrays.asList(jsonObjectData);
+
+                        jsonObjectXf.put("data", jsonObjects);
+
+                        try {
+                            emqKeeper.getMqttClient().publish("emq.xf.created",jsonObjectXf.toString().getBytes(),1,false);
+                            log.info("遥测遥信数据推送云端kafka成功");
+                        } catch (MqttException e) {
+                            log.error("遥测遥信数据推送云端kafka失败=====>" +  e.getMessage());
+                            e.printStackTrace();
+                        }
                     }
-                    String date = DateUtils.date2LongStr(new Date());
-                    jsonObjectXf.put("op_type", "subscribe_emergency");
-                    JSONObject jsonObjectCondition = new JSONObject();
-                    jsonObjectCondition.put("station_psr_id", stationCode);
-                    jsonObjectCondition.put("station_name", stationName);
-                    jsonObjectCondition.put("data_upload_time", date );
-                    jsonObjectXf.put("condition",jsonObjectCondition);
-
-                    JSONObject jsonObjectData = new JSONObject();
-                    jsonObjectData.put("psrId", stationCode);
-                    jsonObjectData.put("astId", equipmentSpecificIndex.getSpecificCode());
-                    jsonObjectData.put("equipType", equipmentSpecificIndex.getEquipmentCode());
-                    jsonObjectData.put("name", equipmentSpecificIndex.getEquipmentSpecificName()+"-"+equipmentSpecificIndex.getEquipmentSpecificIndexName());
-                    if(value.equals("true")) {
-                        jsonObjectData.put("value","1");
-                    } else if (value.equals("false")) {
-                        jsonObjectData.put("value","0");
-                    } else {
-                        jsonObjectData.put("value", value);
-                    }
-                    jsonObjectData.put("measurementType",equipmentSpecificIndex.getEquipmentIndexKey());
-                    jsonObjectData.put("dateTime",date);
-                    jsonObjectData.put("quality","0"); // 量测质量码：0 有效，1 无效
-                    List<JSONObject> jsonObjects = Arrays.asList(jsonObjectData);
-
-                    jsonObjectXf.put("data", jsonObjects);
-
-                    try {
-                        emqKeeper.getMqttClient().publish("emq.xf.created",jsonObjectXf.toString().getBytes(),1,false);
-                        log.info("遥测遥信数据推送云端kafka成功");
-                    } catch (MqttException e) {
-                        log.error("遥测遥信数据推送云端kafka失败=====>" +  e.getMessage());
-                        e.printStackTrace();
-                    }
-
                 }
             }
         });