消息发送去掉遥测

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,10 +324,8 @@ 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();
@@ -361,7 +360,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                             log.error("遥测遥信数据推送云端kafka失败=====>" +  e.getMessage());
                             e.printStackTrace();
                         }
-
+                    }
                 }
             }
         });