diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 738629e..967b0f9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -30,7 +30,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 738629e..967b0f9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -30,7 +30,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index e07d4b2..9599c82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -161,7 +161,4 @@
         return ResponseData.success();
     }
 
-
-
-
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 738629e..967b0f9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -30,7 +30,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index e07d4b2..9599c82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -161,7 +161,4 @@
         return ResponseData.success();
     }
 
-
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3ab4185..ecbac82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -3,7 +3,6 @@
 ;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
@@ -12,10 +11,8 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.alarm.model.JobExcelDto;
 import com.casic.missiles.modular.alarm.model.RecordExcelDto;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.AlarmRecords;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +26,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 738629e..967b0f9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -30,7 +30,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index e07d4b2..9599c82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -161,7 +161,4 @@
         return ResponseData.success();
     }
 
-
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3ab4185..ecbac82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -3,7 +3,6 @@
 ;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
@@ -12,10 +11,8 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.alarm.model.JobExcelDto;
 import com.casic.missiles.modular.alarm.model.RecordExcelDto;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.AlarmRecords;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +26,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index ac95276..e76e74a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -52,7 +52,7 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/listPage")
     @ResponseBody
     public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 738629e..967b0f9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -30,7 +30,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index e07d4b2..9599c82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -161,7 +161,4 @@
         return ResponseData.success();
     }
 
-
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3ab4185..ecbac82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -3,7 +3,6 @@
 ;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
@@ -12,10 +11,8 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.alarm.model.JobExcelDto;
 import com.casic.missiles.modular.alarm.model.RecordExcelDto;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.AlarmRecords;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +26,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index ac95276..e76e74a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -52,7 +52,7 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/listPage")
     @ResponseBody
     public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index 5918e6c..c729a75 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -60,7 +60,7 @@
         b.WELL_ID=a.ID LEFT JOIN sys_dept s ON
         a.DEPTID=s.ID LEFT JOIN bus_device d ON
         d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON
-        d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1
+        d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1'
         AND c.sensorid =
         <include refid="concat_sql">
             <property name="paramStr" value="#{sensorid}"/>
@@ -82,7 +82,7 @@
         select
         b.CONCENCODE as "concenCode"
         FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID
-        where c.ACTIVE=1 and b.VALID=1
+        where c.ACTIVE='1' and b.VALID='1'
         and c.DEVICE_ID =
         <include refid="concat_sql">
             <property name="paramStr" value="#{devID}"/>
@@ -94,7 +94,7 @@
         select
         w.DEEP as "depth"
         FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID
-        WHERE c.VALID=1 AND w.VALID=1
+        WHERE c.VALID='1' AND w.VALID='1'
         and c.DEVICE_ID =
         <include refid="concat_sql">
             <property name="paramStr" value="#{devID}"/>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index 738629e..967b0f9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -30,7 +30,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index e07d4b2..9599c82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -161,7 +161,4 @@
         return ResponseData.success();
     }
 
-
-
-
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
index 3ab4185..ecbac82 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRecordsController.java
@@ -3,7 +3,6 @@
 ;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.ExportController;
@@ -12,10 +11,8 @@
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.modular.alarm.model.JobExcelDto;
 import com.casic.missiles.modular.alarm.model.RecordExcelDto;
 import com.casic.missiles.modular.alarm.service.IAlarmRecordsService;
-import com.casic.missiles.modular.system.dto.ExcelModel.HarmfulDataDto;
 import com.casic.missiles.modular.system.enmus.DeviceExportEnum;
 import com.casic.missiles.modular.system.model.AlarmRecords;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +26,6 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index ac95276..e76e74a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -52,7 +52,7 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/listPage")
     @ResponseBody
     public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index 5918e6c..c729a75 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -60,7 +60,7 @@
         b.WELL_ID=a.ID LEFT JOIN sys_dept s ON
         a.DEPTID=s.ID LEFT JOIN bus_device d ON
         d.ID=c.DEVICE_ID LEFT JOIN base_device_type t ON
-        d.DEVICE_TYPE=t.ID where d.VALID=1 AND b.VALID=1 AND a.VALID=1
+        d.DEVICE_TYPE=t.ID where d.VALID='1' AND b.VALID='1' AND a.VALID='1'
         AND c.sensorid =
         <include refid="concat_sql">
             <property name="paramStr" value="#{sensorid}"/>
@@ -82,7 +82,7 @@
         select
         b.CONCENCODE as "concenCode"
         FROM bus_concentrator b RIGHT JOIN bus_device_concentrator c ON b.id=c.CONCEN_ID
-        where c.ACTIVE=1 and b.VALID=1
+        where c.ACTIVE='1' and b.VALID='1'
         and c.DEVICE_ID =
         <include refid="concat_sql">
             <property name="paramStr" value="#{devID}"/>
@@ -94,7 +94,7 @@
         select
         w.DEEP as "depth"
         FROM bus_well_info w RIGHT JOIN bus_device_well c ON w.id=c.WELL_ID
-        WHERE c.VALID=1 AND w.VALID=1
+        WHERE c.VALID='1' AND w.VALID='1'
         and c.DEVICE_ID =
         <include refid="concat_sql">
             <property name="paramStr" value="#{devID}"/>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index b8bb239..dd22d3a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -164,7 +164,7 @@
                latGaode,
                lngGaode
         FROM device_overview_view
-        WHERE valid = 1
+        WHERE valid = '1'
     </select>
 
     <select id="selectDeviceById" resultType="com.casic.missiles.modular.system.dto.DeviceInfoDto">
@@ -186,7 +186,7 @@
                latGaode,
                lngGaode
         FROM device_overview_view
-        WHERE valid = 1
+        WHERE valid = '1'
           and id = #{id}
         limit 1
     </select>