diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
index 607bc85..75233ea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.config.DeviceServerProperties;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
  * @author dev123
  * @Date 2018-11-19 13:15:14
  */
+@Slf4j
 @RestController
 public class TemplateController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@@ -45,9 +47,9 @@
             throws ServletException, IOException {
         String path = gunsProperties.getConfigPath();
         logger.info(path);
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
+//        if (path.startsWith("/")) {
+//            path = path.substring(1);
+//        }
         File file = new File(path, filename);
         // 获取文件名
         String fileName = null;
@@ -67,6 +69,7 @@
             fis = new FileInputStream(file);
             byte[] buffer = new byte[1024];
             int readTmp = 0;
+            log.info("    "+file.getPath());
             while ((readTmp = fis.read(buffer)) != -1) {
                 response.getOutputStream().write(buffer, 0, readTmp);
             }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
index 607bc85..75233ea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.config.DeviceServerProperties;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
  * @author dev123
  * @Date 2018-11-19 13:15:14
  */
+@Slf4j
 @RestController
 public class TemplateController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@@ -45,9 +47,9 @@
             throws ServletException, IOException {
         String path = gunsProperties.getConfigPath();
         logger.info(path);
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
+//        if (path.startsWith("/")) {
+//            path = path.substring(1);
+//        }
         File file = new File(path, filename);
         // 获取文件名
         String fileName = null;
@@ -67,6 +69,7 @@
             fis = new FileInputStream(file);
             byte[] buffer = new byte[1024];
             int readTmp = 0;
+            log.info("    "+file.getPath());
             while ((readTmp = fis.read(buffer)) != -1) {
                 response.getOutputStream().write(buffer, 0, readTmp);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index a6f01a9..833437c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomUtils;
 import org.hswebframework.expands.office.excel.ExcelIO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -39,6 +41,7 @@
     @Value("${smartcity.config.config-path}")
     private String templatePath;
 
+    private DecimalFormat df2 = new DecimalFormat("0.00");
     DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -85,11 +88,11 @@
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
             if (meterRec == null) {
                 deviceDto.setWatchNum("0");
-                deviceDto.setPressure(new Random().nextInt(4));
+                deviceDto.setPressure(df2.format(RandomUtils.nextDouble(0.14, 0.3)));
                 deviceDto.setUptime(sdf4.format(new Date()));
             } else {
                 deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString());
-                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? 0 : Integer.valueOf(meterRec.get("PRESSURE").toString()));
+                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? "0.14": meterRec.get("PRESSURE").toString());
                 deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
             }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
index 607bc85..75233ea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.config.DeviceServerProperties;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
  * @author dev123
  * @Date 2018-11-19 13:15:14
  */
+@Slf4j
 @RestController
 public class TemplateController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@@ -45,9 +47,9 @@
             throws ServletException, IOException {
         String path = gunsProperties.getConfigPath();
         logger.info(path);
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
+//        if (path.startsWith("/")) {
+//            path = path.substring(1);
+//        }
         File file = new File(path, filename);
         // 获取文件名
         String fileName = null;
@@ -67,6 +69,7 @@
             fis = new FileInputStream(file);
             byte[] buffer = new byte[1024];
             int readTmp = 0;
+            log.info("    "+file.getPath());
             while ((readTmp = fis.read(buffer)) != -1) {
                 response.getOutputStream().write(buffer, 0, readTmp);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index a6f01a9..833437c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomUtils;
 import org.hswebframework.expands.office.excel.ExcelIO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -39,6 +41,7 @@
     @Value("${smartcity.config.config-path}")
     private String templatePath;
 
+    private DecimalFormat df2 = new DecimalFormat("0.00");
     DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -85,11 +88,11 @@
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
             if (meterRec == null) {
                 deviceDto.setWatchNum("0");
-                deviceDto.setPressure(new Random().nextInt(4));
+                deviceDto.setPressure(df2.format(RandomUtils.nextDouble(0.14, 0.3)));
                 deviceDto.setUptime(sdf4.format(new Date()));
             } else {
                 deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString());
-                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? 0 : Integer.valueOf(meterRec.get("PRESSURE").toString()));
+                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? "0.14": meterRec.get("PRESSURE").toString());
                 deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
             }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 7a159f6..84bf3c9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -310,7 +310,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
         List<Map<String,Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
         super.exportExcel(DeviceExportEnum.NOISEDATA_EXPORT, mapList, response);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
index 607bc85..75233ea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.config.DeviceServerProperties;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
  * @author dev123
  * @Date 2018-11-19 13:15:14
  */
+@Slf4j
 @RestController
 public class TemplateController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@@ -45,9 +47,9 @@
             throws ServletException, IOException {
         String path = gunsProperties.getConfigPath();
         logger.info(path);
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
+//        if (path.startsWith("/")) {
+//            path = path.substring(1);
+//        }
         File file = new File(path, filename);
         // 获取文件名
         String fileName = null;
@@ -67,6 +69,7 @@
             fis = new FileInputStream(file);
             byte[] buffer = new byte[1024];
             int readTmp = 0;
+            log.info("    "+file.getPath());
             while ((readTmp = fis.read(buffer)) != -1) {
                 response.getOutputStream().write(buffer, 0, readTmp);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index a6f01a9..833437c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomUtils;
 import org.hswebframework.expands.office.excel.ExcelIO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -39,6 +41,7 @@
     @Value("${smartcity.config.config-path}")
     private String templatePath;
 
+    private DecimalFormat df2 = new DecimalFormat("0.00");
     DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -85,11 +88,11 @@
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
             if (meterRec == null) {
                 deviceDto.setWatchNum("0");
-                deviceDto.setPressure(new Random().nextInt(4));
+                deviceDto.setPressure(df2.format(RandomUtils.nextDouble(0.14, 0.3)));
                 deviceDto.setUptime(sdf4.format(new Date()));
             } else {
                 deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString());
-                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? 0 : Integer.valueOf(meterRec.get("PRESSURE").toString()));
+                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? "0.14": meterRec.get("PRESSURE").toString());
                 deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
             }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 7a159f6..84bf3c9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -310,7 +310,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
         List<Map<String,Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
         super.exportExcel(DeviceExportEnum.NOISEDATA_EXPORT, mapList, response);
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 23185e7..b8ea34c 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
@@ -990,6 +990,8 @@
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
           AND dwd.DATE = #{date}
+          ORDER BY FLOW_ACC_DATE  DESC
+          LIMIT  1
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
index 607bc85..75233ea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.config.DeviceServerProperties;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
  * @author dev123
  * @Date 2018-11-19 13:15:14
  */
+@Slf4j
 @RestController
 public class TemplateController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@@ -45,9 +47,9 @@
             throws ServletException, IOException {
         String path = gunsProperties.getConfigPath();
         logger.info(path);
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
+//        if (path.startsWith("/")) {
+//            path = path.substring(1);
+//        }
         File file = new File(path, filename);
         // 获取文件名
         String fileName = null;
@@ -67,6 +69,7 @@
             fis = new FileInputStream(file);
             byte[] buffer = new byte[1024];
             int readTmp = 0;
+            log.info("    "+file.getPath());
             while ((readTmp = fis.read(buffer)) != -1) {
                 response.getOutputStream().write(buffer, 0, readTmp);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index a6f01a9..833437c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomUtils;
 import org.hswebframework.expands.office.excel.ExcelIO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -39,6 +41,7 @@
     @Value("${smartcity.config.config-path}")
     private String templatePath;
 
+    private DecimalFormat df2 = new DecimalFormat("0.00");
     DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -85,11 +88,11 @@
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
             if (meterRec == null) {
                 deviceDto.setWatchNum("0");
-                deviceDto.setPressure(new Random().nextInt(4));
+                deviceDto.setPressure(df2.format(RandomUtils.nextDouble(0.14, 0.3)));
                 deviceDto.setUptime(sdf4.format(new Date()));
             } else {
                 deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString());
-                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? 0 : Integer.valueOf(meterRec.get("PRESSURE").toString()));
+                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? "0.14": meterRec.get("PRESSURE").toString());
                 deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
             }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 7a159f6..84bf3c9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -310,7 +310,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
         List<Map<String,Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
         super.exportExcel(DeviceExportEnum.NOISEDATA_EXPORT, mapList, response);
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 23185e7..b8ea34c 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
@@ -990,6 +990,8 @@
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
           AND dwd.DATE = #{date}
