遥测发消息开关

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

@@ -172,6 +172,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Value("${systemctl.sync.switch}")
     private Boolean syncSwitch;
 
+    @Value("${is.open.telemetering:false}")
+    private Boolean isOpenTelemetering;
+
     @Value("${systemctl.amos.switch}")
     private Boolean amosSwitch;
 
@@ -322,10 +325,13 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     // 遥测遥信数据推送云端kafka
                     JSONObject jsonObjectXf = new JSONObject();
                     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();
@@ -353,6 +359,9 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
 
                     jsonObjectXf.put("data", jsonObjects);
 
+                    // 遥测
+                    if(!isOpenTelemetering && equipmentSpeIndex.getIsTrend() == 1) {
+                    } else {
                         try {
                             emqKeeper.getMqttClient().publish("emq.xf.created",jsonObjectXf.toString().getBytes(),1,false);
                             log.info("遥测遥信数据推送云端kafka成功");

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -97,3 +97,6 @@ iot.code.prefix.have.used=
 # 站端标识
 state.code=JP
 state.name=NAME
+
+# 是否开启遥测数据上报
+is.open.telemetering=false
\ No newline at end of file