diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 5d2e9b9..e33c2c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -28,10 +28,10 @@
             OPEN_ALARM AS "openAlarm",
             OPEN_JOB AS "openJob",
             TS AS ts
-        FROM `alarm_level`
+        FROM  alarm_level
         WHERE TENANT_ID = #{tenantId}
-        GROUP BY NAME
-        HAVING NAME = #{name}
+        AND   NAME = #{name}
+        LIMIT 1
     </select>
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 5d2e9b9..e33c2c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -28,10 +28,10 @@
             OPEN_ALARM AS "openAlarm",
             OPEN_JOB AS "openJob",
             TS AS ts
-        FROM `alarm_level`
+        FROM  alarm_level
         WHERE TENANT_ID = #{tenantId}
-        GROUP BY NAME
-        HAVING NAME = #{name}
+        AND   NAME = #{name}
+        LIMIT 1
     </select>
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
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 9a44090..f4dac57 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
@@ -91,7 +91,6 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (CollectionUtil.isNotEmpty(list)) {
@@ -174,20 +173,15 @@
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
-
             results = this.importExcel(Device.class, file, null, null);
             List<String> list = deviceService.addDeviceBatch(results);
-
             if (!CollectionUtil.isEmpty(list)) {
                 //获取第校验报错信息
                 return new ErrorResponseData(list.get(0));
             }
-
-
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -279,7 +273,6 @@
         }
         Device oldDevice = this.deviceService.getById(device.getId());
         LogObjectHolder.me().set(oldDevice);
-
         deviceService.updateById(device);
         return ResponseData.success();
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 5d2e9b9..e33c2c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -28,10 +28,10 @@
             OPEN_ALARM AS "openAlarm",
             OPEN_JOB AS "openJob",
             TS AS ts
-        FROM `alarm_level`
+        FROM  alarm_level
         WHERE TENANT_ID = #{tenantId}
-        GROUP BY NAME
-        HAVING NAME = #{name}
+        AND   NAME = #{name}
+        LIMIT 1
     </select>
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
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 9a44090..f4dac57 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
@@ -91,7 +91,6 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (CollectionUtil.isNotEmpty(list)) {
@@ -174,20 +173,15 @@
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
-
             results = this.importExcel(Device.class, file, null, null);
             List<String> list = deviceService.addDeviceBatch(results);
-
             if (!CollectionUtil.isEmpty(list)) {
                 //获取第校验报错信息
                 return new ErrorResponseData(list.get(0));
             }
-
-
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -279,7 +273,6 @@
         }
         Device oldDevice = this.deviceService.getById(device.getId());
         LogObjectHolder.me().set(oldDevice);
-
         deviceService.updateById(device);
         return ResponseData.success();
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 3834abd..ac95276 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -37,14 +37,14 @@
     private IDeviceModelsService deviceModelsService;
 
 
-    /**
-     * 获取列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(Long deviceType) {
-        return deviceModelsService.selectList(deviceType);
-    }
+//    /**
+//     * 获取列表
+//     */
+//    @RequestMapping(value = "/list")
+//    @ResponseBody
+//    public Object list(Long deviceType) {
+//        return deviceModelsService.selectList(deviceType);
+//    }
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -52,23 +52,24 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/listPage")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String modelName) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName);
+                .like("DEVICE_TYPE", deviceType == null ? "" : deviceType)
+                .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
         page.getRecords().stream().forEach(
-                DeviceModels -> {
-                    DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName());
-                    String[] d = DeviceModels.getCommunication().split(",");
+                deviceModels -> {
+                    deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName());
+                    String[] d = deviceModels.getCommunication().split(",");
                     if (d.length > 0) {
-                        DeviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                        deviceModels.setCommunNameGroup(dictMap.get(d[0]));
                     }
                     for (int i = 1; i < d.length; i++) {
-                        DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
                     }
                 }
         );
