新增 气象站刷新设备时候主动查询设备配置信息功能

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/controller/IotDeviceQxzController.java

@@ -1,6 +1,5 @@
 package com.yunfeiyun.agmp.iotm.device.qxsqz.controller;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.annotation.Excel;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
@@ -20,6 +19,7 @@ import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseFunReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceCommonService;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceRefreshService;
+import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.IotQxzConfigDto;
 import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.IotQxzConfigEditReqVo;
 import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.QxzExportDataDto;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
@@ -220,8 +220,8 @@ public class IotDeviceQxzController extends BaseController {
         iotDeviceBaseFunReqVo.setDevBid(reqVo.getDevBid());
         iotDeviceBaseFunReqVo.setMethodName("configInfo");
         iotDeviceBaseFunReqVo.setParam(reqVo);
-        JSONObject jsonObject = iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
-        return AjaxResult.success(jsonObject);
+        IotQxzConfigDto iotQxzConfigDto = iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
+        return AjaxResult.success(iotQxzConfigDto);
     }
 
     /**
@@ -234,7 +234,7 @@ public class IotDeviceQxzController extends BaseController {
     public AjaxResult sendConfigCmd(@RequestBody IotQxzConfigEditReqVo reqVo) {
         log.info("【{}】【气象墒情】【下发指令配置】客户id {}", LogCore.getSeq(), getCustomerId());
         String devBid = reqVo.getDevBid();
-        JSONObject devConfig = reqVo.getDevConfig();
+        IotQxzConfigDto devConfig = reqVo.getDevConfig();
         if(StringUtils.isEmpty(devBid) || devConfig == null){
             throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(),"参数不能为空");
         }

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/domain/IotQxzConfigDto.java

@@ -0,0 +1,11 @@
+package com.yunfeiyun.agmp.iotm.device.qxsqz.domain;
+
+import lombok.Data;
+
+@Data
+public class IotQxzConfigDto {
+    /**
+     * 上传间隔
+     */
+    private String interval;
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/domain/IotQxzConfigEditReqVo.java

@@ -1,12 +1,11 @@
 package com.yunfeiyun.agmp.iotm.device.qxsqz.domain;
 
-import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import lombok.Data;
 
 @Data
 public class IotQxzConfigEditReqVo {
     private String devBid;
-    private JSONObject devConfig;
+    private IotQxzConfigDto devConfig;
     private IotDevice iotDevice;
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/service/IIotQxzCommService.java

@@ -24,6 +24,7 @@ import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
 import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
+import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.IotQxzConfigDto;
 import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.IotQxzConfigEditReqVo;
 import com.yunfeiyun.agmp.iotm.device.qxsqz.domain.QxzDataLast24hDto;
 import com.yunfeiyun.agmp.iotm.util.MongoUtil;
@@ -398,7 +399,7 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
         log.info("【“刷新”指令集任务】创建成功，taskUuid：{}", taskUuid);
     }
 
-    public JSONObject configInfo(IotDeviceDataListReqVo reqVo){
+    public IotQxzConfigDto configInfo(IotDeviceDataListReqVo reqVo){
         String devBid = reqVo.getDevBid();
         if(StringUtils.isEmpty(devBid)){
             throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(),"参数不能为空");
@@ -408,17 +409,18 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
             throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(),"设备不存在");
         }
         IotDeviceconfig iotDeviceconfig = iIotDeviceconfigService.selectIotDeviceConfigByDevBid(devBid);
-        JSONObject jsonObject = new JSONObject();
+        IotQxzConfigDto iotQxzConfigDto = new IotQxzConfigDto();
         if(iotDeviceconfig != null){
-            jsonObject = JSONObject.parseObject(iotDeviceconfig.getDevcfgContext());
+            JSONObject jsonObject = JSONObject.parseObject(iotDeviceconfig.getDevcfgContext());
+            iotQxzConfigDto.setInterval((String) jsonObject.get("interval"));
         }
-        return jsonObject;
+        return iotQxzConfigDto;
     }
 
     public String sendConfigCmd(IotQxzConfigEditReqVo reqVo) {
         IotDevice iotDevice = reqVo.getIotDevice();
         String devBid = iotDevice.getDevBid();
-        JSONObject devConfig = reqVo.getDevConfig();
+        IotQxzConfigDto devConfig = reqVo.getDevConfig();
 
         IotDeviceconfig iotDeviceconfig = iIotDeviceconfigService.selectIotDeviceConfigByDevBid(devBid);
         if (null == iotDeviceconfig) {

src/main/java/com/yunfeiyun/agmp/iotm/device/scd/service/impl/IotYfScdServiceImpl.java

@@ -425,6 +425,7 @@ public class IotYfScdServiceImpl extends IIotScdCommService {
         payload.put("cmd", "ctr_clear");
 
         IotDeviceconfig iotDeviceconfig = new IotDeviceconfig();
+        iotDeviceconfig.setTid(iotDevice.getTid());
         iotDeviceconfig.setDevBid(iotDevice.getDevBid());
         iotDeviceconfig.setDevcfgContext(JSONUtils.toJSONString(payload));