调整项目结构

src/main/java/com/yunfeiyun/agmp/iotm/mq/listener/TosChannelGlobalAwareMessageListener.java

@@ -7,9 +7,9 @@ import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.iot.common.domain.TosDeviceclass;
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
 import com.yunfeiyun.agmp.iot.common.domain.TosFirm;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDeviceclassService;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDevicetypeService;
-import com.yunfeiyun.agmp.iotm.device.service.ITosFirmService;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDeviceclassService;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDevicetypeService;
+import com.yunfeiyun.agmp.iotm.web.service.ITosFirmService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotDeviceController.java

@@ -1,10 +1,10 @@
-package com.yunfeiyun.agmp.iotm.device.controller;
+package com.yunfeiyun.agmp.iotm.web.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iotm.device.service.IIotDeviceService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +45,16 @@ public class IotDeviceController extends BaseController
         List<IotDevice> list = iotDeviceService.selectIotDeviceList(iotDevice);
         return getDataTable(list);
     }
+    /**
+     * 查询设备基础列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:device:detail:list')")
+    @GetMapping("/detail/list")
+    public TableDataInfo detailList(IotDevice iotDevice) {
+        startPage();
+        List<IotDevice> list = iotDeviceService.selectIotDeviceDetailResVoList(iotDevice);
+        return getDataTable(list);
+    }
 
     /**
      * 导出设备基础列表

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotDeviceclassController.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.controller;
+package com.yunfeiyun.agmp.iotm.web.controller;
 
 import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
@@ -7,7 +7,7 @@ import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.TosDeviceclass;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDeviceclassService;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDeviceclassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotDeviceconnController.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.controller;
+package com.yunfeiyun.agmp.iotm.web.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -6,11 +6,11 @@ import javax.validation.Valid;
 
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnAddReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnEditReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListResVo;
-import com.yunfeiyun.agmp.iotm.device.service.IIotDeviceconnService;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnAddReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnEditReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnListReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnListResVo;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconnService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/IotDevicetypeController.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.controller;
+package com.yunfeiyun.agmp.iotm.web.controller;
 
 import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
@@ -7,9 +7,8 @@ import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDevicetypeListResVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.TosDevicetypeResVo;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDevicetypeService;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDevicetypeListResVo;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDevicetypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/TosDeviceclassController.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.controller;
+package com.yunfeiyun.agmp.iotm.web.controller;
 
 import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
@@ -6,10 +6,9 @@ import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
-import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
 
 import com.yunfeiyun.agmp.iot.common.domain.TosDeviceclass;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDeviceclassService;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDeviceclassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/TosDevicetypeController.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.controller;
+package com.yunfeiyun.agmp.iotm.web.controller;
 
 import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
@@ -6,11 +6,10 @@ import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
-import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
 
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.TosDevicetypeResVo;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDevicetypeService;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.TosDevicetypeResVo;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDevicetypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/yunfeiyun/agmp/iotm/device/controller/TosFirmController.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.controller;
+package com.yunfeiyun.agmp.iotm.web.controller;
 
 import com.yunfeiyun.agmp.common.annotation.Log;
 import com.yunfeiyun.agmp.common.core.controller.BaseController;
@@ -6,10 +6,9 @@ import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.enums.BusinessType;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
-import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
 
 import com.yunfeiyun.agmp.iot.common.domain.TosFirm;
-import com.yunfeiyun.agmp.iotm.device.service.ITosFirmService;
+import com.yunfeiyun.agmp.iotm.web.service.ITosFirmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/IotDevconnConfigInfoVo.java

@@ -1,6 +1,5 @@
-package com.yunfeiyun.agmp.iotm.device.domain;
+package com.yunfeiyun.agmp.iotm.web.domain;
 
-import com.yunfeiyun.agmp.common.annotation.Excel;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/reqvo/IotDeviceconnAddReqVo.java

@@ -1,6 +1,6 @@
-package com.yunfeiyun.agmp.iotm.device.domain.reqvo;
+package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
 
-import com.yunfeiyun.agmp.iotm.device.domain.IotDevconnConfigInfoVo;
+import com.yunfeiyun.agmp.iotm.web.domain.IotDevconnConfigInfoVo;
 import lombok.Data;
 
 import javax.validation.constraints.*;

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/reqvo/IotDeviceconnEditReqVo.java

@@ -1,6 +1,6 @@
-package com.yunfeiyun.agmp.iotm.device.domain.reqvo;
+package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
 
-import com.yunfeiyun.agmp.iotm.device.domain.IotDevconnConfigInfoVo;
+import com.yunfeiyun.agmp.iotm.web.domain.IotDevconnConfigInfoVo;
 import lombok.Data;
 
 import javax.validation.constraints.Max;

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/reqvo/IotDeviceconnListReqVo.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.domain.reqvo;
+package com.yunfeiyun.agmp.iotm.web.domain.reqvo;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
 import lombok.Data;

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/resvo/IotDeviceconnInfoResVo.java

@@ -1,7 +1,7 @@
-package com.yunfeiyun.agmp.iotm.device.domain.resvo;
+package com.yunfeiyun.agmp.iotm.web.domain.resvo;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.iotm.device.domain.IotDevconnConfigInfoVo;
+import com.yunfeiyun.agmp.iotm.web.domain.IotDevconnConfigInfoVo;
 import lombok.Data;
 
 import java.util.List;

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/resvo/IotDeviceconnListResVo.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.domain.resvo;
+package com.yunfeiyun.agmp.iotm.web.domain.resvo;
 
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceconnTypeEnum;
 import lombok.Data;

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/resvo/IotDevicetypeListResVo.java

@@ -1,7 +1,6 @@
-package com.yunfeiyun.agmp.iotm.device.domain.resvo;
+package com.yunfeiyun.agmp.iotm.web.domain.resvo;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
-import com.yunfeiyun.agmp.iot.common.domain.IotBaseEntity;
 import lombok.Data;
 
 /**

src/main/java/com/yunfeiyun/agmp/iotm/device/domain/resvo/TosDevicetypeResVo.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.domain.resvo;
+package com.yunfeiyun.agmp.iotm.web.domain.resvo;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;

src/main/java/com/yunfeiyun/agmp/iotm/device/mapper/IotDeviceMapper.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.mapper;
+package com.yunfeiyun.agmp.iotm.web.mapper;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 

src/main/java/com/yunfeiyun/agmp/iotm/device/mapper/IotDeviceconnMapper.java

@@ -1,8 +1,8 @@
-package com.yunfeiyun.agmp.iotm.device.mapper;
+package com.yunfeiyun.agmp.iotm.web.mapper;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListResVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnListReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnListResVo;
 
 import java.util.List;
 

src/main/java/com/yunfeiyun/agmp/iotm/device/mapper/TosDeviceclassMapper.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.mapper;
+package com.yunfeiyun.agmp.iotm.web.mapper;
 
 
 

src/main/java/com/yunfeiyun/agmp/iotm/device/mapper/TosDevicetypeMapper.java

@@ -1,8 +1,8 @@
-package com.yunfeiyun.agmp.iotm.device.mapper;
+package com.yunfeiyun.agmp.iotm.web.mapper;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.TosDevicetypeResVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.TosDevicetypeResVo;
 
 import java.util.List;
 

src/main/java/com/yunfeiyun/agmp/iotm/device/mapper/TosFirmMapper.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.mapper;
+package com.yunfeiyun.agmp.iotm.web.mapper;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.TosFirm;

src/main/java/com/yunfeiyun/agmp/iotm/device/service/IIotDeviceService.java

@@ -1,7 +1,6 @@
-package com.yunfeiyun.agmp.iotm.device.service;
+package com.yunfeiyun.agmp.iotm.web.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-
 import java.util.List;
 
 /**
@@ -29,6 +28,11 @@ public interface IIotDeviceService
     public List<IotDevice> selectIotDeviceList(IotDevice iotDevice);
 
     /**
+     * 查询设备详情列表,此接口为通用接口，用于查询单一设备类型的详细数据,如需要查询多设备类型的数据在一个接口内,单独写接口
+     * */
+    public <T> List<T> selectIotDeviceDetailResVoList(IotDevice iotDevice);
+
+    /**
      * 新增设备基础
      * 
      * @param iotDevice 设备基础

src/main/java/com/yunfeiyun/agmp/iotm/device/service/IIotDeviceconnService.java

@@ -1,11 +1,11 @@
-package com.yunfeiyun.agmp.iotm.device.service;
+package com.yunfeiyun.agmp.iotm.web.service;
 
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnAddReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnEditReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnInfoResVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListResVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnAddReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnEditReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnListReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnInfoResVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnListResVo;
 
 import java.util.List;
 

src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosDeviceclassService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.service;
+package com.yunfeiyun.agmp.iotm.web.service;
 
 
 

src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosDevicetypeService.java

@@ -1,10 +1,10 @@
-package com.yunfeiyun.agmp.iotm.device.service;
+package com.yunfeiyun.agmp.iotm.web.service;
 
 
 
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDevicetypeListResVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.TosDevicetypeResVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDevicetypeListResVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.TosDevicetypeResVo;
 
 import java.util.List;
 

src/main/java/com/yunfeiyun/agmp/iotm/device/service/ITosFirmService.java

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.service;
+package com.yunfeiyun.agmp.iotm.web.service;
 
 
 

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

@@ -1,11 +1,15 @@
-package com.yunfeiyun.agmp.iotm.device.service.impl;
+package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iotm.device.mapper.IotDeviceMapper;
-import com.yunfeiyun.agmp.iotm.device.service.IIotDeviceService;
+import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
+import com.yunfeiyun.agmp.iotm.common.service.IotDeviceBaseService;
+
+import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
 
 import com.yunfeiyun.agmp.iotm.mq.service.SendToTosMsgService;
 
@@ -30,6 +34,10 @@ public class IotDeviceServiceImpl implements IIotDeviceService
     private SendToTosMsgService sendToTosMsgService;
     @Resource
     private SendToIotsMsgService sendToIotsMsgService;
+    @Resource
+    private Map<String, IotDeviceBaseService> iotDeviceBaseServiceMap;
+    @Resource
+    private TypeCacheService typeCacheService;
 
     /**
      * 查询设备基础
@@ -54,6 +62,13 @@ public class IotDeviceServiceImpl implements IIotDeviceService
         return iotDeviceMapper.selectIotDeviceList(iotDevice);
     }
 
+    @Override
+    public <T> List<T> selectIotDeviceDetailResVoList(IotDevice iotDevice) {
+        String serviceName = typeCacheService.getServiceNameByDevTypeBid(iotDevice.getDevtypeBid());
+        IotDeviceBaseService iotDeviceBaseService = iotDeviceBaseServiceMap.get(serviceName);
+        return iotDeviceBaseService.list(iotDevice);
+    }
+
     /**
      * 新增设备基础
      * 

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

@@ -1,4 +1,4 @@
-package com.yunfeiyun.agmp.iotm.device.service.impl;
+package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,15 +12,15 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceconnTypeEnum;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
-import com.yunfeiyun.agmp.iotm.device.domain.IotDevconnConfigInfoVo;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnAddReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnEditReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnInfoResVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListResVo;
-import com.yunfeiyun.agmp.iotm.device.mapper.IotDeviceconnMapper;
-import com.yunfeiyun.agmp.iotm.device.service.IIotDeviceconnService;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDevicetypeService;
+import com.yunfeiyun.agmp.iotm.web.domain.IotDevconnConfigInfoVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnAddReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnEditReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnListReqVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnInfoResVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnListResVo;
+import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceconnMapper;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconnService;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDevicetypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,9 +1,9 @@
-package com.yunfeiyun.agmp.iotm.device.service.impl;
+package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.TosDeviceclass;
-import com.yunfeiyun.agmp.iotm.device.mapper.TosDeviceclassMapper;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDeviceclassService;
+import com.yunfeiyun.agmp.iotm.web.mapper.TosDeviceclassMapper;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDeviceclassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,15 +1,12 @@
-package com.yunfeiyun.agmp.iotm.device.service.impl;
+package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 
-import com.yunfeiyun.agmp.common.enums.RedisCacheKey;
-import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
-import com.yunfeiyun.agmp.common.utils.DictUtils;
 import com.yunfeiyun.agmp.iot.common.domain.TosDevicetype;
 import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDevicetypeListResVo;
-import com.yunfeiyun.agmp.iotm.device.domain.resvo.TosDevicetypeResVo;
-import com.yunfeiyun.agmp.iotm.device.mapper.TosDevicetypeMapper;
-import com.yunfeiyun.agmp.iotm.device.service.ITosDevicetypeService;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDevicetypeListResVo;
+import com.yunfeiyun.agmp.iotm.web.domain.resvo.TosDevicetypeResVo;
+import com.yunfeiyun.agmp.iotm.web.mapper.TosDevicetypeMapper;
+import com.yunfeiyun.agmp.iotm.web.service.ITosDevicetypeService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,9 +1,9 @@
-package com.yunfeiyun.agmp.iotm.device.service.impl;
+package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 
 import com.yunfeiyun.agmp.iot.common.domain.TosFirm;
-import com.yunfeiyun.agmp.iotm.device.mapper.TosFirmMapper;
-import com.yunfeiyun.agmp.iotm.device.service.ITosFirmService;
+import com.yunfeiyun.agmp.iotm.web.mapper.TosFirmMapper;
+import com.yunfeiyun.agmp.iotm.web.service.ITosFirmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/resources/mapper/IotDeviceMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunfeiyun.agmp.iotm.device.mapper.IotDeviceMapper">
+<mapper namespace="com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper">
     
     <resultMap type="IotDevice" id="IotDeviceResult">
         <result property="id"    column="id"    />

src/main/resources/mapper/IotDeviceconnMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunfeiyun.agmp.iotm.device.mapper.IotDeviceconnMapper">
+<mapper namespace="com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceconnMapper">
     
     <resultMap type="IotDeviceconn" id="IotDeviceconnResult">
         <result property="id"    column="id"    />
@@ -47,8 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listDeviceconn"
-            parameterType="com.yunfeiyun.agmp.iotm.device.domain.reqvo.IotDeviceconnListReqVo"
-            resultType="com.yunfeiyun.agmp.iotm.device.domain.resvo.IotDeviceconnListResVo">
+            parameterType="com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceconnListReqVo"
+            resultType="com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceconnListResVo">
         SELECT dcn.devconnBid, dcn.devconnType, dcn.devconnName, dcn.devconnRemark, dc.devclassBid, dc.devclassCode,
             dc.devclassName, dt.devtypeBid, dt.devtypeCode, dt.devtypeName, dcn.devconnCreateddate
         FROM IotDeviceconn AS dcn

src/main/resources/mapper/TosDeviceclassMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunfeiyun.agmp.iotm.device.mapper.TosDeviceclassMapper">
+<mapper namespace="com.yunfeiyun.agmp.iotm.web.mapper.TosDeviceclassMapper">
     
     <resultMap type="TosDeviceclass" id="TosDeviceclassResult">
         <result property="id"    column="id"    />

src/main/resources/mapper/TosDevicetypeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunfeiyun.agmp.iotm.device.mapper.TosDevicetypeMapper">
+<mapper namespace="com.yunfeiyun.agmp.iotm.web.mapper.TosDevicetypeMapper">
     
     <resultMap type="TosDevicetype" id="TosDevicetypeResult">
         <result property="id"    column="id"    />
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where devtypeBid = #{devtypeBid}
     </select>
     <select id="selectTosDevicetypeResVoList"
-            resultType="com.yunfeiyun.agmp.iotm.device.domain.resvo.TosDevicetypeResVo">
+            resultType="com.yunfeiyun.agmp.iotm.web.domain.resvo.TosDevicetypeResVo">
         SELECT
         tdt.id,
         tdt.devtypeBid,

src/main/resources/mapper/TosFirmMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yunfeiyun.agmp.iotm.device.mapper.TosFirmMapper">
+<mapper namespace="com.yunfeiyun.agmp.iotm.web.mapper.TosFirmMapper">
     
     <resultMap type="TosFirm" id="TosFirmResult">
         <result property="id"    column="id"    />