diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionDevMainReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
similarity index 98%
rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionDevMainReportParam.java
rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
index b0c956928..5c1d22b46 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionDevMainReportParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.pojo.param.user;
+package com.njcn.supervision.pojo.param.device;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionTempDeviceReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java
similarity index 98%
rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionTempDeviceReportParam.java
rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java
index 5819f1041..a8ba48aa8 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionTempDeviceReportParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.pojo.param.user;
+package com.njcn.supervision.pojo.param.device;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionTempLineReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
similarity index 98%
rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionTempLineReportParam.java
rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
index ed54adcef..71c2053e6 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/SupervisionTempLineReportParam.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.pojo.param.user;
+package com.njcn.supervision.pojo.param.device;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionDevMainReportPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java
similarity index 98%
rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionDevMainReportPO.java
rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java
index f8533edc2..f64c048bf 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionDevMainReportPO.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.pojo.po.dev;
+package com.njcn.supervision.pojo.po.device;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionTempDeviceReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java
similarity index 99%
rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionTempDeviceReport.java
rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java
index 12e8c054d..4e0f6e6f2 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionTempDeviceReport.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.pojo.po.dev;
+package com.njcn.supervision.pojo.po.device;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionTempLineReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java
similarity index 98%
rename from pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionTempLineReport.java
rename to pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java
index 165e27b5c..4be248416 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/dev/SupervisionTempLineReport.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.pojo.po.dev;
+package com.njcn.supervision.pojo.po.device;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/dev/DeVReportManageController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java
similarity index 93%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/dev/DeVReportManageController.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java
index e0d111081..deb934996 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/dev/DeVReportManageController.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/DeVReportManageController.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.controller.dev;
+package com.njcn.supervision.controller.device;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -6,8 +6,8 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.supervision.pojo.param.user.SupervisionDevMainReportParam;
-import com.njcn.supervision.service.dev.SupervisionDevMainReportPOService;
+import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
+import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/QuitRunningDeviceMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java
similarity index 86%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/QuitRunningDeviceMapper.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java
index 77b16a104..e05988f27 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/QuitRunningDeviceMapper.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/QuitRunningDeviceMapper.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.mapper.mapper;
+package com.njcn.supervision.mapper.device;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionDevMainReportPOMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionDevMainReportPOMapper.java
similarity index 69%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionDevMainReportPOMapper.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionDevMainReportPOMapper.java
index f63fcdbff..4d3749393 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionDevMainReportPOMapper.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionDevMainReportPOMapper.java
@@ -1,7 +1,7 @@
-package com.njcn.supervision.mapper.dev;
+package com.njcn.supervision.mapper.device;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO;
+import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 
 /**
  * Description:
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempDeviceReportMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempDeviceReportMapper.java
similarity index 69%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempDeviceReportMapper.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempDeviceReportMapper.java
index 2ea396df3..d628e1ce6 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempDeviceReportMapper.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempDeviceReportMapper.java
@@ -1,7 +1,7 @@
-package com.njcn.supervision.mapper.dev;
+package com.njcn.supervision.mapper.device;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport;
+import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
 
 /**
  * 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempLineReportMapper.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineReportMapper.java
similarity index 70%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempLineReportMapper.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineReportMapper.java
index 20a7ed51c..165bc4a37 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/SupervisionTempLineReportMapper.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/SupervisionTempLineReportMapper.java
@@ -1,7 +1,7 @@
-package com.njcn.supervision.mapper.dev;
+package com.njcn.supervision.mapper.device;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport;
+import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
 
 /**
  * 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/mapping/QuitRunningDeviceMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml
similarity index 73%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/mapping/QuitRunningDeviceMapper.xml
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml
index 9d9e91746..a5ed7a135 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/mapper/mapping/QuitRunningDeviceMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/QuitRunningDeviceMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.supervision.mapper.mapper.QuitRunningDeviceMapper">
+<mapper namespace="com.njcn.supervision.mapper.device.QuitRunningDeviceMapper">
 
 </mapper>
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionDevMainReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml
similarity index 95%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionDevMainReportPOMapper.xml
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml
index b570e6bf7..e0506509c 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionDevMainReportPOMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionDevMainReportPOMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.supervision.mapper.dev.SupervisionDevMainReportPOMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO">
+<mapper namespace="com.njcn.supervision.mapper.device.SupervisionDevMainReportPOMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO">
     <!--@mbg.generated-->
     <!--@Table supervision_dev_main_report-->
     <id column="id" jdbcType="VARCHAR" property="id" />
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempDeviceReportMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempDeviceReportMapper.xml
similarity index 97%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempDeviceReportMapper.xml
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempDeviceReportMapper.xml
index 78a5a86e6..d32a47590 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempDeviceReportMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempDeviceReportMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.supervision.mapper.dev.SupervisionTempDeviceReportMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport">
+<mapper namespace="com.njcn.supervision.mapper.device.SupervisionTempDeviceReportMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport">
     <!--@mbg.generated-->
     <!--@Table supervision_temp_device_report-->
     <id column="id" jdbcType="INTEGER" property="id" />
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempLineReportMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineReportMapper.xml
similarity index 95%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempLineReportMapper.xml
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineReportMapper.xml
index 6174cec9c..2f883c9c6 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/dev/mapping/SupervisionTempLineReportMapper.xml
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineReportMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.supervision.mapper.dev.SupervisionTempLineReportMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport">
+<mapper namespace="com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper">
+  <resultMap id="BaseResultMap" type="com.njcn.supervision.pojo.po.device.SupervisionTempLineReport">
     <!--@mbg.generated-->
     <!--@Table supervision_temp_line_report-->
     <result column="id" jdbcType="VARCHAR" property="id" />
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionDevMainReportPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionDevMainReportPOService.java
similarity index 74%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionDevMainReportPOService.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionDevMainReportPOService.java
index 420e83795..7729c8d55 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionDevMainReportPOService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionDevMainReportPOService.java
@@ -1,8 +1,8 @@
-package com.njcn.supervision.service.dev;
+package com.njcn.supervision.service.device;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.supervision.pojo.param.user.SupervisionDevMainReportParam;
-import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO;
+import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
+import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
 
 import java.util.List;
 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempDeviceReportService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempDeviceReportService.java
similarity index 70%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempDeviceReportService.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempDeviceReportService.java
index 220262407..a3fbc974e 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempDeviceReportService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempDeviceReportService.java
@@ -1,6 +1,6 @@
-package com.njcn.supervision.service.dev;
+package com.njcn.supervision.service.device;
 
-import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport;
+import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
 import com.baomidou.mybatisplus.extension.service.IService;
     /**
  * 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempLineReportService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineReportService.java
similarity index 70%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempLineReportService.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineReportService.java
index 3737ec48a..5ea435be4 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/SupervisionTempLineReportService.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/SupervisionTempLineReportService.java
@@ -1,6 +1,6 @@
-package com.njcn.supervision.service.dev;
+package com.njcn.supervision.service.device;
 
-import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport;
+import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
 import com.baomidou.mybatisplus.extension.service.IService;
     /**
  * 
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
index df9a223d0..cfb508bba 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java
@@ -1,19 +1,13 @@
 package com.njcn.supervision.service.device.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.bpm.api.BpmProcessFeignClient;
 import com.njcn.bpm.enums.BpmTaskStatusEnum;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
-import com.njcn.supervision.enums.UserNatureEnum;
-import com.njcn.supervision.mapper.mapper.QuitRunningDeviceMapper;
+import com.njcn.supervision.mapper.device.QuitRunningDeviceMapper;
 import com.njcn.supervision.pojo.param.device.QuitRunningDeviceParam;
 import com.njcn.supervision.pojo.po.device.QuitRunningDevice;
-import com.njcn.supervision.pojo.po.user.UserReportPO;
-import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
-import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
-import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
 import com.njcn.supervision.service.device.IQuitRunningDeviceService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
similarity index 88%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionDevMainReportPOServiceImpl.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
index f969829da..d06818f75 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionDevMainReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
@@ -1,4 +1,4 @@
-package com.njcn.supervision.service.dev.impl;
+package com.njcn.supervision.service.device.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,16 +8,16 @@ import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.supervision.enums.FlowStatusEnum;
-import com.njcn.supervision.mapper.dev.SupervisionDevMainReportPOMapper;
-import com.njcn.supervision.pojo.param.user.SupervisionDevMainReportParam;
-import com.njcn.supervision.pojo.param.user.SupervisionTempDeviceReportParam;
-import com.njcn.supervision.pojo.param.user.SupervisionTempLineReportParam;
-import com.njcn.supervision.pojo.po.dev.SupervisionDevMainReportPO;
-import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport;
-import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport;
-import com.njcn.supervision.service.dev.SupervisionDevMainReportPOService;
-import com.njcn.supervision.service.dev.SupervisionTempDeviceReportService;
-import com.njcn.supervision.service.dev.SupervisionTempLineReportService;
+import com.njcn.supervision.mapper.device.SupervisionDevMainReportPOMapper;
+import com.njcn.supervision.pojo.param.device.SupervisionDevMainReportParam;
+import com.njcn.supervision.pojo.param.device.SupervisionTempDeviceReportParam;
+import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam;
+import com.njcn.supervision.pojo.po.device.SupervisionDevMainReportPO;
+import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
+import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
+import com.njcn.supervision.service.device.SupervisionDevMainReportPOService;
+import com.njcn.supervision.service.device.SupervisionTempDeviceReportService;
+import com.njcn.supervision.service.device.SupervisionTempLineReportService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempDeviceReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempDeviceReportServiceImpl.java
similarity index 54%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempDeviceReportServiceImpl.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempDeviceReportServiceImpl.java
index e61aeac3a..c8ce30afb 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempDeviceReportServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempDeviceReportServiceImpl.java
@@ -1,12 +1,10 @@
-package com.njcn.supervision.service.dev.impl;
+package com.njcn.supervision.service.device.impl;
 
 import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.supervision.mapper.dev.SupervisionTempDeviceReportMapper;
-import com.njcn.supervision.pojo.po.dev.SupervisionTempDeviceReport;
-import com.njcn.supervision.service.dev.SupervisionTempDeviceReportService;
+import com.njcn.supervision.mapper.device.SupervisionTempDeviceReportMapper;
+import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport;
+import com.njcn.supervision.service.device.SupervisionTempDeviceReportService;
 /**
  * 
  * Description:
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
similarity index 54%
rename from pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempLineReportServiceImpl.java
rename to pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
index 83497916e..7118faf7a 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/dev/impl/SupervisionTempLineReportServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
@@ -1,12 +1,10 @@
-package com.njcn.supervision.service.dev.impl;
+package com.njcn.supervision.service.device.impl;
 
 import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.supervision.mapper.dev.SupervisionTempLineReportMapper;
-import com.njcn.supervision.pojo.po.dev.SupervisionTempLineReport;
-import com.njcn.supervision.service.dev.SupervisionTempLineReportService;
+import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper;
+import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport;
+import com.njcn.supervision.service.device.SupervisionTempLineReportService;
 /**
  * 
  * Description: