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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 9173324..20aa346 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -78,7 +78,6 @@
        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
     </sql>
 
-
     <sql id="char_toDate" databaseId="mysql">
        ${paramStr}
     </sql>
@@ -252,7 +251,6 @@
                 DESC LIMIT 1
     </select>
 
-
     <select id="tubeData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -261,6 +259,7 @@
         ORDER BY UPTIME
                 DESC LIMIT 1
     </select>
+
     <select id="H2sData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -378,10 +377,10 @@
     <select id="selectLiquidDataList" resultType="map">
         SELECT
         devcode,
-        "deviceType",
-        "deviceTypeName",
+        deviceType as "deviceType",
+        deviceTypeName as "deviceTypeName",
         deptid,
-        "wellCode",
+        wellCode as "wellCode",
         descn,
         cell,
         uptime,
@@ -392,10 +391,10 @@
 
         SELECT
         dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS "wellCode",
+        dl.WELL_CODE AS wellCode,
         dl.DESCN AS descn,
         dl.CELL AS cell,
         <include refid="date_toChar">
@@ -431,14 +430,14 @@
                 </include>
             </if>
         </where>
-         UNION ALL
+        UNION ALL
 
         SELECT
         dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS "wellCode",
+        dgl.WELL_CODE AS wellCode,
         dgl.DESCN AS descn,
         dgl.CELL AS cell,
         <include refid="date_toChar">
@@ -474,7 +473,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -672,7 +670,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -681,7 +678,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType,
+        deviceType AS  "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -689,11 +686,11 @@
         DESCN,
         STATUS,
         DEPTID,
-        "wellCode",
-        "wellId",
-        "deviceId",
-        VALID,
-        "deviceTypeName"
+        wellcode as "wellcode",
+        wellId  AS  "wellId",
+        deviceId AS  "deviceId",
+        valid,
+        deviceTypeName  AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -714,7 +711,7 @@
             <if test="keywords != null and keywords !=''">
                 and (DEVCODE like
                 <include refid="keywords_sql"/>
-                OR wellCode LIKE
+                OR wellcode LIKE
                 <include refid="keywords_sql"/>
                 )
             </if>
@@ -774,7 +771,6 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-
     <select id="selectTubeDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -942,7 +938,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectTempPressDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -997,7 +992,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
@@ -1216,7 +1210,6 @@
         </where>
     </select>
 
-
     <select id="selectGasLiquidDataGasScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
@@ -1282,14 +1275,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
@@ -1308,7 +1301,6 @@
         </if>
     </select>
 
-
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
         SELECT
         dh2s.DEVCODE AS devcode,

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 9173324..20aa346 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -78,7 +78,6 @@
        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
     </sql>
 
-
     <sql id="char_toDate" databaseId="mysql">
        ${paramStr}
     </sql>
@@ -252,7 +251,6 @@
                 DESC LIMIT 1
     </select>
 
-
     <select id="tubeData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -261,6 +259,7 @@
         ORDER BY UPTIME
                 DESC LIMIT 1
     </select>
+
     <select id="H2sData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -378,10 +377,10 @@
     <select id="selectLiquidDataList" resultType="map">
         SELECT
         devcode,
-        "deviceType",
-        "deviceTypeName",
+        deviceType as "deviceType",
+        deviceTypeName as "deviceTypeName",
         deptid,
-        "wellCode",
+        wellCode as "wellCode",
         descn,
         cell,
         uptime,
@@ -392,10 +391,10 @@
 
         SELECT
         dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS "wellCode",
+        dl.WELL_CODE AS wellCode,
         dl.DESCN AS descn,
         dl.CELL AS cell,
         <include refid="date_toChar">
@@ -431,14 +430,14 @@
                 </include>
             </if>
         </where>
-         UNION ALL
+        UNION ALL
 
         SELECT
         dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS "wellCode",
+        dgl.WELL_CODE AS wellCode,
         dgl.DESCN AS descn,
         dgl.CELL AS cell,
         <include refid="date_toChar">
@@ -474,7 +473,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -672,7 +670,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -681,7 +678,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType,
+        deviceType AS  "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -689,11 +686,11 @@
         DESCN,
         STATUS,
         DEPTID,
-        "wellCode",
-        "wellId",
-        "deviceId",
-        VALID,
-        "deviceTypeName"
+        wellcode as "wellcode",
+        wellId  AS  "wellId",
+        deviceId AS  "deviceId",
+        valid,
+        deviceTypeName  AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -714,7 +711,7 @@
             <if test="keywords != null and keywords !=''">
                 and (DEVCODE like
                 <include refid="keywords_sql"/>
-                OR wellCode LIKE
+                OR wellcode LIKE
                 <include refid="keywords_sql"/>
                 )
             </if>
@@ -774,7 +771,6 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-
     <select id="selectTubeDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -942,7 +938,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectTempPressDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -997,7 +992,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
@@ -1216,7 +1210,6 @@
         </where>
     </select>
 
-
     <select id="selectGasLiquidDataGasScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
@@ -1282,14 +1275,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
@@ -1308,7 +1301,6 @@
         </if>
     </select>
 
-
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
         SELECT
         dh2s.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index eabf7c9..2b665fa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -183,7 +183,7 @@
         mapper.put("设备名称", "deviceName");
         mapper.put("设备类型", "deviceTypeName");
         mapper.put("设备型号", "modelName");
-        mapper.put("井编号", "wellCode");
+        mapper.put("点位编号", "wellCode");
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 9173324..20aa346 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -78,7 +78,6 @@
        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
     </sql>
 
-
     <sql id="char_toDate" databaseId="mysql">
        ${paramStr}
     </sql>
@@ -252,7 +251,6 @@
                 DESC LIMIT 1
     </select>
 
-
     <select id="tubeData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -261,6 +259,7 @@
         ORDER BY UPTIME
                 DESC LIMIT 1
     </select>
+
     <select id="H2sData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -378,10 +377,10 @@
     <select id="selectLiquidDataList" resultType="map">
         SELECT
         devcode,
-        "deviceType",
-        "deviceTypeName",
+        deviceType as "deviceType",
+        deviceTypeName as "deviceTypeName",
         deptid,
-        "wellCode",
+        wellCode as "wellCode",
         descn,
         cell,
         uptime,
@@ -392,10 +391,10 @@
 
         SELECT
         dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS "wellCode",
+        dl.WELL_CODE AS wellCode,
         dl.DESCN AS descn,
         dl.CELL AS cell,
         <include refid="date_toChar">
@@ -431,14 +430,14 @@
                 </include>
             </if>
         </where>
-         UNION ALL
+        UNION ALL
 
         SELECT
         dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS "wellCode",
+        dgl.WELL_CODE AS wellCode,
         dgl.DESCN AS descn,
         dgl.CELL AS cell,
         <include refid="date_toChar">
@@ -474,7 +473,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -672,7 +670,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -681,7 +678,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType,
+        deviceType AS  "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -689,11 +686,11 @@
         DESCN,
         STATUS,
         DEPTID,
-        "wellCode",
-        "wellId",
-        "deviceId",
-        VALID,
-        "deviceTypeName"
+        wellcode as "wellcode",
+        wellId  AS  "wellId",
+        deviceId AS  "deviceId",
+        valid,
+        deviceTypeName  AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -714,7 +711,7 @@
             <if test="keywords != null and keywords !=''">
                 and (DEVCODE like
                 <include refid="keywords_sql"/>
-                OR wellCode LIKE
+                OR wellcode LIKE
                 <include refid="keywords_sql"/>
                 )
             </if>
@@ -774,7 +771,6 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-
     <select id="selectTubeDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -942,7 +938,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectTempPressDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -997,7 +992,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
@@ -1216,7 +1210,6 @@
         </where>
     </select>
 
-
     <select id="selectGasLiquidDataGasScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
@@ -1282,14 +1275,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
@@ -1308,7 +1301,6 @@
         </if>
     </select>
 
-
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
         SELECT
         dh2s.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index eabf7c9..2b665fa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -183,7 +183,7 @@
         mapper.put("设备名称", "deviceName");
         mapper.put("设备类型", "deviceTypeName");
         mapper.put("设备型号", "modelName");
-        mapper.put("井编号", "wellCode");
+        mapper.put("点位编号", "wellCode");
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 6b56937..592aa26 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -125,14 +125,14 @@
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "井添加失败";
+            String errorMsg = "点位添加失败";
             if (e instanceof DuplicateKeyException) {
-                errorMsg = "井编号重复";
+                errorMsg = "点位编号重复";
             } else if (e instanceof ServiceException) {
                 ServiceException gunException = (ServiceException) e;
                 errorMsg = gunException.getMessage();
             }
-            logger.error("井添加失败", e);
+            logger.error("点位添加失败", e);
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
@@ -154,7 +154,7 @@
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
-            return ResponseData.error(message + "以上井存在绑定设备，请先解绑后再删除井！");
+            return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！");
         }
 
         return ResponseData.success();
@@ -249,8 +249,8 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("井编号", "wellCode");
-        mapper.put("井名称", "wellName");
+        mapper.put("点位编号", "wellCode");
+        mapper.put("点位名称", "wellName");
         mapper.put("井深", "deep");
         mapper.put("区", "qu");
         mapper.put("街道", "area");
@@ -258,9 +258,9 @@
         mapper.put("经度", "coordinateX");
         mapper.put("纬度", "coordinateY");
 
-        mapper.put("井类型", "wellType");
+        mapper.put("点位类型", "wellType");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("井维护单位代码", "responsibleDept");
+        mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusWellInfo.class,file,null,null);
@@ -273,16 +273,16 @@
                 }
             }
         } catch (MybatisPlusException e) {
-            logger.error("导入井列表失败", e);
+            logger.error("导入点位列表失败", e);
             String message = e.getCause().getCause().getCause().getMessage();
             if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入井列表失败，井编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
             }
-            return new ErrorResponseData("导入井列表失败");
+            return new ErrorResponseData("导入点位列表失败");
 
         } catch (Exception e) {
-            logger.error("导入井列表失败", e);
-            return new ErrorResponseData("导入井列表失败");
+            logger.error("导入点位列表失败", e);
+            return new ErrorResponseData("导入点位列表失败");
         }
         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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 9173324..20aa346 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -78,7 +78,6 @@
        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
     </sql>
 
-
     <sql id="char_toDate" databaseId="mysql">
        ${paramStr}
     </sql>
@@ -252,7 +251,6 @@
                 DESC LIMIT 1
     </select>
 
-
     <select id="tubeData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -261,6 +259,7 @@
         ORDER BY UPTIME
                 DESC LIMIT 1
     </select>
+
     <select id="H2sData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -378,10 +377,10 @@
     <select id="selectLiquidDataList" resultType="map">
         SELECT
         devcode,
-        "deviceType",
-        "deviceTypeName",
+        deviceType as "deviceType",
+        deviceTypeName as "deviceTypeName",
         deptid,
-        "wellCode",
+        wellCode as "wellCode",
         descn,
         cell,
         uptime,
@@ -392,10 +391,10 @@
 
         SELECT
         dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS "wellCode",
+        dl.WELL_CODE AS wellCode,
         dl.DESCN AS descn,
         dl.CELL AS cell,
         <include refid="date_toChar">
@@ -431,14 +430,14 @@
                 </include>
             </if>
         </where>