+          ORDER BY FLOW_ACC_DATE  DESC
+          LIMIT  1
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 4730a09..e939240 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -70,7 +70,7 @@
     private String statusName;
     private String longitude;
     private String latitude;
-    private int pressure;
+    private String pressure;
 
     @Override
     protected Serializable pkVal() {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
index 607bc85..75233ea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.config.DeviceServerProperties;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
  * @author dev123
  * @Date 2018-11-19 13:15:14
  */
+@Slf4j
 @RestController
 public class TemplateController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@@ -45,9 +47,9 @@
             throws ServletException, IOException {
         String path = gunsProperties.getConfigPath();
         logger.info(path);
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
+//        if (path.startsWith("/")) {
+//            path = path.substring(1);
+//        }
         File file = new File(path, filename);
         // 获取文件名
         String fileName = null;
@@ -67,6 +69,7 @@
             fis = new FileInputStream(file);
             byte[] buffer = new byte[1024];
             int readTmp = 0;
+            log.info("    "+file.getPath());
             while ((readTmp = fis.read(buffer)) != -1) {
                 response.getOutputStream().write(buffer, 0, readTmp);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index a6f01a9..833437c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomUtils;
 import org.hswebframework.expands.office.excel.ExcelIO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -39,6 +41,7 @@
     @Value("${smartcity.config.config-path}")
     private String templatePath;
 
+    private DecimalFormat df2 = new DecimalFormat("0.00");
     DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -85,11 +88,11 @@
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
             if (meterRec == null) {
                 deviceDto.setWatchNum("0");
-                deviceDto.setPressure(new Random().nextInt(4));
+                deviceDto.setPressure(df2.format(RandomUtils.nextDouble(0.14, 0.3)));
                 deviceDto.setUptime(sdf4.format(new Date()));
             } else {
                 deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString());
-                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? 0 : Integer.valueOf(meterRec.get("PRESSURE").toString()));
+                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? "0.14": meterRec.get("PRESSURE").toString());
                 deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
             }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 7a159f6..84bf3c9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -310,7 +310,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
         List<Map<String,Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
         super.exportExcel(DeviceExportEnum.NOISEDATA_EXPORT, mapList, response);
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 23185e7..b8ea34c 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
@@ -990,6 +990,8 @@
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
           AND dwd.DATE = #{date}
+          ORDER BY FLOW_ACC_DATE  DESC
+          LIMIT  1
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 4730a09..e939240 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -70,7 +70,7 @@
     private String statusName;
     private String longitude;
     private String latitude;
-    private int pressure;
+    private String pressure;
 
     @Override
     protected Serializable pkVal() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx
deleted file mode 100644
index 372e40e..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx
+++ /dev/null
Binary files differ

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
index 607bc85..75233ea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.config.DeviceServerProperties;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
  * @author dev123
  * @Date 2018-11-19 13:15:14
  */
+@Slf4j
 @RestController
 public class TemplateController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@@ -45,9 +47,9 @@
             throws ServletException, IOException {
         String path = gunsProperties.getConfigPath();
         logger.info(path);
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
+//        if (path.startsWith("/")) {
+//            path = path.substring(1);
+//        }
         File file = new File(path, filename);
         // 获取文件名
         String fileName = null;
@@ -67,6 +69,7 @@
             fis = new FileInputStream(file);
             byte[] buffer = new byte[1024];
             int readTmp = 0;
+            log.info("    "+file.getPath());
             while ((readTmp = fis.read(buffer)) != -1) {
                 response.getOutputStream().write(buffer, 0, readTmp);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index a6f01a9..833437c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomUtils;
 import org.hswebframework.expands.office.excel.ExcelIO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -39,6 +41,7 @@
     @Value("${smartcity.config.config-path}")
     private String templatePath;
 
+    private DecimalFormat df2 = new DecimalFormat("0.00");
     DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -85,11 +88,11 @@
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
             if (meterRec == null) {
                 deviceDto.setWatchNum("0");
-                deviceDto.setPressure(new Random().nextInt(4));
+                deviceDto.setPressure(df2.format(RandomUtils.nextDouble(0.14, 0.3)));
                 deviceDto.setUptime(sdf4.format(new Date()));
             } else {
                 deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString());
-                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? 0 : Integer.valueOf(meterRec.get("PRESSURE").toString()));
+                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? "0.14": meterRec.get("PRESSURE").toString());
                 deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
             }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 7a159f6..84bf3c9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -310,7 +310,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
         List<Map<String,Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
         super.exportExcel(DeviceExportEnum.NOISEDATA_EXPORT, mapList, response);
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 23185e7..b8ea34c 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
@@ -990,6 +990,8 @@
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
           AND dwd.DATE = #{date}
