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 71686cd..9e0a589 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
@@ -124,9 +124,14 @@
     public Object add(@RequestParam(required = true) String devcode,
                       @RequestParam(required = true) Long deviceType,
                       @RequestParam(required = true) Float highValue,
-                      @RequestParam(required = true) Float lowValue) {
+                      @RequestParam(required = true) Float lowValue,
+                      @RequestParam(required = false) Float warnValue) {
         try {
             iDeviceRuleService.updateRule(devcode, highValue, lowValue);
+
+            if (ToolUtil.isNotEmpty(warnValue) == true) {
+                iDeviceRuleService.insertWarningRule(devcode, warnValue);
+            }
         } catch (Exception e) {
             return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
         }

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 71686cd..9e0a589 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
@@ -124,9 +124,14 @@
     public Object add(@RequestParam(required = true) String devcode,
                       @RequestParam(required = true) Long deviceType,
                       @RequestParam(required = true) Float highValue,
-                      @RequestParam(required = true) Float lowValue) {
+                      @RequestParam(required = true) Float lowValue,
+                      @RequestParam(required = false) Float warnValue) {
         try {
             iDeviceRuleService.updateRule(devcode, highValue, lowValue);
+
+            if (ToolUtil.isNotEmpty(warnValue) == true) {
+                iDeviceRuleService.insertWarningRule(devcode, warnValue);
+            }
         } catch (Exception e) {
             return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 8ce1070..6c25e18 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -130,7 +130,7 @@
                         alarmRecord.setDeviceId(device.getId());
                         alarmRecord.setDevcode(meterAddr);
                         alarmRecord.setWellCode(wellDto.getWellCode());
-                        alarmRecord.setAlarmType("3"); // 业务报警
+                        alarmRecord.setAlarmType("1"); // 业务报警
                         alarmRecord.setAlarmContent("日用水量超阈值预警");
                         alarmRecord.setAlarmValue(df2.format(flowAccToday));
                         alarmRecord.setAlarmTime(Calendar.getInstance().getTime());

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 71686cd..9e0a589 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
@@ -124,9 +124,14 @@
     public Object add(@RequestParam(required = true) String devcode,
                       @RequestParam(required = true) Long deviceType,
                       @RequestParam(required = true) Float highValue,
-                      @RequestParam(required = true) Float lowValue) {
+                      @RequestParam(required = true) Float lowValue,
+                      @RequestParam(required = false) Float warnValue) {
         try {
             iDeviceRuleService.updateRule(devcode, highValue, lowValue);
+
+            if (ToolUtil.isNotEmpty(warnValue) == true) {
+                iDeviceRuleService.insertWarningRule(devcode, warnValue);
+            }
         } catch (Exception e) {
             return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 8ce1070..6c25e18 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -130,7 +130,7 @@
                         alarmRecord.setDeviceId(device.getId());
                         alarmRecord.setDevcode(meterAddr);
                         alarmRecord.setWellCode(wellDto.getWellCode());
-                        alarmRecord.setAlarmType("3"); // 业务报警
+                        alarmRecord.setAlarmType("1"); // 业务报警
                         alarmRecord.setAlarmContent("日用水量超阈值预警");
                         alarmRecord.setAlarmValue(df2.format(flowAccToday));
                         alarmRecord.setAlarmTime(Calendar.getInstance().getTime());
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 20a0cc3..7525474 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
@@ -78,7 +78,8 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID=1 AND d.deviceType IN (2,6,8,10)
+        AND d.VALID=1 AND d.deviceType IN (2,6,8,10,13)
+        order by deviceType, devcode
     </select>
 
     <select id="selectAlarmRuleByDev" resultType="com.casic.missiles.modular.system.model.AlarmRule">

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 71686cd..9e0a589 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
@@ -124,9 +124,14 @@
     public Object add(@RequestParam(required = true) String devcode,
                       @RequestParam(required = true) Long deviceType,
                       @RequestParam(required = true) Float highValue,
-                      @RequestParam(required = true) Float lowValue) {
+                      @RequestParam(required = true) Float lowValue,
+                      @RequestParam(required = false) Float warnValue) {
         try {
             iDeviceRuleService.updateRule(devcode, highValue, lowValue);
+
+            if (ToolUtil.isNotEmpty(warnValue) == true) {
+                iDeviceRuleService.insertWarningRule(devcode, warnValue);
+            }
         } catch (Exception e) {
             return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 8ce1070..6c25e18 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -130,7 +130,7 @@
                         alarmRecord.setDeviceId(device.getId());
                         alarmRecord.setDevcode(meterAddr);
                         alarmRecord.setWellCode(wellDto.getWellCode());
-                        alarmRecord.setAlarmType("3"); // 业务报警
+                        alarmRecord.setAlarmType("1"); // 业务报警
                         alarmRecord.setAlarmContent("日用水量超阈值预警");
                         alarmRecord.setAlarmValue(df2.format(flowAccToday));
                         alarmRecord.setAlarmTime(Calendar.getInstance().getTime());
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 20a0cc3..7525474 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
@@ -78,7 +78,8 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID=1 AND d.deviceType IN (2,6,8,10)
+        AND d.VALID=1 AND d.deviceType IN (2,6,8,10,13)
+        order by deviceType, devcode
     </select>
 
     <select id="selectAlarmRuleByDev" resultType="com.casic.missiles.modular.system.model.AlarmRule">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceRuleService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceRuleService.java
index a1fb09b..9d7b462 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceRuleService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceRuleService.java
@@ -33,6 +33,7 @@
 
      void updateRule(String devCode,Float highValue,Float lowValue);
 
+     void insertWarningRule(String devcode, Float warnValue);
 
 }
 

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 71686cd..9e0a589 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
@@ -124,9 +124,14 @@
     public Object add(@RequestParam(required = true) String devcode,
                       @RequestParam(required = true) Long deviceType,
                       @RequestParam(required = true) Float highValue,
-                      @RequestParam(required = true) Float lowValue) {
+                      @RequestParam(required = true) Float lowValue,
+                      @RequestParam(required = false) Float warnValue) {
         try {
             iDeviceRuleService.updateRule(devcode, highValue, lowValue);
+
+            if (ToolUtil.isNotEmpty(warnValue) == true) {
+                iDeviceRuleService.insertWarningRule(devcode, warnValue);
+            }
         } catch (Exception e) {
             return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "新增失败");
         }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
index 8ce1070..6c25e18 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataReceiver.java
@@ -130,7 +130,7 @@
                         alarmRecord.setDeviceId(device.getId());
                         alarmRecord.setDevcode(meterAddr);
                         alarmRecord.setWellCode(wellDto.getWellCode());
-                        alarmRecord.setAlarmType("3"); // 业务报警
+                        alarmRecord.setAlarmType("1"); // 业务报警
                         alarmRecord.setAlarmContent("日用水量超阈值预警");
                         alarmRecord.setAlarmValue(df2.format(flowAccToday));
                         alarmRecord.setAlarmTime(Calendar.getInstance().getTime());
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 20a0cc3..7525474 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
@@ -78,7 +78,8 @@
         FROM device_view  d
         WHERE d.devcode NOT IN (
         SELECT r.devcode FROM alarm_rule r)
-        AND d.VALID=1 AND d.deviceType IN (2,6,8,10)
+        AND d.VALID=1 AND d.deviceType IN (2,6,8,10,13)
+        order by deviceType, devcode
     </select>
 
     <select id="selectAlarmRuleByDev" resultType="com.casic.missiles.modular.system.model.AlarmRule">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceRuleService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceRuleService.java
index a1fb09b..9d7b462 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceRuleService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceRuleService.java
@@ -33,6 +33,7 @@
 
      void updateRule(String devCode,Float highValue,Float lowValue);
 
+     void insertWarningRule(String devcode, Float warnValue);
 
 }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceRuleServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceRuleServiceImpl.java
index 8f14e33..462e44c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceRuleServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceRuleServiceImpl.java
@@ -25,8 +25,9 @@
 
     @Resource
     private ICommonPermissionService permissionService;
+
     @Override
-    public void updateRule(String devCode,Float highValue,Float lowValue) {
+    public void updateRule(String devCode, Float highValue, Float lowValue) {
         List<DeviceRule> deviceRuleList=getDeviceRuleListByDevCode(devCode);
         deviceRuleList.forEach(deviceRule -> {
             this.deleteById(deviceRule.getId());
@@ -37,6 +38,20 @@
         deviceRule.setLowvalue(lowValue);
         deviceRule.setSensorcode(getSensorCodeByDevCode(devCode));
         deviceRule.setTs(new Date());
+        deviceRule.setGrade("1");
+        deviceRule.setOperator( permissionService.getCurrLoginUser().getAccount());
+        insert(deviceRule);
+    }
+
+    @Override
+    public void insertWarningRule(String devcode, Float warnValue) {
+        DeviceRule deviceRule = new DeviceRule();
+        deviceRule.setDevcode(devcode);
+        deviceRule.setHighvalue(warnValue);
+        deviceRule.setLowvalue(0.0f);
+        deviceRule.setSensorcode(getSensorCodeByDevCode(devcode));
+        deviceRule.setTs(new Date());
+        deviceRule.setGrade("2");
         deviceRule.setOperator( permissionService.getCurrLoginUser().getAccount());
         insert(deviceRule);
     }