-         UNION ALL
+        UNION ALL
 
         SELECT
         dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS "wellCode",
+        dgl.WELL_CODE AS wellCode,
         dgl.DESCN AS descn,
         dgl.CELL AS cell,
         <include refid="date_toChar">
@@ -474,7 +473,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -672,7 +670,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -681,7 +678,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType,
+        deviceType AS  "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -689,11 +686,11 @@
         DESCN,
         STATUS,
         DEPTID,
-        "wellCode",
-        "wellId",
-        "deviceId",
-        VALID,
-        "deviceTypeName"
+        wellcode as "wellcode",
+        wellId  AS  "wellId",
+        deviceId AS  "deviceId",
+        valid,
+        deviceTypeName  AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -714,7 +711,7 @@
             <if test="keywords != null and keywords !=''">
                 and (DEVCODE like
                 <include refid="keywords_sql"/>
-                OR wellCode LIKE
+                OR wellcode LIKE
                 <include refid="keywords_sql"/>
                 )
             </if>
@@ -774,7 +771,6 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-
     <select id="selectTubeDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -942,7 +938,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectTempPressDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -997,7 +992,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
@@ -1216,7 +1210,6 @@
         </where>
     </select>
 
-
     <select id="selectGasLiquidDataGasScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
@@ -1282,14 +1275,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
@@ -1308,7 +1301,6 @@
         </if>
     </select>
 
-
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
         SELECT
         dh2s.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index eabf7c9..2b665fa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -183,7 +183,7 @@
         mapper.put("设备名称", "deviceName");
         mapper.put("设备类型", "deviceTypeName");
         mapper.put("设备型号", "modelName");
-        mapper.put("井编号", "wellCode");
+        mapper.put("点位编号", "wellCode");
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 6b56937..592aa26 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -125,14 +125,14 @@
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "井添加失败";
+            String errorMsg = "点位添加失败";
             if (e instanceof DuplicateKeyException) {
-                errorMsg = "井编号重复";
+                errorMsg = "点位编号重复";
             } else if (e instanceof ServiceException) {
                 ServiceException gunException = (ServiceException) e;
                 errorMsg = gunException.getMessage();
             }
-            logger.error("井添加失败", e);
+            logger.error("点位添加失败", e);
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
@@ -154,7 +154,7 @@
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
-            return ResponseData.error(message + "以上井存在绑定设备，请先解绑后再删除井！");
+            return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！");
         }
 
         return ResponseData.success();
@@ -249,8 +249,8 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("井编号", "wellCode");
-        mapper.put("井名称", "wellName");
+        mapper.put("点位编号", "wellCode");
+        mapper.put("点位名称", "wellName");
         mapper.put("井深", "deep");
         mapper.put("区", "qu");
         mapper.put("街道", "area");
@@ -258,9 +258,9 @@
         mapper.put("经度", "coordinateX");
         mapper.put("纬度", "coordinateY");
 
-        mapper.put("井类型", "wellType");
+        mapper.put("点位类型", "wellType");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("井维护单位代码", "responsibleDept");
+        mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusWellInfo.class,file,null,null);
@@ -273,16 +273,16 @@
                 }
             }
         } catch (MybatisPlusException e) {
-            logger.error("导入井列表失败", e);
+            logger.error("导入点位列表失败", e);
             String message = e.getCause().getCause().getCause().getMessage();
             if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入井列表失败，井编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
             }
-            return new ErrorResponseData("导入井列表失败");
+            return new ErrorResponseData("导入点位列表失败");
 
         } catch (Exception e) {
-            logger.error("导入井列表失败", e);
-            return new ErrorResponseData("导入井列表失败");
+            logger.error("导入点位列表失败", e);
+            return new ErrorResponseData("导入点位列表失败");
         }
         return ResponseData.success();
     }
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b69ff45..2327845 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -70,6 +70,13 @@
             <artifactId>casic-server</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>chgjdbc</artifactId>
+            <version>6.0.3-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-export-support</artifactId>

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 9173324..20aa346 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -78,7 +78,6 @@
        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
     </sql>
 
-
     <sql id="char_toDate" databaseId="mysql">
        ${paramStr}
     </sql>
@@ -252,7 +251,6 @@
                 DESC LIMIT 1
     </select>
 
-
     <select id="tubeData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -261,6 +259,7 @@
         ORDER BY UPTIME
                 DESC LIMIT 1
     </select>
+
     <select id="H2sData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -378,10 +377,10 @@
     <select id="selectLiquidDataList" resultType="map">
         SELECT
         devcode,
-        "deviceType",
-        "deviceTypeName",
+        deviceType as "deviceType",
+        deviceTypeName as "deviceTypeName",
         deptid,
-        "wellCode",
+        wellCode as "wellCode",
         descn,
         cell,
         uptime,
@@ -392,10 +391,10 @@
 
         SELECT
         dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS "wellCode",
+        dl.WELL_CODE AS wellCode,
         dl.DESCN AS descn,
         dl.CELL AS cell,
         <include refid="date_toChar">
@@ -431,14 +430,14 @@
                 </include>
             </if>
         </where>
-         UNION ALL
+        UNION ALL
 
         SELECT
         dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS "wellCode",
+        dgl.WELL_CODE AS wellCode,
         dgl.DESCN AS descn,
         dgl.CELL AS cell,
         <include refid="date_toChar">
@@ -474,7 +473,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -672,7 +670,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -681,7 +678,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType,
+        deviceType AS  "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -689,11 +686,11 @@
         DESCN,
         STATUS,
         DEPTID,
