ups接口代码提交,sql更新

project_data/sql/0.1.1/soc/soc.sql

@@ -79,4 +79,36 @@ create table if not exists  iot_ups_attr
     unit       varchar(50)   null,
     start      int default 0 null
 )
-    comment 'ups设备属性' row_format = DYNAMIC;
+    comment 'ups设备属性' row_format = DYNAMIC;
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS市电状态', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS电池电压低告警', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS故障', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS电池电压', null, 'V', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS类型', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS电池电流', null, 'A', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS温度', null, '℃', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS电池容量', null, 'mAh', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS测试状态', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS电池剩余时间', null, '分钟', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS旁路状态', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS通信中断告警', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输入相电压Ua', null, 'V', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输入相电压Ub', null, 'V', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输入相电压Uc', null, 'V', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输出相电压Ua', null, 'V', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输出相电压Ub', null, 'V', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输出相电压Uc', null, 'V', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输入相电流Ia', null, 'A', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输入相电流Ib', null, 'A', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输入相电流Ic', null, 'A', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输出相电流Ia', null, 'A', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输出相电流Ib', null, 'A', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输出相电流Ic', null, 'A', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输入频率', null, 'Hz', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输出频率', null, 'Hz', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS报警启动', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS关机状态', 0, null, 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS负载率A相', null, '%', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS负载率B相', null, '%', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS负载率C相', null, '%', 0);
+INSERT INTO iot_ups_attr (rule_key, rule_value, unit, start) VALUES ('UPS输入故障电压', null, 'V', 0);

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/UpsController.java

@@ -29,8 +29,8 @@ public class UpsController {
 
 
     @ApiOperation("接受UPS信息同步")
-    @PostMapping({"/data/upsDeviceList/{msgId}"})
-    public ReceiveErrorDto upsDeviceList(@PathVariable String msgId, @RequestBody DataPageDto<UpsDeviceDto> request) {
+    @PostMapping({"/data/upsDeviceList"})
+    public ReceiveErrorDto upsDeviceList(String msgId, @RequestBody DataPageDto<UpsDeviceDto> request) {
 
         LogUtils.BASE_INFO_UPS_DEVICE.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "接受UPS信息同步:/api/data/upsDeviceList", msgId, JacksonUtils.toJSONString(request));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
@@ -46,8 +46,8 @@ public class UpsController {
     }
 
     @ApiOperation("接受UPS实时状态信息")
-    @PostMapping({"/status/ups/{msgId}"})
-    public ReceiveErrorDto statusUps(@PathVariable String msgId, @RequestBody UpsDeviceDataDto request) {
+    @PostMapping({"/status/ups"})
+    public ReceiveErrorDto statusUps(String msgId, @RequestBody UpsDeviceDataDto request) {
         LogUtils.BASE_INFO_UPS_DEVICE_DATA.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "接受UPS实时状态信息:/api/status/ups", msgId, JacksonUtils.toJSONString(request));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {