diff --git a/src/main/java/com/xydl/cac/controller/WarnRuleController.java b/src/main/java/com/xydl/cac/controller/WarnRuleController.java
index d37cff7..263e072 100644
--- a/src/main/java/com/xydl/cac/controller/WarnRuleController.java
+++ b/src/main/java/com/xydl/cac/controller/WarnRuleController.java
@@ -37,11 +37,11 @@ public class WarnRuleController extends BasicController {
     public Response<List<ColumnModel>> listComparator() throws Exception {
         List<ColumnModel> result = new ArrayList<>();
         ColumnModel item = new ColumnModel();
-        item.setName(FloatCompare);
+        item.setType(FloatCompare);
         item.setComment("浮点型数据比较器");
         result.add(item);
         item = new ColumnModel();
-        item.setName(IntCompare);
+        item.setType(IntCompare);
         item.setComment("整型数据比较器");
         result.add(item);
         return Response.success(result);
@@ -68,6 +68,17 @@ public class WarnRuleController extends BasicController {
     @ApiOperation("查询全部列表")
     public Response<List<WarnRule>> listAll(Integer sensorId) throws Exception {
         List<WarnRule> result = service.listAll(sensorId);
+        for (WarnRule item : result) {
+            if (FloatCompare.equalsIgnoreCase(item.getComparator())) {
+                item.setComparatorDesc("浮点型数据比较器");
+                String name = floatCompare.supportedOperator().get(item.getOperator());
+                item.setOperatorDesc(name);
+            } else if (IntCompare.equalsIgnoreCase(item.getComparator())) {
+                item.setComparatorDesc("整型数据比较器");
+                String name = intCompare.supportedOperator().get(item.getOperator());
+                item.setOperatorDesc(name);
+            }
+        }
         return Response.success(result);
     }
 
diff --git a/src/main/java/com/xydl/cac/entity/WarnRule.java b/src/main/java/com/xydl/cac/entity/WarnRule.java
index 2506b63..4dfbbdf 100644
--- a/src/main/java/com/xydl/cac/entity/WarnRule.java
+++ b/src/main/java/com/xydl/cac/entity/WarnRule.java
@@ -73,6 +73,9 @@ public class WarnRule {
     @Column(name = "last_d_time")
     private Date lastDTime;
 
+    private String comparatorDesc;
+    private String operatorDesc;
+
     @Transient
     private NSensor nSensor;
     @Transient