@@ -141,7 +142,6 @@
     @RequestMapping(value = "/detail/{deviceModelsId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceModelsId") String deviceModelsId) {
-
         return ResponseData.success(deviceModelsService.getById(deviceModelsId));
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 5d2e9b9..e33c2c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -28,10 +28,10 @@
             OPEN_ALARM AS "openAlarm",
             OPEN_JOB AS "openJob",
             TS AS ts
-        FROM `alarm_level`
+        FROM  alarm_level
         WHERE TENANT_ID = #{tenantId}
-        GROUP BY NAME
-        HAVING NAME = #{name}
+        AND   NAME = #{name}
+        LIMIT 1
     </select>
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
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 9a44090..f4dac57 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
@@ -91,7 +91,6 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (CollectionUtil.isNotEmpty(list)) {
@@ -174,20 +173,15 @@
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
-
             results = this.importExcel(Device.class, file, null, null);
             List<String> list = deviceService.addDeviceBatch(results);
-
             if (!CollectionUtil.isEmpty(list)) {
                 //获取第校验报错信息
                 return new ErrorResponseData(list.get(0));
             }
-
-
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -279,7 +273,6 @@
         }
         Device oldDevice = this.deviceService.getById(device.getId());
         LogObjectHolder.me().set(oldDevice);
-
         deviceService.updateById(device);
         return ResponseData.success();
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 3834abd..ac95276 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -37,14 +37,14 @@
     private IDeviceModelsService deviceModelsService;
 
 
-    /**
-     * 获取列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(Long deviceType) {
-        return deviceModelsService.selectList(deviceType);
-    }
+//    /**
+//     * 获取列表
+//     */
+//    @RequestMapping(value = "/list")
+//    @ResponseBody
+//    public Object list(Long deviceType) {
+//        return deviceModelsService.selectList(deviceType);
+//    }
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -52,23 +52,24 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/listPage")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String modelName) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName);
+                .like("DEVICE_TYPE", deviceType == null ? "" : deviceType)
+                .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
         page.getRecords().stream().forEach(
-                DeviceModels -> {
-                    DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName());
-                    String[] d = DeviceModels.getCommunication().split(",");
+                deviceModels -> {
+                    deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName());
+                    String[] d = deviceModels.getCommunication().split(",");
                     if (d.length > 0) {
-                        DeviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                        deviceModels.setCommunNameGroup(dictMap.get(d[0]));
                     }
                     for (int i = 1; i < d.length; i++) {
-                        DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
                     }
                 }
         );
@@ -141,7 +142,6 @@
     @RequestMapping(value = "/detail/{deviceModelsId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceModelsId") String deviceModelsId) {
-
         return ResponseData.success(deviceModelsService.getById(deviceModelsId));
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index e12c713..b8bb239 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -17,20 +17,32 @@
     <sql id="view_sql">
         ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
-            <property name="paramTime" value="INSTALLDATE"/>
+            <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE"
+        AS "INSTALLDATE",INSTALL_HEIGHT
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
-               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+               DATE_FORMAT(${paramDate},'%Y-%m-%d')
     </sql>
 
     <sql id="date_toChar" databaseId="pgsql">
-               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
     </sql>
 
     <sql id="date_toChar" databaseId="oracle">
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
                TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
     </sql>
 
@@ -79,7 +91,9 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
+        a.INSTALL_HEIGHT  AS  "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
+
         d.DEPTID
         FROM bus_device a
         INNER JOIN base_device_type b ON a.DEVICE_TYPE = b.ID
@@ -112,13 +126,13 @@
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="beginTime"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="endTime"/>
             </include>
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 5d2e9b9..e33c2c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -28,10 +28,10 @@
             OPEN_ALARM AS "openAlarm",
             OPEN_JOB AS "openJob",
             TS AS ts
-        FROM `alarm_level`
+        FROM  alarm_level
         WHERE TENANT_ID = #{tenantId}
-        GROUP BY NAME
-        HAVING NAME = #{name}
+        AND   NAME = #{name}
+        LIMIT 1
     </select>
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
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 9a44090..f4dac57 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
@@ -91,7 +91,6 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (CollectionUtil.isNotEmpty(list)) {
@@ -174,20 +173,15 @@
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
-
             results = this.importExcel(Device.class, file, null, null);
             List<String> list = deviceService.addDeviceBatch(results);
-
             if (!CollectionUtil.isEmpty(list)) {
                 //获取第校验报错信息
                 return new ErrorResponseData(list.get(0));
             }
-
-
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -279,7 +273,6 @@
         }
         Device oldDevice = this.deviceService.getById(device.getId());
         LogObjectHolder.me().set(oldDevice);
-
         deviceService.updateById(device);
         return ResponseData.success();
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 3834abd..ac95276 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -37,14 +37,14 @@
     private IDeviceModelsService deviceModelsService;
 
 
-    /**
-     * 获取列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(Long deviceType) {
-        return deviceModelsService.selectList(deviceType);
-    }
+//    /**
+//     * 获取列表
+//     */
+//    @RequestMapping(value = "/list")
+//    @ResponseBody
+//    public Object list(Long deviceType) {
+//        return deviceModelsService.selectList(deviceType);
+//    }
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -52,23 +52,24 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/listPage")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String modelName) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName);
+                .like("DEVICE_TYPE", deviceType == null ? "" : deviceType)
+                .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
         page.getRecords().stream().forEach(
-                DeviceModels -> {
-                    DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName());
-                    String[] d = DeviceModels.getCommunication().split(",");
+                deviceModels -> {
+                    deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName());
+                    String[] d = deviceModels.getCommunication().split(",");
                     if (d.length > 0) {
-                        DeviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                        deviceModels.setCommunNameGroup(dictMap.get(d[0]));
                     }
                     for (int i = 1; i < d.length; i++) {
-                        DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
                     }
                 }
         );
