diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 9e0a589..8fff1af 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -69,6 +69,14 @@
         List<Map<String, Object>> retList = new ArrayList<>();
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope
         retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope);
+        // 查找预警阈值
+        for (int i = 0; i < retList.size(); i++) {
+            Map<String, Object> retItem = retList.get(i);
+            AlarmRule warnRule = alarmRuleService.selectAlarmRuleByDev(retItem.get("devcode").toString(), "2");
+            if (null != warnRule) {
+                retItem.put("warnValue", warnRule.getHighvalue());
+            }
+        }
         new AlarmRuleWarpper(retList).warp();
         page.setRecords(retList);
         retMap.put("code", 200);
@@ -89,14 +97,26 @@
         }
         String sHigh = httpServletRequest.getParameter("highValue");
         String sLow = httpServletRequest.getParameter("lowValue");
+        String sWarn = httpServletRequest.getParameter("warnValue");
         float highValue = 99999;
         float lowValue = -99999;
+        float warnValue = -99999;
         if (ToolUtil.isNotEmpty(sHigh))
             highValue = Float.parseFloat(sHigh);
         if (ToolUtil.isNotEmpty(sLow))
             lowValue = Float.parseFloat(sLow);
+        if (ToolUtil.isNotEmpty(sWarn))
+            warnValue = Float.parseFloat(sWarn);
 
         if (alarmRuleService.updateRule(id, highValue, lowValue)) {
+            String sDevcode = httpServletRequest.getParameter("devcode");
+            if (ToolUtil.isNotEmpty(sDevcode) && ToolUtil.isNotEmpty(sWarn)) {
+                AlarmRule warnRule = alarmRuleService.selectAlarmRuleByDev(sDevcode, "2");
+                if (ToolUtil.isNotEmpty(warnRule)) {
+                    alarmRuleService.updateRule(warnRule.getId(), warnValue, 0f);
+                }
+            }
+
             retMap.put("code", 200);
             retMap.put("message", "success");
         } else {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 9e0a589..8fff1af 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -69,6 +69,14 @@
         List<Map<String, Object>> retList = new ArrayList<>();
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope
         retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope);
+        // 查找预警阈值
+        for (int i = 0; i < retList.size(); i++) {
+            Map<String, Object> retItem = retList.get(i);
+            AlarmRule warnRule = alarmRuleService.selectAlarmRuleByDev(retItem.get("devcode").toString(), "2");
+            if (null != warnRule) {
+                retItem.put("warnValue", warnRule.getHighvalue());
+            }
+        }
         new AlarmRuleWarpper(retList).warp();
         page.setRecords(retList);
         retMap.put("code", 200);
@@ -89,14 +97,26 @@
         }
         String sHigh = httpServletRequest.getParameter("highValue");
         String sLow = httpServletRequest.getParameter("lowValue");
+        String sWarn = httpServletRequest.getParameter("warnValue");
         float highValue = 99999;
         float lowValue = -99999;
+        float warnValue = -99999;
         if (ToolUtil.isNotEmpty(sHigh))
             highValue = Float.parseFloat(sHigh);
         if (ToolUtil.isNotEmpty(sLow))
             lowValue = Float.parseFloat(sLow);
