新增 吸虫塔设备对接

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/controller/IotDeviceCbdController.java

@@ -17,8 +17,8 @@ import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbddata;
 import com.yunfeiyun.agmp.iot.common.domain.IotCbdimg;
+import com.yunfeiyun.agmp.iot.common.domain.IotXctdata;
 import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdConfigEditReqVo;
-import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdModifyDevRecogTypeReqVo;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
@@ -26,6 +26,7 @@ import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListResVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceRefreshService;
+import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdModifyDevRecogTypeReqVo;
 import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdimgCountResVo;
 import com.yunfeiyun.agmp.iotm.device.pest.service.IotCbdService;
 import com.yunfeiyun.agmp.iotm.util.ValidateUtil;
@@ -84,12 +85,13 @@ public class IotDeviceCbdController extends BaseController {
      * @param reqVo
      * @return
      */
-    @GetMapping({"/list", "/gk/list", "/sd/list", "/pt/list"})
+    @GetMapping({"/list", "/gk/list", "/sd/list", "/pt/list", "/xct/list"})
     public TableDataInfo list(HttpServletRequest request, IotDeviceListReqVo reqVo) {
         String reqUri = request.getRequestURI();
         log.info("【{}】【测报灯】【列表】客户id {}", LogCore.getSeq(), getCustomerId());
         String[] devTypeList = new String[]{
-                IotDeviceDictConst.TYPE_YF_GKCBD, IotDeviceDictConst.TYPE_YF_SDCBD, IotDeviceDictConst.TYPE_YF_CBD
+                IotDeviceDictConst.TYPE_YF_GKCBD, IotDeviceDictConst.TYPE_YF_SDCBD, IotDeviceDictConst.TYPE_YF_CBD,
+                IotDeviceDictConst.TYPE_YF_XCT
         };
         if(reqUri.endsWith("/gk/list")){
             devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_GKCBD};
@@ -97,6 +99,8 @@ public class IotDeviceCbdController extends BaseController {
             devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_SDCBD};
         }else if(reqUri.endsWith("/pt/list")){
             devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_CBD};
+        }else if(reqUri.endsWith("/xct/list")){
+            devTypeList = new String[]{IotDeviceDictConst.TYPE_YF_XCT};
         }
         reqVo.setDevtypeBidList(Arrays.asList(devTypeList));
 
@@ -171,9 +175,16 @@ public class IotDeviceCbdController extends BaseController {
         return new AjaxResult(ErrorCode.SUCCESS.getCode(), "下发成功，等待设备响应结果", taskId);
     }
 
-    @GetMapping("/data/list")
-    public TableDataInfo getList(IotDeviceDataListReqVo reqVo) {
-        ValidateUtil.validateDevBid(reqVo.getDevBid());
+    @GetMapping({"/data/list", "/xct/data/list"})
+    public TableDataInfo getList(HttpServletRequest request, IotDeviceDataListReqVo reqVo) {
+        String devBid = reqVo.getDevBid();
+        ValidateUtil.validateDevBid(devBid);
+        String reqUri = request.getRequestURI();
+        Class tableClass = IotCbddata.class;
+        if(reqUri.endsWith("/xct/data/list")) {
+            tableClass = IotXctdata.class;
+        }
+
         Map<String, Object> map = new HashMap<>();
         map.put("devBid", reqVo.getDevBid());
         if (StringUtils.isNotEmpty(reqVo.getStartTime()) && StringUtils.isEmpty(reqVo.getEndTime())) {
@@ -192,7 +203,7 @@ public class IotDeviceCbdController extends BaseController {
             pageDomain.setOrderByColumn("cbddataCreatedDate");
         }
 
-        IPage page = mongoService.findListPage(IotCbddata.class, map, pageDomain);
+        IPage page = mongoService.findListPage(tableClass, map, pageDomain);
         List<?> data = page.getRecords();
         List<JSONObject> list = new ArrayList<>();
         for (Object datum : data) {

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/IotCbdService.java

@@ -1,21 +1,14 @@
 package com.yunfeiyun.agmp.iotm.device.pest.service;
 
-import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdConfigEditReqVo;
-import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdModifyDevRecogTypeReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
-import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
-
-import java.util.List;
+import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdModifyDevRecogTypeReqVo;
 
 /**
  * @author 123
  */
 public interface IotCbdService extends IotDeviceBaseService {
-    public List<IotDevice> list(IotDeviceBaseListReqVo iotDeviceBaseListReqVo);
-
-    public IotDevice info(IotDeviceBaseListReqVo iotDeviceBaseListReqVo);
     /**抓拍*/
     public String takePhoto(String devId);
 

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotCbdServiceImpl.java

@@ -11,13 +11,12 @@ import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
 import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdConfigEditReqVo;
-import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdModifyDevRecogTypeReqVo;
 import com.yunfeiyun.agmp.iot.common.enums.EnumDevRecogType;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
 import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
-import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
+import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdModifyDevRecogTypeReqVo;
 import com.yunfeiyun.agmp.iotm.device.pest.service.IotCbdService;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotCmdtaskService;
@@ -28,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * 测报灯
@@ -38,7 +36,7 @@ import java.util.List;
  * */
 @Slf4j
 @Service(value = ServiceNameConst.SERVICE_YF_CBD)
-public class IotCbdServiceImpl extends IotDeviceBaseServiceImpl implements IotCbdService {
+public class  IotCbdServiceImpl extends IotDeviceBaseServiceImpl implements IotCbdService {
 
     @Resource
     private IotDeviceMapper iotDeviceMapper;
@@ -50,16 +48,6 @@ public class IotCbdServiceImpl extends IotDeviceBaseServiceImpl implements IotCb
 
     @Resource
     private IIotDeviceconfigService iIotDeviceconfigService;
-
-    @Override
-    public List<IotDevice> list(IotDeviceBaseListReqVo iotDeviceBaseCtlReqVo){
-        return iotDeviceMapper.selectIotDeviceList(iotDeviceBaseCtlReqVo);
-    }
-    @Override
-    public IotDevice info(IotDeviceBaseListReqVo iotDeviceBaseListReqVo){
-        return iotDeviceMapper.selectIotDeviceByDevBid(iotDeviceBaseListReqVo.getDevBid());
-    }
-
     /**
      * 发送更改配置
      * @param iotCbdConfigEditReqVo