遥测发消息开关

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,37 +325,43 @@ 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();
-                        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);
+                    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);
 
+                    // 遥测
+                    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

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