-        "wellCode",
-        "wellId",
-        "deviceId",
-        VALID,
-        "deviceTypeName"
+        wellcode as "wellcode",
+        wellId  AS  "wellId",
+        deviceId AS  "deviceId",
+        valid,
+        deviceTypeName  AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -714,7 +711,7 @@
             <if test="keywords != null and keywords !=''">
                 and (DEVCODE like
                 <include refid="keywords_sql"/>
-                OR wellCode LIKE
+                OR wellcode LIKE
                 <include refid="keywords_sql"/>
                 )
             </if>
@@ -774,7 +771,6 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-
     <select id="selectTubeDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -942,7 +938,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectTempPressDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -997,7 +992,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
@@ -1216,7 +1210,6 @@
         </where>
     </select>
 
-
     <select id="selectGasLiquidDataGasScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
@@ -1282,14 +1275,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
@@ -1308,7 +1301,6 @@
         </if>
     </select>
 
-
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
         SELECT
         dh2s.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index eabf7c9..2b665fa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -183,7 +183,7 @@
         mapper.put("设备名称", "deviceName");
         mapper.put("设备类型", "deviceTypeName");
         mapper.put("设备型号", "modelName");
-        mapper.put("井编号", "wellCode");
+        mapper.put("点位编号", "wellCode");
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 6b56937..592aa26 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -125,14 +125,14 @@
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "井添加失败";
+            String errorMsg = "点位添加失败";
             if (e instanceof DuplicateKeyException) {
-                errorMsg = "井编号重复";
+                errorMsg = "点位编号重复";
             } else if (e instanceof ServiceException) {
                 ServiceException gunException = (ServiceException) e;
                 errorMsg = gunException.getMessage();
             }
-            logger.error("井添加失败", e);
+            logger.error("点位添加失败", e);
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
@@ -154,7 +154,7 @@
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
-            return ResponseData.error(message + "以上井存在绑定设备，请先解绑后再删除井！");
+            return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！");
         }
 
         return ResponseData.success();
@@ -249,8 +249,8 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("井编号", "wellCode");
-        mapper.put("井名称", "wellName");
+        mapper.put("点位编号", "wellCode");
+        mapper.put("点位名称", "wellName");
         mapper.put("井深", "deep");
         mapper.put("区", "qu");
         mapper.put("街道", "area");
@@ -258,9 +258,9 @@
         mapper.put("经度", "coordinateX");
         mapper.put("纬度", "coordinateY");
 
-        mapper.put("井类型", "wellType");
+        mapper.put("点位类型", "wellType");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("井维护单位代码", "responsibleDept");
+        mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusWellInfo.class,file,null,null);
@@ -273,16 +273,16 @@
                 }
             }
         } catch (MybatisPlusException e) {
-            logger.error("导入井列表失败", e);
+            logger.error("导入点位列表失败", e);
             String message = e.getCause().getCause().getCause().getMessage();
             if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入井列表失败，井编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
             }
-            return new ErrorResponseData("导入井列表失败");
+            return new ErrorResponseData("导入点位列表失败");
 
         } catch (Exception e) {
-            logger.error("导入井列表失败", e);
-            return new ErrorResponseData("导入井列表失败");
+            logger.error("导入点位列表失败", e);
+            return new ErrorResponseData("导入点位列表失败");
         }
         return ResponseData.success();
     }
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b69ff45..2327845 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -70,6 +70,13 @@
             <artifactId>casic-server</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>chgjdbc</artifactId>
+            <version>6.0.3-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-export-support</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index db01ce7..dd163ba 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -45,7 +45,10 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            password = "1q2W3E4R";
+            //  mysql
+//         password = "1q2W3E4R";
+            //postgre
+            password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
 

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 9173324..20aa346 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -78,7 +78,6 @@
        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
     </sql>
 
-
     <sql id="char_toDate" databaseId="mysql">
        ${paramStr}
     </sql>
@@ -252,7 +251,6 @@
                 DESC LIMIT 1
     </select>
 
-
     <select id="tubeData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -261,6 +259,7 @@
         ORDER BY UPTIME
                 DESC LIMIT 1
     </select>
+
     <select id="H2sData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -378,10 +377,10 @@
     <select id="selectLiquidDataList" resultType="map">
         SELECT
         devcode,
-        "deviceType",
-        "deviceTypeName",
+        deviceType as "deviceType",
+        deviceTypeName as "deviceTypeName",
         deptid,
-        "wellCode",
+        wellCode as "wellCode",
         descn,
         cell,
         uptime,
@@ -392,10 +391,10 @@
 
         SELECT
         dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS "wellCode",
+        dl.WELL_CODE AS wellCode,
         dl.DESCN AS descn,
         dl.CELL AS cell,
         <include refid="date_toChar">
@@ -431,14 +430,14 @@
                 </include>
             </if>
         </where>
-         UNION ALL
+        UNION ALL
 
         SELECT
         dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS "wellCode",
+        dgl.WELL_CODE AS wellCode,
         dgl.DESCN AS descn,
         dgl.CELL AS cell,
         <include refid="date_toChar">
@@ -474,7 +473,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -672,7 +670,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -681,7 +678,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType,
+        deviceType AS  "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -689,11 +686,11 @@
         DESCN,
         STATUS,
         DEPTID,
-        "wellCode",
-        "wellId",
-        "deviceId",
-        VALID,
-        "deviceTypeName"
+        wellcode as "wellcode",
+        wellId  AS  "wellId",
+        deviceId AS  "deviceId",
+        valid,
+        deviceTypeName  AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -714,7 +711,7 @@
             <if test="keywords != null and keywords !=''">
                 and (DEVCODE like
                 <include refid="keywords_sql"/>
-                OR wellCode LIKE
+                OR wellcode LIKE
                 <include refid="keywords_sql"/>
                 )
             </if>
@@ -774,7 +771,6 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-
     <select id="selectTubeDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -942,7 +938,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectTempPressDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -997,7 +992,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