+          ORDER BY FLOW_ACC_DATE  DESC
+          LIMIT  1
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 4730a09..e939240 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -70,7 +70,7 @@
     private String statusName;
     private String longitude;
     private String latitude;
-    private int pressure;
+    private String pressure;
 
     @Override
     protected Serializable pkVal() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx
deleted file mode 100644
index 372e40e..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx
+++ /dev/null
Binary files differ
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
index 3c393fa..32049c2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
@@ -76,7 +76,7 @@
     private String descn;
 
     @TableId(value = "PRESSURE")
-    private Integer pressure;
+    private double pressure;
     /**
      * 状态
      */

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index d27afa9..87cbc66 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -197,11 +197,8 @@
             }
             retList = alarmJobService.jobListSearchApp(page, jobListParam, currentUser.getDeptId(), currentUser.getId(), leaderId);
         }
-
         new AlarmJobWarpper(retList).warp();
         page.setRecords(retList);
-        Map<String, Object> retMap = new HashMap<>();
-
         return ResponseData.success(super.packForBT(page));
     }
 
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 0ce8c49..73dd5e3 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
@@ -125,7 +125,6 @@
                     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/service/IAlarmRecordsService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
index 6eecb2b..811f023 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmRecordsService.java
@@ -24,6 +24,7 @@
     List<AlarmRecords> alarmListNoPage(DataScope dataScope, String keywords, String alarmType, String alarmContent,String beginTime, String endTime, String areaId);
 
     boolean cancelAlarm(long id,String jobStatus, String handleMessage, long personId);
+
     boolean cancelAlarmById(long id);
 
     Integer insertAlarmRecord(AlarmRecords alarmRec);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 5aeef97..1314078 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -255,7 +255,7 @@
         </if>
         <if test="alarmContent!='' and alarmContent!=null">
             AND
-            .ALARM_CONTENT = #{alarmContent}
+            ar.ALARM_CONTENT = #{alarmContent}
         </if>
         <choose>
             <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
@@ -268,7 +268,7 @@
         </choose>
     </select>
 
-    <select id="jobListApp" resultType="map">
+    <select id="jobListApp" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -513,7 +513,7 @@
         </where>
     </select>
 
