新增 新普惠管式墒情设备适配

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

@@ -9,11 +9,11 @@ import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.SensdataExcelUtil;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
-import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotQxzDataListRseVo;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceStatusTypeEnum;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
+import com.yunfeiyun.agmp.iot.common.util.dev.QxzTypeUtil;
 import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseFunReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
@@ -74,21 +74,15 @@ public class IotDeviceQxzController extends BaseController {
         String[] devTypeList = null;
 
         if(reqUri.endsWith("/qxz/list")){
-            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_QXZ, IotDeviceDictConst.TYPE_XPH_YF_QXZ};
+            devTypeList = QxzTypeUtil.getAllQxzTypes();
         }else if(reqUri.endsWith("/qxz/pt/list")){
-            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_QXZ, IotDeviceDictConst.TYPE_XPH_YF_QXZ};
+            devTypeList = QxzTypeUtil.getPtQxzTypes();
         } else if (reqUri.endsWith("/sqz/list")) {
-            devTypeList = new String[]{
-                    IotDeviceDictConst.TYPE_YF_SQZ, IotDeviceDictConst.TYPE_XPH_YF_SQZ, IotDeviceDictConst.TYPE_ADZN_GSSQ
-            };
+            devTypeList = QxzTypeUtil.getAllSqzTypes();
         } else if (reqUri.endsWith("/sqz/pt/list")) {
-            devTypeList = new String[]{
-                    IotDeviceDictConst.TYPE_YF_SQZ, IotDeviceDictConst.TYPE_XPH_YF_SQZ
-            };
+            devTypeList = QxzTypeUtil.getPtSqzTypes();
         } else if (reqUri.endsWith("/sqz/gssq/list")) {
-            devTypeList = new String[]{
-                    IotDeviceDictConst.TYPE_ADZN_GSSQ
-            };
+            devTypeList = QxzTypeUtil.getGssqTypes();
         }
         List<IotDeviceListResVo> list = null;
         if (devTypeList != null) {

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

@@ -20,6 +20,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.iotm.device.common.domin.DeviceRefreshDto;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
@@ -65,20 +66,12 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
 
     public Class getTableClass(String devtypeBid) {
         Class tableClass = null;
-        switch (devtypeBid){
-            case IotDeviceDictConst.TYPE_YF_QXZ:
-            case IotDeviceDictConst.TYPE_YF_SQZ:
-                tableClass = IotYfqxzdata.class;
-                break;
-            case IotDeviceDictConst.TYPE_XPH_YF_QXZ:
-            case IotDeviceDictConst.TYPE_XPH_YF_SQZ:
-                tableClass = IotXphYfqxzdata.class;
-                break;
-            case IotDeviceDictConst.TYPE_ADZN_GSSQ:
-                tableClass = IotAdznGssqdata.class;
-                break;
-            default:
-                break;
+        if(QxzTypeUtil.isXphYfQxSq(devtypeBid)){
+            tableClass = IotXphYfqxzdata.class;
+        }else if(QxzTypeUtil.isYfQxSq(devtypeBid)){
+            tableClass = IotYfqxzdata.class;
+        }else if (devtypeBid.equals(IotDeviceDictConst.TYPE_ADZN_GSSQ)) {
+            tableClass = IotAdznGssqdata.class;
         }
         return tableClass;
     }