定边报警系统修改

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/AlarmTsMapper.java

@@ -138,7 +138,7 @@ public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
             "and modelId= #{modelId}",
             "</if>",
             "<if test='description != null'>",
-            "and description like #{description}",
+            "and characteristic like #{description}",
             "</if>",
             "<if test='deviceid != null'>",
             "and deviceid = #{deviceid}",
@@ -180,7 +180,7 @@ public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
             "and modelId= #{modelId}",
             "</if>",
             "<if test='description != null'>",
-            "and description like #{description}",
+            "and characteristic like #{description}",
             "</if>",
             "<if test='deviceid != null'>",
             "and deviceid = #{deviceid}",

alarm-web/src/main/java/com/gyee/alarm/mapper/auto/ProEconAlarmPlanMapper.java

@@ -69,7 +69,7 @@ public interface ProEconAlarmPlanMapper extends BaseMapper<ProEconAlarmPlan> {
             "and types = #{types} ",
             "</if>",
             "</where>",
-
+            " order by id  ",
             "</script>"})
     IPage<ProEconAlarmPlan> pageQueryAll(Page page,
                                          @Param("name") String name, @Param("types") String types);