+        if (ToolUtil.isNotEmpty(sWarn))
+            warnValue = Float.parseFloat(sWarn);
 
         if (alarmRuleService.updateRule(id, highValue, lowValue)) {
+            String sDevcode = httpServletRequest.getParameter("devcode");
+            if (ToolUtil.isNotEmpty(sDevcode) && ToolUtil.isNotEmpty(sWarn)) {
+                AlarmRule warnRule = alarmRuleService.selectAlarmRuleByDev(sDevcode, "2");
+                if (ToolUtil.isNotEmpty(warnRule)) {
+                    alarmRuleService.updateRule(warnRule.getId(), warnValue, 0f);
+                }
+            }
+
             retMap.put("code", 200);
             retMap.put("message", "success");
         } else {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 7525474..1a0546c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -45,7 +45,7 @@
           LEFT JOIN bus_device bd ON   ar.DEVCODE = bd.DEVCODE
           LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID
           LEFT JOIN bus_well_info bwi ON bdw.WELL_ID = bwi.ID
-          WHERE  bd.VALID = 1 AND bdw.VALID =1
+          WHERE  bd.VALID = 1 AND bdw.VALID =1 and (ar.grade is null or ar.grade = '1')
         <if test="keywords!='' and keywords!=null">
             AND (ar.DEVCODE LIKE concat(CONCAT('%',#{keywords}),'%')
             OR bwi.WELL_CODE LIKE concat(CONCAT('%',#{keywords}),'%') )
@@ -53,6 +53,7 @@
         <if test="deviceType!='' and deviceType!=null">
             AND bd.DEVICE_TYPE= #{deviceType}
         </if>
+        order by bwi.area, bwi.well_code
     </select>
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 9e0a589..8fff1af 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -69,6 +69,14 @@
         List<Map<String, Object>> retList = new ArrayList<>();
         DataScope dataScope = iCommonPermissionService.getCurrUserDataScope();//datascope
         retList = alarmRuleService.ruleListViaParam(page, keywords, deviceType, dataScope);
+        // 查找预警阈值
+        for (int i = 0; i < retList.size(); i++) {
+            Map<String, Object> retItem = retList.get(i);
+            AlarmRule warnRule = alarmRuleService.selectAlarmRuleByDev(retItem.get("devcode").toString(), "2");
+            if (null != warnRule) {
+                retItem.put("warnValue", warnRule.getHighvalue());
+            }
+        }
         new AlarmRuleWarpper(retList).warp();
         page.setRecords(retList);
         retMap.put("code", 200);
@@ -89,14 +97,26 @@
         }
         String sHigh = httpServletRequest.getParameter("highValue");
         String sLow = httpServletRequest.getParameter("lowValue");
+        String sWarn = httpServletRequest.getParameter("warnValue");
         float highValue = 99999;
         float lowValue = -99999;
+        float warnValue = -99999;
         if (ToolUtil.isNotEmpty(sHigh))
             highValue = Float.parseFloat(sHigh);
         if (ToolUtil.isNotEmpty(sLow))
             lowValue = Float.parseFloat(sLow);
+        if (ToolUtil.isNotEmpty(sWarn))
+            warnValue = Float.parseFloat(sWarn);
 
         if (alarmRuleService.updateRule(id, highValue, lowValue)) {
+            String sDevcode = httpServletRequest.getParameter("devcode");
+            if (ToolUtil.isNotEmpty(sDevcode) && ToolUtil.isNotEmpty(sWarn)) {
+                AlarmRule warnRule = alarmRuleService.selectAlarmRuleByDev(sDevcode, "2");
+                if (ToolUtil.isNotEmpty(warnRule)) {
+                    alarmRuleService.updateRule(warnRule.getId(), warnValue, 0f);
+                }
+            }
+
             retMap.put("code", 200);
             retMap.put("message", "success");
         } else {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 7525474..1a0546c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -45,7 +45,7 @@
           LEFT JOIN bus_device bd ON   ar.DEVCODE = bd.DEVCODE
           LEFT JOIN bus_device_well bdw ON bd.ID = bdw.DEVICE_ID
           LEFT JOIN bus_well_info bwi ON bdw.WELL_ID = bwi.ID
-          WHERE  bd.VALID = 1 AND bdw.VALID =1
+          WHERE  bd.VALID = 1 AND bdw.VALID =1 and (ar.grade is null or ar.grade = '1')
         <if test="keywords!='' and keywords!=null">
             AND (ar.DEVCODE LIKE concat(CONCAT('%',#{keywords}),'%')
             OR bwi.WELL_CODE LIKE concat(CONCAT('%',#{keywords}),'%') )
@@ -53,6 +53,7 @@
         <if test="deviceType!='' and deviceType!=null">
             AND bd.DEVICE_TYPE= #{deviceType}
         </if>
+        order by bwi.area, bwi.well_code
     </select>
 
 
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 17b12d1..cf01f62 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
@@ -1015,7 +1015,7 @@
         <if test="endTime!= null and endTime !=''">
             AND DATE_FORMAT(dw.UPTIME,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
         </if>
-        order by dw.uptime
+        order by dw.uptime desc
     </select>
 
     <select id="getWaterMeterCount" resultType="string">