@@ -1216,7 +1210,6 @@
         </where>
     </select>
 
-
     <select id="selectGasLiquidDataGasScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
@@ -1282,14 +1275,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
@@ -1308,7 +1301,6 @@
         </if>
     </select>
 
-
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
         SELECT
         dh2s.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index eabf7c9..2b665fa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -183,7 +183,7 @@
         mapper.put("设备名称", "deviceName");
         mapper.put("设备类型", "deviceTypeName");
         mapper.put("设备型号", "modelName");
-        mapper.put("井编号", "wellCode");
+        mapper.put("点位编号", "wellCode");
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 6b56937..592aa26 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -125,14 +125,14 @@
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "井添加失败";
+            String errorMsg = "点位添加失败";
             if (e instanceof DuplicateKeyException) {
-                errorMsg = "井编号重复";
+                errorMsg = "点位编号重复";
             } else if (e instanceof ServiceException) {
                 ServiceException gunException = (ServiceException) e;
                 errorMsg = gunException.getMessage();
             }
-            logger.error("井添加失败", e);
+            logger.error("点位添加失败", e);
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
@@ -154,7 +154,7 @@
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
-            return ResponseData.error(message + "以上井存在绑定设备，请先解绑后再删除井！");
+            return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！");
         }
 
         return ResponseData.success();
@@ -249,8 +249,8 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("井编号", "wellCode");
-        mapper.put("井名称", "wellName");
+        mapper.put("点位编号", "wellCode");
+        mapper.put("点位名称", "wellName");
         mapper.put("井深", "deep");
         mapper.put("区", "qu");
         mapper.put("街道", "area");
@@ -258,9 +258,9 @@
         mapper.put("经度", "coordinateX");
         mapper.put("纬度", "coordinateY");
 
-        mapper.put("井类型", "wellType");
+        mapper.put("点位类型", "wellType");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("井维护单位代码", "responsibleDept");
+        mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusWellInfo.class,file,null,null);
@@ -273,16 +273,16 @@
                 }
             }
         } catch (MybatisPlusException e) {
-            logger.error("导入井列表失败", e);
+            logger.error("导入点位列表失败", e);
             String message = e.getCause().getCause().getCause().getMessage();
             if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入井列表失败，井编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
             }
-            return new ErrorResponseData("导入井列表失败");
+            return new ErrorResponseData("导入点位列表失败");
 
         } catch (Exception e) {
-            logger.error("导入井列表失败", e);
-            return new ErrorResponseData("导入井列表失败");
+            logger.error("导入点位列表失败", e);
+            return new ErrorResponseData("导入点位列表失败");
         }
         return ResponseData.success();
     }
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b69ff45..2327845 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -70,6 +70,13 @@
             <artifactId>casic-server</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>chgjdbc</artifactId>
+            <version>6.0.3-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-export-support</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index db01ce7..dd163ba 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -45,7 +45,10 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            password = "1q2W3E4R";
+            //  mysql
+//         password = "1q2W3E4R";
+            //postgre
+            password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
 
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 22e1554..873a77e 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -44,7 +44,7 @@
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
     config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
-    download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+    download-path: D:\v1.0\
   device:
     redis:
       invalid-time: 86400
@@ -53,9 +53,9 @@
       password: ew5T4K3#203lwh
       config-prefix: 'Casic:'
   getui:
-    appId: H9jSTE2bAt8QWq2K2GNOB3
-    appKey: bhPeCutJVdAyOasevQFtN9
-    masterSecret: lChudND74A89WRiHLkedb5
+    app-id: 2QZ66VuyLI7LfcAXn5Kpe7 #城管APPid
+    app-key: GEgPZTsFyF66rtOdmgMGM1 #app key
+    master-secret: l0IL4f4sfT72k8NuaY1az2
 logging:
   level.root: info
   level.com.casic: debug

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 9173324..20aa346 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -78,7 +78,6 @@
        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
     </sql>
 
-
     <sql id="char_toDate" databaseId="mysql">
        ${paramStr}
     </sql>
@@ -252,7 +251,6 @@
                 DESC LIMIT 1
     </select>
 
-
     <select id="tubeData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -261,6 +259,7 @@
         ORDER BY UPTIME
                 DESC LIMIT 1
     </select>
+
     <select id="H2sData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -378,10 +377,10 @@
     <select id="selectLiquidDataList" resultType="map">
         SELECT
         devcode,
-        "deviceType",
-        "deviceTypeName",
+        deviceType as "deviceType",
+        deviceTypeName as "deviceTypeName",
         deptid,
-        "wellCode",
+        wellCode as "wellCode",
         descn,
         cell,
         uptime,
@@ -392,10 +391,10 @@
 
         SELECT
         dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS "wellCode",
+        dl.WELL_CODE AS wellCode,
         dl.DESCN AS descn,
         dl.CELL AS cell,
         <include refid="date_toChar">
@@ -431,14 +430,14 @@
                 </include>
             </if>
         </where>
-         UNION ALL
+        UNION ALL
 
         SELECT
         dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS "wellCode",
+        dgl.WELL_CODE AS wellCode,
         dgl.DESCN AS descn,
         dgl.CELL AS cell,
         <include refid="date_toChar">
@@ -474,7 +473,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -672,7 +670,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -681,7 +678,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType,
+        deviceType AS  "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -689,11 +686,11 @@
         DESCN,
         STATUS,
         DEPTID,
-        "wellCode",
-        "wellId",
-        "deviceId",
-        VALID,
-        "deviceTypeName"
+        wellcode as "wellcode",
+        wellId  AS  "wellId",
+        deviceId AS  "deviceId",
+        valid,
+        deviceTypeName  AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -714,7 +711,7 @@
             <if test="keywords != null and keywords !=''">
                 and (DEVCODE like
                 <include refid="keywords_sql"/>
-                OR wellCode LIKE
+                OR wellcode LIKE
                 <include refid="keywords_sql"/>
                 )
             </if>