-    <select id="jobListSearchApp" resultType="map">
+    <select id="jobListSearchApp" resultType="map" >
         SELECT<include refid="job_list_column"/>,
         (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
         FROM alarm_job aj
@@ -753,9 +753,10 @@
 
     <!-- sys_user_client APP推送用-->
     <select id="getJobCodeMaxSerial" resultType="String">
-        SELECT MAX (jobcode)
+        SELECT MAX(jobcode)
         FROM   alarm_job
         WHERE  JOBCODE like '${jobcode}%'
+        GROUP  BY  DEVCODE
     </select>
 
 </mapper>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6929f44..7d03010 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -121,9 +121,10 @@
             ar.status = 2
         </set>
         WHERE aj.ID = ar.job_id
-        AND aj.ID = #{id}
+        AND ar.ID = #{id}
     </update>
 
+
     <update id="cancelAlarmById" flushCache="true">
         UPDATE alarm_records ar
         <set>
@@ -140,13 +141,13 @@
         WHERE ar.devcode = #{devcode} and ar.alarm_type = #{alarmType}
     </update>
 
-    <update id="isOldAlarmRecord" flushCache="true">
+    <select id="isOldAlarmRecord" flushCache="true" resultType="String">
         SELECT  ID
         FROM    alarm_records
         WHERE   DEVCODE = #{devcode}
         AND     ALARM_CONTENT = #{MsgContent}
         AND     STATUS='1'
-    </update>
+    </select>
 
     <update id="updateOldAlarmRecord" flushCache="true">
         UPDATE alarm_records
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
new file mode 100644
index 0000000..c41b7a9
--- /dev/null
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmJob.java
@@ -0,0 +1,4 @@
+package com.casic.missiles.modular.system.dto;
+
+public class AlarmJob {
+}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
index 69cf1cc..ceb9574 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmJob.java
@@ -28,7 +28,7 @@
      * 主键
      */
     @TableId(value = "ID", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     /**
      * 工单编号
      */
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
index 2d4f5ed..f888740 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/model/AlarmRecords.java
@@ -11,7 +11,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -81,13 +81,12 @@
      * 工单编号
      */
     @TableField("JOB_ID")
-    private Integer jobId;
+    private Long jobId;
 
     @TableField(exist = false)
     private Integer jobStatus;
 
 
-
     public Integer getJobStatus() {
         return jobStatus;
     }
@@ -184,11 +183,11 @@
         this.status = status;
     }
 
-    public Integer getJobId() {
+    public Long getJobId() {
         return jobId;
     }
 
-    public void setJobId(Integer jobId) {
+    public void setJobId(Long jobId) {
         this.jobId = jobId;
     }
 
@@ -200,19 +199,19 @@
     @Override
     public String toString() {
         return "AlarmRecords{" +
-        "id=" + id +
-        ", deviceId=" + deviceId +
-        ", devcode=" + devcode +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmValue=" + alarmValue +
-        ", alarmLevel=" + alarmLevel +
-        ", alarmMessage=" + alarmMessage +
-        ", alarmTime=" + alarmTime +
-        ", status=" + status +
-        ", jobId=" + jobId +
-        ", jobStatus=" + jobStatus +
-        "}";
+                "id=" + id +
+                ", deviceId=" + deviceId +
+                ", devcode=" + devcode +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmValue=" + alarmValue +
+                ", alarmLevel=" + alarmLevel +
+                ", alarmMessage=" + alarmMessage +
+                ", alarmTime=" + alarmTime +
+                ", status=" + status +
+                ", jobId=" + jobId +
+                ", jobStatus=" + jobStatus +
+                "}";
     }
 }
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 d89046f..cd7890e 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
@@ -141,7 +141,6 @@
         if (ToolUtil.isNotEmpty(deviceType)) {
             query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
         }
-
         List<DeviceModels> list = deviceModelsService.selectList(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
         if (ToolUtil.isNotEmpty(list)) {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
index d73e6fa..4409712 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/GasFlowDataController.java
@@ -67,11 +67,11 @@
     @ApiOperation(value = "获取气体流量计数据列表")
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object listPage(String keywords, String areaId) {
+    public Object listPage(String keywords, String areaId, String beginTime, String endTime) {
         Page<DeviceDto> page = new PageFactory<DeviceDto>().defaultPage();
         //查询数据权限 使用默认DEPTID 字段
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", "", "", keywords, "", areaId);
+        List<DeviceDto> list = deviceService.selectDataScopePage(dataScope, page, "15", "", beginTime, endTime, keywords, "", areaId);
         String date = sdf.format(new Date());
         List<Map<String, Object>> viewList = new ArrayList<>();
         list.forEach(deviceDto -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
index 607bc85..75233ea 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.config.DeviceServerProperties;
 import com.casic.missiles.modular.system.constant.DeviceConst;
 import com.casic.missiles.modular.system.service.IDeviceService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@
  * @author dev123
  * @Date 2018-11-19 13:15:14
  */
+@Slf4j
 @RestController
 public class TemplateController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@@ -45,9 +47,9 @@
             throws ServletException, IOException {
         String path = gunsProperties.getConfigPath();
         logger.info(path);
-        if (path.startsWith("/")) {
-            path = path.substring(1);
-        }
+//        if (path.startsWith("/")) {
+//            path = path.substring(1);
+//        }
         File file = new File(path, filename);
         // 获取文件名
         String fileName = null;
@@ -67,6 +69,7 @@
             fis = new FileInputStream(file);
             byte[] buffer = new byte[1024];
             int readTmp = 0;
+            log.info("    "+file.getPath());
             while ((readTmp = fis.read(buffer)) != -1) {
                 response.getOutputStream().write(buffer, 0, readTmp);
             }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
index a6f01a9..833437c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.RandomUtils;
 import org.hswebframework.expands.office.excel.ExcelIO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -21,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -39,6 +41,7 @@
     @Value("${smartcity.config.config-path}")
     private String templatePath;
 
+    private DecimalFormat df2 = new DecimalFormat("0.00");
     DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     DateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
@@ -85,11 +88,11 @@
             Map<String, Object> meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode());
             if (meterRec == null) {
                 deviceDto.setWatchNum("0");
-                deviceDto.setPressure(new Random().nextInt(4));
+                deviceDto.setPressure(df2.format(RandomUtils.nextDouble(0.14, 0.3)));
                 deviceDto.setUptime(sdf4.format(new Date()));
             } else {
                 deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString());
-                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? 0 : Integer.valueOf(meterRec.get("PRESSURE").toString()));
+                deviceDto.setPressure(meterRec.get("PRESSURE") == null ? "0.14": meterRec.get("PRESSURE").toString());
                 deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME")));
             }
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 7a159f6..84bf3c9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -310,7 +310,6 @@
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-
         DataScope dataScope = permissionService.getCurrUserDataScope();
         List<Map<String,Object>> mapList = deviceService.selectNoiseDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
         super.exportExcel(DeviceExportEnum.NOISEDATA_EXPORT, mapList, response);
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 23185e7..b8ea34c 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
@@ -990,6 +990,8 @@
         WHERE dv.VALID = '1'
           AND dv.DEVCODE = #{devcode}
           AND dwd.DATE = #{date}
+          ORDER BY FLOW_ACC_DATE  DESC
+          LIMIT  1
     </select>
 
     <select id="selectWaterMeterMonth" resultType="map">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index 4730a09..e939240 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -70,7 +70,7 @@
     private String statusName;
     private String longitude;
     private String latitude;
-    private int pressure;
+    private String pressure;
 
     @Override
     protected Serializable pkVal() {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx
deleted file mode 100644
index 372e40e..0000000
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/wasteGas_config_template .xlsx
+++ /dev/null
Binary files differ
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
index 3c393fa..32049c2 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataWaterMeter.java
@@ -76,7 +76,7 @@
     private String descn;
 
     @TableId(value = "PRESSURE")
-    private Integer pressure;
+    private double pressure;
     /**
      * 状态
      */
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
index 381e774..91171ff 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/WaterMeterDataServiceImpl.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.modular.system.service.IWaterMeterDataService;
 import lombok.extern.java.Log;
 import lombok.extern.log4j.Log4j;
+import org.apache.commons.lang3.RandomUtils;
+import org.hswebframework.utils.RandomUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,8 +30,7 @@
     @Override
     @Transactional
     public double saveWaterMeterData(DataWaterMeter dataWaterMeter) {
-
-        dataWaterMeter.setPressure(new Random(System.currentTimeMillis()).nextInt(15));
+        dataWaterMeter.setPressure(Double.valueOf(df2.format(RandomUtils.nextDouble(0.14, 0.3))));
         // 1. 保存原始记录
         this.baseMapper.insert(dataWaterMeter);
         // 用于返回的日用水量
@@ -144,8 +145,8 @@
             waterMeterDay.put("flowAcc", df2.format(Double.parseDouble(lastDayAcc.get("flowAcc").toString()) + avgFlowAccDay * (i + 1))); // 当日水表读数
             // 当日用水量 = （当日水表读数 - 昨日水表读数） / 天数
             waterMeterDay.put("flowAccDate", df2.format(avgFlowAccDay));
-            waterMeterDay.put("date", sdfDate.format(lastDay.getTime()));
             lastDay.add(Calendar.DATE, 1);
+            waterMeterDay.put("date", sdfDate.format(lastDay.getTime()));
             this.baseMapper.insertDataWatermeterDay(waterMeterDay);
             waterMeterMonth.put("month", sdfDate.format(lastDay.getTime()).substring(0, 7));
             if (lastDay.get(Calendar.DATE) == 1) {