Преглед изворни кода

新增 气象设备 折线图,列表,导出 增加风向显示

zhaiyifei пре 9 месеци
родитељ
комит
d88c2dbea1

+ 10 - 6
src/main/java/com/yunfeiyun/agmp/iots/device/controller/TestController.java

@@ -11,6 +11,7 @@ import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
+import com.yunfeiyun.agmp.iot.common.util.dev.QxzTypeUtil;
 import com.yunfeiyun.agmp.iots.core.cmd.core.CmdDispatcherService;
 import com.yunfeiyun.agmp.iots.device.domain.WarnTestReq;
 import com.yunfeiyun.agmp.iots.device.mapper.IotDeviceMapper;
@@ -597,7 +598,7 @@ public class TestController {
         return iotCbdimg;
     }
 
-    @PostMapping("/warn/qxz")
+    @PostMapping("/warn")
     public AjaxResult warnQxzTest(@RequestBody WarnTestReq req) throws Exception {
         String devBid = req.getDevBid();
         JSONObject data = req.getData();
@@ -609,11 +610,14 @@ public class TestController {
         if (iotDevice == null) {
             throw new IotBizException(IotErrorCode.FAILURE.getCode(), "设备不存在");
         }
-
-        YfQxzDeviceImpl yfQxzDevice = (YfQxzDeviceImpl) iYfQxzDevice;
-        String devUpdateddate = DateUtils.dateTimeNow();
-        yfQxzDevice.processData(iotDevice, data, devUpdateddate);
-
+        String devtypeBid = iotDevice.getDevtypeBid();
+        if(QxzTypeUtil.isYfCommQxz(devtypeBid)){
+            YfQxzDeviceImpl yfQxzDevice = (YfQxzDeviceImpl) iYfQxzDevice;
+            String devUpdateddate = DateUtils.dateTimeNow();
+            yfQxzDevice.processData(iotDevice, data, devUpdateddate);
+        }else{
+            throw new IotBizException(IotErrorCode.FAILURE.getCode(), "设备类型不支持");
+        }
         return AjaxResult.success();
     }
 }