@@ -141,7 +142,6 @@
     @RequestMapping(value = "/detail/{deviceModelsId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceModelsId") String deviceModelsId) {
-
         return ResponseData.success(deviceModelsService.getById(deviceModelsId));
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index e12c713..b8bb239 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -17,20 +17,32 @@
     <sql id="view_sql">
         ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
-            <property name="paramTime" value="INSTALLDATE"/>
+            <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE"
+        AS "INSTALLDATE",INSTALL_HEIGHT
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
-               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+               DATE_FORMAT(${paramDate},'%Y-%m-%d')
     </sql>
 
     <sql id="date_toChar" databaseId="pgsql">
-               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
     </sql>
 
     <sql id="date_toChar" databaseId="oracle">
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
                TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
     </sql>
 
@@ -79,7 +91,9 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
+        a.INSTALL_HEIGHT  AS  "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
+
         d.DEPTID
         FROM bus_device a
         INNER JOIN base_device_type b ON a.DEVICE_TYPE = b.ID
@@ -112,13 +126,13 @@
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="beginTime"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="endTime"/>
             </include>
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
index c36d4fb..b8b0b5e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
@@ -22,6 +22,7 @@
     private String deviceTypeName;
     private String deptName;
     private String deviceName;
+    private String installHeight;
 
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 5d2e9b9..e33c2c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -28,10 +28,10 @@
             OPEN_ALARM AS "openAlarm",
             OPEN_JOB AS "openJob",
             TS AS ts
-        FROM `alarm_level`
+        FROM  alarm_level
         WHERE TENANT_ID = #{tenantId}
-        GROUP BY NAME
-        HAVING NAME = #{name}
+        AND   NAME = #{name}
+        LIMIT 1
     </select>
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
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 9a44090..f4dac57 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
@@ -91,7 +91,6 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (CollectionUtil.isNotEmpty(list)) {
@@ -174,20 +173,15 @@
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
-
             results = this.importExcel(Device.class, file, null, null);
             List<String> list = deviceService.addDeviceBatch(results);
-
             if (!CollectionUtil.isEmpty(list)) {
                 //获取第校验报错信息
                 return new ErrorResponseData(list.get(0));
             }
-
-
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -279,7 +273,6 @@
         }
         Device oldDevice = this.deviceService.getById(device.getId());
         LogObjectHolder.me().set(oldDevice);
-
         deviceService.updateById(device);
         return ResponseData.success();
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 3834abd..ac95276 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -37,14 +37,14 @@
     private IDeviceModelsService deviceModelsService;
 
 
-    /**
-     * 获取列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(Long deviceType) {
-        return deviceModelsService.selectList(deviceType);
-    }
+//    /**
+//     * 获取列表
+//     */
+//    @RequestMapping(value = "/list")
+//    @ResponseBody
+//    public Object list(Long deviceType) {
+//        return deviceModelsService.selectList(deviceType);
+//    }
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -52,23 +52,24 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/listPage")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String modelName) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName);
+                .like("DEVICE_TYPE", deviceType == null ? "" : deviceType)
+                .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
         page.getRecords().stream().forEach(
-                DeviceModels -> {
-                    DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName());
-                    String[] d = DeviceModels.getCommunication().split(",");
+                deviceModels -> {
+                    deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName());
+                    String[] d = deviceModels.getCommunication().split(",");
                     if (d.length > 0) {
-                        DeviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                        deviceModels.setCommunNameGroup(dictMap.get(d[0]));
                     }
                     for (int i = 1; i < d.length; i++) {
-                        DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
                     }
                 }
         );
