Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IotFeign.java

@@ -38,4 +38,18 @@ public interface IotFeign {
             @RequestParam(value = "current") Integer current,
             @RequestParam(value = "size") Integer size);
 
+
+
+    @RequestMapping(value = "v1/livedata/common/top", method = RequestMethod.GET, consumes = "application/json")
+    ResponseModel selectOne(
+            @RequestHeader("appKey") String appKey,
+            @RequestHeader("product") String product,
+            @RequestHeader("token") String token,
+            @RequestParam(value = "top") String top,
+            @RequestParam(value = "productKey") String productKey,
+            @RequestParam(value = "deviceName") String deviceName,
+            @RequestParam("FHS_FirePump_RunStatus") String key,
+            @RequestParam(required = false, value = "fieldKey") String fieldKey);
+
+
 }

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

@@ -115,7 +115,7 @@ equipment.scrap.day=30
 equipment.scrap.cron=0 0 9 * * ?
 
 # 稳压泵启动信号
-equipment.pressurepump.start=FHS_PressurePump_Start
+equipment.pressurepump.start=FHS_FirePump_RunStatus
 # 稳压泵停止信号
 equipment.pressurepump.stop=FHS_PressurePump_Stop