@@ -774,7 +771,6 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-
     <select id="selectTubeDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -942,7 +938,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectTempPressDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -997,7 +992,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
@@ -1216,7 +1210,6 @@
         </where>
     </select>
 
-
     <select id="selectGasLiquidDataGasScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
@@ -1282,14 +1275,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
@@ -1308,7 +1301,6 @@
         </if>
     </select>
 
-
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
         SELECT
         dh2s.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index eabf7c9..2b665fa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -183,7 +183,7 @@
         mapper.put("设备名称", "deviceName");
         mapper.put("设备类型", "deviceTypeName");
         mapper.put("设备型号", "modelName");
-        mapper.put("井编号", "wellCode");
+        mapper.put("点位编号", "wellCode");
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 6b56937..592aa26 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -125,14 +125,14 @@
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "井添加失败";
+            String errorMsg = "点位添加失败";
             if (e instanceof DuplicateKeyException) {
-                errorMsg = "井编号重复";
+                errorMsg = "点位编号重复";
             } else if (e instanceof ServiceException) {
                 ServiceException gunException = (ServiceException) e;
                 errorMsg = gunException.getMessage();
             }
-            logger.error("井添加失败", e);
+            logger.error("点位添加失败", e);
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
@@ -154,7 +154,7 @@
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
-            return ResponseData.error(message + "以上井存在绑定设备，请先解绑后再删除井！");
+            return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！");
         }
 
         return ResponseData.success();
@@ -249,8 +249,8 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("井编号", "wellCode");
-        mapper.put("井名称", "wellName");
+        mapper.put("点位编号", "wellCode");
+        mapper.put("点位名称", "wellName");
         mapper.put("井深", "deep");
         mapper.put("区", "qu");
         mapper.put("街道", "area");
@@ -258,9 +258,9 @@
         mapper.put("经度", "coordinateX");
         mapper.put("纬度", "coordinateY");
 
-        mapper.put("井类型", "wellType");
+        mapper.put("点位类型", "wellType");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("井维护单位代码", "responsibleDept");
+        mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusWellInfo.class,file,null,null);
@@ -273,16 +273,16 @@
                 }
             }
         } catch (MybatisPlusException e) {
-            logger.error("导入井列表失败", e);
+            logger.error("导入点位列表失败", e);
             String message = e.getCause().getCause().getCause().getMessage();
             if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入井列表失败，井编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
             }
-            return new ErrorResponseData("导入井列表失败");
+            return new ErrorResponseData("导入点位列表失败");
 
         } catch (Exception e) {
-            logger.error("导入井列表失败", e);
-            return new ErrorResponseData("导入井列表失败");
+            logger.error("导入点位列表失败", e);
+            return new ErrorResponseData("导入点位列表失败");
         }
         return ResponseData.success();
     }
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b69ff45..2327845 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -70,6 +70,13 @@
             <artifactId>casic-server</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>chgjdbc</artifactId>
+            <version>6.0.3-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-export-support</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index db01ce7..dd163ba 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -45,7 +45,10 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            password = "1q2W3E4R";
+            //  mysql
+//         password = "1q2W3E4R";
+            //postgre
+            password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
 
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 22e1554..873a77e 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -44,7 +44,7 @@
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
     config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
-    download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+    download-path: D:\v1.0\
   device:
     redis:
       invalid-time: 86400
@@ -53,9 +53,9 @@
       password: ew5T4K3#203lwh
       config-prefix: 'Casic:'
   getui:
-    appId: H9jSTE2bAt8QWq2K2GNOB3
-    appKey: bhPeCutJVdAyOasevQFtN9
-    masterSecret: lChudND74A89WRiHLkedb5
+    app-id: 2QZ66VuyLI7LfcAXn5Kpe7 #城管APPid
+    app-key: GEgPZTsFyF66rtOdmgMGM1 #app key
+    master-secret: l0IL4f4sfT72k8NuaY1az2
 logging:
   level.root: info
   level.com.casic: debug
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
index 34f4ffd..16e6332 100644
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ b/casic-web/src/main/resources/config/application-postgre.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://111.198.10.15:11209/smartwell
+    url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
     username: postgres
     password: Casic203
   session:
@@ -30,7 +30,7 @@
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob
   db:
     init:
       enable: false
@@ -42,7 +42,7 @@
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
     config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
-    download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+    download-path: D:\v1.0\download\
   device:
     redis:
       invalid-time: 86400
@@ -51,12 +51,12 @@
       password: ew5T4K3#203lwh
       config-prefix: 'Casic:'
   getui:
-    appId: H9jSTE2bAt8QWq2K2GNOB3
-    appKey: bhPeCutJVdAyOasevQFtN9
-    masterSecret: lChudND74A89WRiHLkedb5
+    appId: HKv8K9qARd6WckZ1o2Vbu4
+    appKey: 5cV2rugxAb8o28WK6RSFU6
+    masterSecret: fQsKrOaFZy5tvKb3Vd3vv5
 logging:
   level.root: info
-  level.com.casic: info
+  level.com.casic: debug
   file:
     path: logs/
     name: missiles.log
\ No newline at end of file

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 ad75d61..91b4bef 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
@@ -158,7 +158,7 @@
         Page<Map<String, Object>> page = PageFactory.defaultPage();
         page.setMaxLimit((long) maxRowsExcel);
         page.setSize(maxRowsExcel);
