代码同步

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -150,4 +150,11 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField(exist = false)
     private Integer isTrend;
 
+    @ApiModelProperty(value = "装备系统code")
+    @TableField(exist = false)
+    private String specificCode;
+
+    @ApiModelProperty(value = "装备定义名称")
+    @TableField(exist = false)
+    private String equipmentName;
 }

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

@@ -144,6 +144,15 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
     @Autowired
     private RedisUtils redisUtils;
 
+    @Value("${state.code:code}")
+    private String stationCode;
+
+    @Value("${state.name:name}")
+    private String stationName;
+
+    @Value("${is.open.telemetering:false}")
+    private Boolean isOpenTelemetering;
+
     @Autowired
     CarMapper carMapper;
 
@@ -382,6 +391,55 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                             iotDataVO.getKey().toLowerCase().equals(FHS_WirelessliquidDetector_WaterLevel.toLowerCase())) {
                         doWaterPoolLevel(iotDataVO, equipmentSpecificIndex);
                     }
+
+                    // 遥测遥信数据推送云端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);
+
+                    // 遥测
+                    if(!isOpenTelemetering && equipmentSpeIndex.getIsTrend() == 1) {
+                    } else {
+                        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();
+                        }
+                    }
                 }
             }
         });

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

@@ -111,3 +111,8 @@ equipment.scrap.cron=0 0 9 * * ?
 equipment.pressurepump.start=FHS_PressurePump_Start
 # 稳压泵停止信号
 equipment.pressurepump.stop=FHS_PressurePump_Stop
+
+
+# 站端标识
+state.code=JP
+state.name=NAME
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -44,12 +44,15 @@
 	        wei.type_code AS typeCode,
 	        wei.type_name AS typeName,
 	        wei.name AS indexName,
+	        ed.equipment_name AS equipmentName,
 	        wei.unit AS indexUnitName,
 	        wes.org_code AS orgCode,
+	         wes.code AS specificCode,
 			ed.`name` AS equipmentSpecificName,
 			wes.iot_code AS iotCode,
 			wei.`name` AS equipmentSpecificIndexName,
 			wei.`value_enum` AS valueEnum,
+			wei.is_trend AS isTrend,
 			wes.qr_code AS qrCode,
 			wesi.update_date AS updateDate,
 			ed.code AS equipmentCode,