新增 爱迪智农管式墒情设备对接

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

@@ -77,9 +77,13 @@ public class IotDeviceQxzController extends BaseController {
         }else if(reqUri.endsWith("/qxz/pt/list")){
             devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_QXZ, IotDeviceDictConst.TYPE_XPH_YF_QXZ};
         } else if (reqUri.endsWith("/sqz/list")) {
-            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_SQZ, IotDeviceDictConst.TYPE_XPH_YF_SQZ};
+            devTypeList = new String[]{
+                    IotDeviceDictConst.TYPE_YF_SQZ, IotDeviceDictConst.TYPE_XPH_YF_SQZ, IotDeviceDictConst.TYPE_ADZN_GSSQ
+            };
         } else if (reqUri.endsWith("/sqz/pt/list")) {
-            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_SQZ, IotDeviceDictConst.TYPE_XPH_YF_SQZ};
+            devTypeList = new String[]{
+                    IotDeviceDictConst.TYPE_YF_SQZ, IotDeviceDictConst.TYPE_XPH_YF_SQZ, IotDeviceDictConst.TYPE_ADZN_GSSQ
+            };
         }
         List<IotDeviceListResVo> list = null;
         if (devTypeList != null) {

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

@@ -14,7 +14,7 @@ import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
-import com.yunfeiyun.agmp.iot.common.constant.device.ElementFactorUtil;
+import com.yunfeiyun.agmp.iot.common.constant.device.ElementFormatUtil;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
@@ -74,6 +74,9 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
             case IotDeviceDictConst.TYPE_XPH_YF_SQZ:
                 tableClass = IotXphYfqxzdata.class;
                 break;
+            case IotDeviceDictConst.TYPE_ADZN_GSSQ:
+                tableClass = IotAdznGssqdata.class;
+                break;
             default:
                 break;
         }
@@ -158,7 +161,7 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
         List<List<IotQxzDataListRseVo>> rest = new ArrayList<>();
         for(QxzDataListDto item: qxzDataListDtoList){
             List<QxzDataDto> dataList = item.getDataList();
-            List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFactorUtil.qxzListProcessData(dataList, factorList, findDevice, isDisable);
+            List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFormatUtil.elementFormat(findDevice, dataList, factorList, isDisable);
             rest.add(iotQxzDataListRseVoList);
         }
         rspData.setData(rest);
@@ -263,8 +266,7 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
         IotDevicefactor param = new IotDevicefactor();
         param.setDevBid(devBid);
         List<IotDevicefactor> factorList = iotDevicefactorService.selectIotDevicefactorList(param);
-        List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFactorUtil.qxzChartProcessData(dataList, factorList, findDevice, false);
-        return iotQxzDataListRseVoList;
+        return ElementFormatUtil.elementFormat(findDevice, dataList, factorList, false);
     }
 
     /**
@@ -337,17 +339,15 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
         IotDevicefactor param = new IotDevicefactor();
         param.setDevBid(devBid);
         List<IotDevicefactor> factorList = iotDevicefactorService.selectIotDevicefactorList(param);
+        List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFormatUtil.elementFormat(findDevice, qxzDataLast24hDtoList, factorList, false);
+
+
         Map<String, QxzDataLast24hDto> iotXphLast24hDtoMap = new HashMap<>();
-        List<QxzDataDto> dataList = new ArrayList<>();
         for(QxzDataLast24hDto item: qxzDataLast24hDtoList){
-            String key = ElementFactorUtil.getAddress(item.getEName(), item.getEKey());
+            String key = ElementFormatUtil.getAddress(item.getEName(), item.getEKey());
             iotXphLast24hDtoMap.put(key, item);
-            QxzDataDto dto = new QxzDataDto();
-            BeanUtils.copyProperties(item, dto);
-            dataList.add(dto);
         }
 
-        List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFactorUtil.qxzListProcessData(dataList, factorList, findDevice, false);
         for(IotQxzDataListRseVo item: iotQxzDataListRseVoList){
             QxzDataLast24hDto qxzDataLast24hDto = iotXphLast24hDtoMap.get(item.getAddress());
             item.setMinVal(qxzDataLast24hDto.getMinVal());

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

@@ -0,0 +1,24 @@
+package com.yunfeiyun.agmp.iotm.device.qxsqz.service.impl;
+
+import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
+import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
+import com.yunfeiyun.agmp.iotm.device.qxsqz.service.IIotQxzCommService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 爱迪智农管式墒情
+ *
+ */
+
+@Slf4j
+@Service(value = ServiceNameConst.SERVICE_ADZN_GSSQ)
+public class IotAdznGssqServiceImpl extends IIotQxzCommService {
+    @Override
+    public void refresh(DeviceRefreshDto reqVo) {
+        IotDevice findDevice = reqVo.getIotDevice();
+        String devBid = findDevice.getDevBid();
+        log.info("创建【“刷新”指令集任务】，设备类型：{} {} 爱迪智农管式墒情不支持设备操控", findDevice.getDevtypeName(), devBid);
+    }
+}