-        page.offset();
+        page.setCurrent(1);
         page.setSearchCount(false);
         DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
         AuthUser currentUser = iCommonPermissionService.getAuthService().getLoginUser();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index bf89d08..b1258a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -591,7 +591,7 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<Map<String, Object>> mapList = deviceService.selectDataList(dataScope, wellCode, watchType, beginTime, endTime);
         mapList.forEach(deviceDto -> {
-            deviceDto.put("deptName",permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
+            deviceDto.put("deptName", permissionService.getDeptService().getDeptName(deviceDto.get("deptid").toString()));
         });
         return ResponseData.success(mapList);
     }
@@ -607,12 +607,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 消防栓导出
      */
     @GetMapping(value = "/hydrant/export")
     public void hydrantExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<HydrantDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getHydrantlist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(HydrantDataDto.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName());
@@ -629,12 +633,16 @@
         responseData.setData(super.packForBT(page));
         return responseData;
     }
+
     /**
      * 硫化氢栓导出
      */
     @GetMapping(value = "/h2s/export")
     public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException {
         Page<H2SDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords);
         super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName());
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 9661388..ee33ee4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -50,6 +50,9 @@
     @RequestMapping("/gasdector/export")
     public void getGasDectorExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getGasDectorListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
@@ -77,6 +80,9 @@
     @RequestMapping("/pantilt/export")
     public void getPantiltDataExport(String keyWords, String endTime, String beginTime, String deptid) {
         Page<PantiltDataDto> page = PageFactory.defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         thirdPartyService.getPantiltDataListPage(page, dataScope, deptid, endTime, beginTime, keyWords);
         try {
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 9173324..20aa346 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -78,7 +78,6 @@
        TO_CHAR(${paramTime},'yyyy-MM-dd HH24:mi:ss')
     </sql>
 
-
     <sql id="char_toDate" databaseId="mysql">
        ${paramStr}
     </sql>
@@ -252,7 +251,6 @@
                 DESC LIMIT 1
     </select>
 
-
     <select id="tubeData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -261,6 +259,7 @@
         ORDER BY UPTIME
                 DESC LIMIT 1
     </select>
+
     <select id="H2sData" resultType="com.casic.missiles.modular.system.dto.DeviceData">
         SELECT strength AS data,
                UPTIME     AS logtime
@@ -378,10 +377,10 @@
     <select id="selectLiquidDataList" resultType="map">
         SELECT
         devcode,
-        "deviceType",
-        "deviceTypeName",
+        deviceType as "deviceType",
+        deviceTypeName as "deviceTypeName",
         deptid,
-        "wellCode",
+        wellCode as "wellCode",
         descn,
         cell,
         uptime,
@@ -392,10 +391,10 @@
 
         SELECT
         dl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dl.WELL_CODE AS "wellCode",
+        dl.WELL_CODE AS wellCode,
         dl.DESCN AS descn,
         dl.CELL AS cell,
         <include refid="date_toChar">
@@ -431,14 +430,14 @@
                 </include>
             </if>
         </where>
-         UNION ALL
+        UNION ALL
 
         SELECT
         dgl.DEVCODE AS devcode,
-        bd.DEVICE_TYPE AS "deviceType",
-        bdt.TYPE_NAME AS "deviceTypeName",
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
         bwi.DEPTID AS deptid,
-        dgl.WELL_CODE AS "wellCode",
+        dgl.WELL_CODE AS wellCode,
         dgl.DESCN AS descn,
         dgl.CELL AS cell,
         <include refid="date_toChar">
@@ -474,7 +473,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -672,7 +670,6 @@
                 </include>
             </if>
         </where>
-
         ) t1
         ORDER BY uptime asc
     </select>
@@ -681,7 +678,7 @@
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
         DEVCODE,
-        deviceType,
+        deviceType AS  "deviceType",
         <include refid="date_toChar">
             <property name="paramTime" value="LOGTIME"/>
         </include>
@@ -689,11 +686,11 @@
         DESCN,
         STATUS,
         DEPTID,
-        "wellCode",
-        "wellId",
-        "deviceId",
-        VALID,
-        "deviceTypeName"
+        wellcode as "wellcode",
+        wellId  AS  "wellId",
+        deviceId AS  "deviceId",
+        valid,
+        deviceTypeName  AS "deviceTypeName"
         FROM wellcover_monitorview
         <where>
             <if test="deptid != null and deptid !=-1 ">
@@ -714,7 +711,7 @@
             <if test="keywords != null and keywords !=''">
                 and (DEVCODE like
                 <include refid="keywords_sql"/>
-                OR wellCode LIKE
+                OR wellcode LIKE
                 <include refid="keywords_sql"/>
                 )
             </if>
@@ -774,7 +771,6 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
-
     <select id="selectTubeDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -942,7 +938,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectTempPressDataScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.TemppressDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
@@ -997,7 +992,6 @@
         ORDER BY dth.UPTIME DESC
     </select>
 
-
     <select id="selectDigDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.DigNoiseDataDto"
             parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT
@@ -1216,7 +1210,6 @@
         </where>
     </select>
 
-
     <select id="selectGasLiquidDataGasScopePage"
             resultType="com.casic.missiles.modular.system.dto.ExcelModel.DeviceDataExcelDto">
         SELECT
@@ -1282,14 +1275,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_device_well bdw ON bdw.device_id=bd.id
         JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
@@ -1308,7 +1301,6 @@
         </if>
     </select>
 
-
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
         SELECT
         dh2s.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index eabf7c9..2b665fa 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -183,7 +183,7 @@
         mapper.put("设备名称", "deviceName");
         mapper.put("设备类型", "deviceTypeName");
         mapper.put("设备型号", "modelName");
-        mapper.put("井编号", "wellCode");
+        mapper.put("点位编号", "wellCode");
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
index 6b56937..592aa26 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java
@@ -125,14 +125,14 @@
             busWellInfoService.save(busWellInfo);
         } catch (Exception e) {
             ServiceException gunsException = new ServiceException(CoreExceptionEnum.REQUEST_NULL);
-            String errorMsg = "井添加失败";
+            String errorMsg = "点位添加失败";
             if (e instanceof DuplicateKeyException) {
-                errorMsg = "井编号重复";
+                errorMsg = "点位编号重复";
             } else if (e instanceof ServiceException) {
                 ServiceException gunException = (ServiceException) e;
                 errorMsg = gunException.getMessage();
             }
-            logger.error("井添加失败", e);
+            logger.error("点位添加失败", e);
             gunsException.setErrorMessage(errorMsg);
             throw gunsException;
         }