@@ -141,7 +142,6 @@
     @RequestMapping(value = "/detail/{deviceModelsId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceModelsId") String deviceModelsId) {
-
         return ResponseData.success(deviceModelsService.getById(deviceModelsId));
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index e12c713..b8bb239 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -17,20 +17,32 @@
     <sql id="view_sql">
         ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
-            <property name="paramTime" value="INSTALLDATE"/>
+            <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE"
+        AS "INSTALLDATE",INSTALL_HEIGHT
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
-               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+               DATE_FORMAT(${paramDate},'%Y-%m-%d')
     </sql>
 
     <sql id="date_toChar" databaseId="pgsql">
-               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
     </sql>
 
     <sql id="date_toChar" databaseId="oracle">
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
                TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
     </sql>
 
@@ -79,7 +91,9 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
+        a.INSTALL_HEIGHT  AS  "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
+
         d.DEPTID
         FROM bus_device a
         INNER JOIN base_device_type b ON a.DEVICE_TYPE = b.ID
@@ -112,13 +126,13 @@
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="beginTime"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="endTime"/>
             </include>
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
index c36d4fb..b8b0b5e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
@@ -22,6 +22,7 @@
     private String deviceTypeName;
     private String deptName;
     private String deviceName;
+    private String installHeight;
 
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 83177e4..34c1772 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -19,10 +19,10 @@
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
-@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 @Data
-public class DeviceDto  extends Model<DeviceDto> {
+public class DeviceDto extends Model<DeviceDto> {
 
     /**
      * id : 1
@@ -49,7 +49,7 @@
 
     private Long id;//主键
     @ExcelProperty("井编号")
-    @Length(max = 15,min = 12)
+    @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
     private String devcode;
@@ -79,5 +79,7 @@
     private String bfzt;
     private String bfztName;
     private String wellId;
+    @ExcelProperty("安装高度")
+    private String installHeight;
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 5d2e9b9..e33c2c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -28,10 +28,10 @@
             OPEN_ALARM AS "openAlarm",
             OPEN_JOB AS "openJob",
             TS AS ts
-        FROM `alarm_level`
+        FROM  alarm_level
         WHERE TENANT_ID = #{tenantId}
-        GROUP BY NAME
-        HAVING NAME = #{name}
+        AND   NAME = #{name}
+        LIMIT 1
     </select>
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
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 9a44090..f4dac57 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
@@ -91,7 +91,6 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (CollectionUtil.isNotEmpty(list)) {
@@ -174,20 +173,15 @@
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
-
             results = this.importExcel(Device.class, file, null, null);
             List<String> list = deviceService.addDeviceBatch(results);
-
             if (!CollectionUtil.isEmpty(list)) {
                 //获取第校验报错信息
                 return new ErrorResponseData(list.get(0));
             }
-
-
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -279,7 +273,6 @@
         }
         Device oldDevice = this.deviceService.getById(device.getId());
         LogObjectHolder.me().set(oldDevice);
-
         deviceService.updateById(device);
         return ResponseData.success();
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 3834abd..ac95276 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -37,14 +37,14 @@
     private IDeviceModelsService deviceModelsService;
 
 
-    /**
-     * 获取列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(Long deviceType) {
-        return deviceModelsService.selectList(deviceType);
-    }
+//    /**
+//     * 获取列表
+//     */
+//    @RequestMapping(value = "/list")
+//    @ResponseBody
+//    public Object list(Long deviceType) {
+//        return deviceModelsService.selectList(deviceType);
+//    }
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -52,23 +52,24 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/listPage")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String modelName) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName);
+                .like("DEVICE_TYPE", deviceType == null ? "" : deviceType)
+                .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
         page.getRecords().stream().forEach(
-                DeviceModels -> {
-                    DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName());
-                    String[] d = DeviceModels.getCommunication().split(",");
+                deviceModels -> {
+                    deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName());
+                    String[] d = deviceModels.getCommunication().split(",");
                     if (d.length > 0) {
-                        DeviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                        deviceModels.setCommunNameGroup(dictMap.get(d[0]));
                     }
                     for (int i = 1; i < d.length; i++) {
-                        DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
                     }
                 }
         );
@@ -141,7 +142,6 @@
     @RequestMapping(value = "/detail/{deviceModelsId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceModelsId") String deviceModelsId) {
-
         return ResponseData.success(deviceModelsService.getById(deviceModelsId));
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index e12c713..b8bb239 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -17,20 +17,32 @@
     <sql id="view_sql">
         ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
-            <property name="paramTime" value="INSTALLDATE"/>
+            <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE"
+        AS "INSTALLDATE",INSTALL_HEIGHT
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
-               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+               DATE_FORMAT(${paramDate},'%Y-%m-%d')
     </sql>
 
     <sql id="date_toChar" databaseId="pgsql">
-               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
     </sql>
 
     <sql id="date_toChar" databaseId="oracle">
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
                TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
     </sql>
 
@@ -79,7 +91,9 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
+        a.INSTALL_HEIGHT  AS  "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
+
         d.DEPTID
         FROM bus_device a
         INNER JOIN base_device_type b ON a.DEVICE_TYPE = b.ID
@@ -112,13 +126,13 @@
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="beginTime"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="endTime"/>
             </include>
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
index c36d4fb..b8b0b5e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
@@ -22,6 +22,7 @@
     private String deviceTypeName;
     private String deptName;
     private String deviceName;
+    private String installHeight;
 
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 83177e4..34c1772 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -19,10 +19,10 @@
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
-@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 @Data
-public class DeviceDto  extends Model<DeviceDto> {
+public class DeviceDto extends Model<DeviceDto> {
 
     /**
      * id : 1
@@ -49,7 +49,7 @@
 
     private Long id;//主键
     @ExcelProperty("井编号")
-    @Length(max = 15,min = 12)
+    @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
     private String devcode;
@@ -79,5 +79,7 @@
     private String bfzt;
     private String bfztName;
     private String wellId;
+    @ExcelProperty("安装高度")
+    private String installHeight;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index 4e9434f..ec5edf6 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -53,8 +53,26 @@
      */
     @TableField("IS_NO_CONCENT")
     private String isNoConcent;
-
-
+    /**
+     * 报警规则类型 1需要单独设置报警规则，2统一的报警规则 3无报警规则
+     */
+    @TableField("ALARM_RULE_TYPE")
+    private String alarmRuleType;
+    /**
+     * 是否需要报警上限
+     */
+    @TableField("ALARM_RULE_HIGHVALUE")
+    private String alarmRuleHighvalue;
+    /**
+     * 是否需要报警下限
+     */
+    @TableField("ALARM_RULE_LOWVALUE")
+    private String alarmRuleLowvalue;
+    /**
+     * 数据展示配置，json串
+     */
+    @TableField("DATA_CONFIG")
+    private String dataConfig;
 
     @Override
     public String toString() {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index a1432fd..1f65166 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -43,7 +43,7 @@
     /**
      * 获取告警等级列表
      */
-    @RequestMapping("/levelList")
+    @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
         List<Map<String, Object>> levelList = new ArrayList<>();
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index 5d2e9b9..e33c2c2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -28,10 +28,10 @@
             OPEN_ALARM AS "openAlarm",
             OPEN_JOB AS "openJob",
             TS AS ts
-        FROM `alarm_level`
+        FROM  alarm_level
         WHERE TENANT_ID = #{tenantId}
-        GROUP BY NAME
-        HAVING NAME = #{name}
+        AND   NAME = #{name}
+        LIMIT 1
     </select>
 
     <select id="selectByNameAndTenList" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
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 9a44090..f4dac57 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
@@ -91,7 +91,6 @@
     @RequestMapping(value = "/listByConfig")
     @ResponseBody
     public ResponseData listByConfig(String deviceType, String configStatus) {
-
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceCodeSelectDto> list = deviceService.selectDevicesByConfig(dataScope, deviceType, configStatus);
         if (CollectionUtil.isNotEmpty(list)) {
@@ -174,20 +173,15 @@
         mapper.put("数据集中器编号", "concenCode");
         mapper.put("设备安装时间", "installDateFmt");
         try {
-
             results = this.importExcel(Device.class, file, null, null);
             List<String> list = deviceService.addDeviceBatch(results);
-
             if (!CollectionUtil.isEmpty(list)) {
                 //获取第校验报错信息
                 return new ErrorResponseData(list.get(0));
             }
-
-
         } catch (Exception e) {
             return catchMybatisPlusException(e, "导入设备失败");
         }
-
         return ResponseData.success();
     }
 
@@ -279,7 +273,6 @@
         }
         Device oldDevice = this.deviceService.getById(device.getId());
         LogObjectHolder.me().set(oldDevice);
-
         deviceService.updateById(device);
         return ResponseData.success();
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
index 3834abd..ac95276 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceModelsController.java
@@ -37,14 +37,14 @@
     private IDeviceModelsService deviceModelsService;
 
 
-    /**
-     * 获取列表
-     */
-    @RequestMapping(value = "/list")
-    @ResponseBody
-    public Object list(Long deviceType) {
-        return deviceModelsService.selectList(deviceType);
-    }
+//    /**
+//     * 获取列表
+//     */
+//    @RequestMapping(value = "/list")
+//    @ResponseBody
+//    public Object list(Long deviceType) {
+//        return deviceModelsService.selectList(deviceType);
+//    }
 
     @Autowired
     private IDeviceTypeService deviceTypeService;
@@ -52,23 +52,24 @@
     /**
      * 获取分页列表
      */
-    @RequestMapping(value = "/listPage")
+    @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String modelName) {
+    public Object listPage(String deviceType, String communication) {
         Page<DeviceModels> page = PageFactory.defaultPage();
         QueryWrapper<DeviceModels> query = new QueryWrapper<DeviceModels>()
-                .like("MODEL_NAME", modelName == null ? "" : modelName);
+                .like("DEVICE_TYPE", deviceType == null ? "" : deviceType)
+                .like("COMMUNICATION", communication == null ? "" : communication);
         page = deviceModelsService.page(page, query);
         Map<String, String> dictMap = deviceModelsService.getDictNameByCode();
         page.getRecords().stream().forEach(
-                DeviceModels -> {
-                    DeviceModels.setDeviceTypeName(deviceTypeService.getById(DeviceModels.getDeviceType()).getTypeName());
-                    String[] d = DeviceModels.getCommunication().split(",");
+                deviceModels -> {
+                    deviceModels.setDeviceTypeName(deviceTypeService.getById(deviceModels.getDeviceType()).getTypeName());
+                    String[] d = deviceModels.getCommunication().split(",");
                     if (d.length > 0) {
-                        DeviceModels.setCommunNameGroup(dictMap.get(d[0]));
+                        deviceModels.setCommunNameGroup(dictMap.get(d[0]));
                     }
                     for (int i = 1; i < d.length; i++) {
-                        DeviceModels.setCommunNameGroup(DeviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
+                        deviceModels.setCommunNameGroup(deviceModels.getCommunNameGroup() + "," + dictMap.get(d[i]));
                     }
                 }
         );
@@ -141,7 +142,6 @@
     @RequestMapping(value = "/detail/{deviceModelsId}")
     @ResponseBody
     public Object detail(@PathVariable("deviceModelsId") String deviceModelsId) {
-
         return ResponseData.success(deviceModelsService.getById(deviceModelsId));
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index e12c713..b8bb239 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -17,20 +17,32 @@
     <sql id="view_sql">
         ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId,
         <include refid="date_toChar">
-            <property name="paramTime" value="INSTALLDATE"/>
+            <property name="paramDate" value="INSTALLDATE"/>
         </include>
-        AS "INSTALLDATE"
+        AS "INSTALLDATE",INSTALL_HEIGHT
     </sql>
 
     <sql id="date_toChar" databaseId="mysql">
-               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+               DATE_FORMAT(${paramDate},'%Y-%m-%d')
     </sql>
 
     <sql id="date_toChar" databaseId="pgsql">
-               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
     </sql>
 
     <sql id="date_toChar" databaseId="oracle">
+               TO_CHAR(${paramDate},'yyyy-mm-dd')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="mysql">
+               DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="pgsql">
+               TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="dateTime_toChar" databaseId="oracle">
                TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
     </sql>
 
@@ -79,7 +91,9 @@
         a.devcode,
         a.DEVICE_NAME AS "deviceName",
         a.DEVICE_TYPE AS "deptType",
+        a.INSTALL_HEIGHT  AS  "installHeight",
         b.TYPE_NAME AS "deviceTypeName",
+
         d.DEPTID
         FROM bus_device a
         INNER JOIN base_device_type b ON a.DEVICE_TYPE = b.ID
@@ -112,13 +126,13 @@
         </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="beginTime"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
             and installDate &lt;
-            <include refid="date_toChar">
+            <include refid="dateTime_toChar">
                 <property name="paramTime" value="endTime"/>
             </include>
         </if>
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
index c36d4fb..b8b0b5e 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceCodeSelectDto.java
@@ -22,6 +22,7 @@
     private String deviceTypeName;
     private String deptName;
     private String deviceName;
+    private String installHeight;
 
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 83177e4..34c1772 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -19,10 +19,10 @@
 @ColumnWidth(30)
 @HeadRowHeight(15)
 @ContentRowHeight(20)
-@ContentStyle(borderLeft = BorderStyleEnum.THIN,borderBottom =BorderStyleEnum.THIN,borderTop = BorderStyleEnum.THIN,borderRight = BorderStyleEnum.THIN)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
 @Data
-public class DeviceDto  extends Model<DeviceDto> {
+public class DeviceDto extends Model<DeviceDto> {
 
     /**
      * id : 1
@@ -49,7 +49,7 @@
 
     private Long id;//主键
     @ExcelProperty("井编号")
-    @Length(max = 15,min = 12)
+    @Length(max = 15, min = 12)
     private String wellCode;
     @ExcelProperty("设备编号")
     private String devcode;
@@ -79,5 +79,7 @@
     private String bfzt;
     private String bfztName;
     private String wellId;
+    @ExcelProperty("安装高度")
+    private String installHeight;
 
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
index 4e9434f..ec5edf6 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeviceType.java
@@ -53,8 +53,26 @@
      */
     @TableField("IS_NO_CONCENT")
     private String isNoConcent;
-
-
+    /**
+     * 报警规则类型 1需要单独设置报警规则，2统一的报警规则 3无报警规则
+     */
+    @TableField("ALARM_RULE_TYPE")
+    private String alarmRuleType;
+    /**
+     * 是否需要报警上限
+     */
+    @TableField("ALARM_RULE_HIGHVALUE")
+    private String alarmRuleHighvalue;
+    /**
+     * 是否需要报警下限
+     */
+    @TableField("ALARM_RULE_LOWVALUE")
+    private String alarmRuleLowvalue;
+    /**
+     * 数据展示配置，json串
+     */
+    @TableField("DATA_CONFIG")
+    private String dataConfig;
 
     @Override
     public String toString() {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index a45e5c9..2c569f1 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.util.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -74,7 +75,7 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(this.getAreaPid(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isNumeric(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;