@@ -154,7 +154,7 @@
                 BusWellInfo busWellInfo = busWellInfoService.getById(notDelId);
                 message += busWellInfo.getWellCode() + ",";
             }
-            return ResponseData.error(message + "以上井存在绑定设备，请先解绑后再删除井！");
+            return ResponseData.error(message + "以上点位存在绑定设备，请先解绑后再删除点位！");
         }
 
         return ResponseData.success();
@@ -249,8 +249,8 @@
         //设置表头与字段映射,可通过反射获取
         Map<String, String> mapper = new HashMap<>();
         //判断唯一
-        mapper.put("井编号", "wellCode");
-        mapper.put("井名称", "wellName");
+        mapper.put("点位编号", "wellCode");
+        mapper.put("点位名称", "wellName");
         mapper.put("井深", "deep");
         mapper.put("区", "qu");
         mapper.put("街道", "area");
@@ -258,9 +258,9 @@
         mapper.put("经度", "coordinateX");
         mapper.put("纬度", "coordinateY");
 
-        mapper.put("井类型", "wellType");
+        mapper.put("点位类型", "wellType");
         mapper.put("权属单位代码", "deptid");
-        mapper.put("井维护单位代码", "responsibleDept");
+        mapper.put("点位维护单位代码", "responsibleDept");
         try {
             try (InputStream in = file.getInputStream()) {
                 results = this.importExcel(BusWellInfo.class,file,null,null);
@@ -273,16 +273,16 @@
                 }
             }
         } catch (MybatisPlusException e) {
-            logger.error("导入井列表失败", e);
+            logger.error("导入点位列表失败", e);
             String message = e.getCause().getCause().getCause().getMessage();
             if (message.contains("Duplicate entry '")) {
-                return new ErrorResponseData("导入井列表失败，井编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
+                return new ErrorResponseData("导入点位列表失败，点位编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'WELL_CODE'", "") + "已存在");
             }
-            return new ErrorResponseData("导入井列表失败");
+            return new ErrorResponseData("导入点位列表失败");
 
         } catch (Exception e) {
-            logger.error("导入井列表失败", e);
-            return new ErrorResponseData("导入井列表失败");
+            logger.error("导入点位列表失败", e);
+            return new ErrorResponseData("导入点位列表失败");
         }
         return ResponseData.success();
     }
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index b69ff45..2327845 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -70,6 +70,13 @@
             <artifactId>casic-server</artifactId>
             <version>${pro.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>chgjdbc</artifactId>
+            <version>6.0.3-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-export-support</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index db01ce7..dd163ba 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -45,7 +45,10 @@
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
             username = "admin";
-            password = "1q2W3E4R";
+            //  mysql
+//         password = "1q2W3E4R";
+            //postgre
+            password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
 
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 22e1554..873a77e 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -44,7 +44,7 @@
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
     config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
-    download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+    download-path: D:\v1.0\
   device:
     redis:
       invalid-time: 86400
@@ -53,9 +53,9 @@
       password: ew5T4K3#203lwh
       config-prefix: 'Casic:'
   getui:
-    appId: H9jSTE2bAt8QWq2K2GNOB3
-    appKey: bhPeCutJVdAyOasevQFtN9
-    masterSecret: lChudND74A89WRiHLkedb5
+    app-id: 2QZ66VuyLI7LfcAXn5Kpe7 #城管APPid
+    app-key: GEgPZTsFyF66rtOdmgMGM1 #app key
+    master-secret: l0IL4f4sfT72k8NuaY1az2
 logging:
   level.root: info
   level.com.casic: debug
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
index 34f4ffd..16e6332 100644
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ b/casic-web/src/main/resources/config/application-postgre.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: org.postgresql.Driver
-    url: jdbc:postgresql://111.198.10.15:11209/smartwell
+    url: jdbc:postgresql://111.198.10.15:11209/smartwell_zq_cs
     username: postgres
     password: Casic203
   session:
@@ -30,7 +30,7 @@
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
-  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob
   db:
     init:
       enable: false
@@ -42,7 +42,7 @@
     #export-path: D:\export\
     image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
     config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
-    download-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
+    download-path: D:\v1.0\download\
   device:
     redis:
       invalid-time: 86400
@@ -51,12 +51,12 @@
       password: ew5T4K3#203lwh
       config-prefix: 'Casic:'
   getui:
-    appId: H9jSTE2bAt8QWq2K2GNOB3
-    appKey: bhPeCutJVdAyOasevQFtN9
-    masterSecret: lChudND74A89WRiHLkedb5
+    appId: HKv8K9qARd6WckZ1o2Vbu4
+    appKey: 5cV2rugxAb8o28WK6RSFU6
+    masterSecret: fQsKrOaFZy5tvKb3Vd3vv5
 logging:
   level.root: info
-  level.com.casic: info
+  level.com.casic: debug
   file:
     path: logs/
     name: missiles.log
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index ce704d7..dfecddd 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -59,4 +59,4 @@
       invalid-time: 86400
       host: localhost
       port: 6379
-  useOverTime: false
\ No newline at end of file
+  useOverTime: true
\ No newline at end of file