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 a9ced11..62fd6b5 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.dao.AlarmRecordsMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecords">
         <id column="ID" property="id"/>

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 a9ced11..62fd6b5 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.dao.AlarmRecordsMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecords">
         <id column="ID" property="id"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 818a0fc..7515612 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -83,26 +83,26 @@
     </select>
 
     <select id="getDeptNameById" resultType="String">
-        select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
+        select FULL_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getSimpleDeptNameById" resultType="String">
-        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
-         WHERE valid='1' AND ID = #{deviceTypeId} ;
+         WHERE valid='1' AND ID = #{deviceTypeId}
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
         SELECT ID as "wellId",POSITION as position,DEPTID as deptid
          ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
     </select>
 
     <select id="getAlarmContentName" resultType="String">

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 a9ced11..62fd6b5 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.dao.AlarmRecordsMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecords">
         <id column="ID" property="id"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 818a0fc..7515612 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -83,26 +83,26 @@
     </select>
 
     <select id="getDeptNameById" resultType="String">
-        select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
+        select FULL_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getSimpleDeptNameById" resultType="String">
-        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
-         WHERE valid='1' AND ID = #{deviceTypeId} ;
+         WHERE valid='1' AND ID = #{deviceTypeId}
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
         SELECT ID as "wellId",POSITION as position,DEPTID as deptid
          ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
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 e505933..d3b013a 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
@@ -316,7 +316,7 @@
         <include refid="time_diff"/>
         AS "offlineDays"
         FROM ${tableName} dt
-        JOIN BUS_DEVICE bd ON dt.devcode=bd.devcode
+        JOIN bus_device bd ON dt.devcode=bd.devcode
         where online_state='0'
         GROUP BY bd.devcode
     </select>

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 a9ced11..62fd6b5 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.dao.AlarmRecordsMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecords">
         <id column="ID" property="id"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 818a0fc..7515612 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -83,26 +83,26 @@
     </select>
 
     <select id="getDeptNameById" resultType="String">
-        select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
+        select FULL_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getSimpleDeptNameById" resultType="String">
-        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
-         WHERE valid='1' AND ID = #{deviceTypeId} ;
+         WHERE valid='1' AND ID = #{deviceTypeId}
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
         SELECT ID as "wellId",POSITION as position,DEPTID as deptid
          ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
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 e505933..d3b013a 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
@@ -316,7 +316,7 @@
         <include refid="time_diff"/>
         AS "offlineDays"
         FROM ${tableName} dt
-        JOIN BUS_DEVICE bd ON dt.devcode=bd.devcode
+        JOIN bus_device bd ON dt.devcode=bd.devcode
         where online_state='0'
         GROUP BY bd.devcode
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 8157266..00d3915 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -464,7 +464,7 @@
                 deviceType -> {
                     Integer typeId = Integer.valueOf(deviceType.toString());
                     DeviceDataTableEnum deviceDataTableEnum = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().get(typeId);
-                    if (deviceDataTableEnum == null) return;
+                    if (deviceDataTableEnum == null) {return;}
                     String tableName = deviceDataTableEnum.getTableName();
                     List<Map<String, Object>> timeList = this.baseMapper.getOfflineTimeList(tableName);
                     countRecordList.addAll(timeList);

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 a9ced11..62fd6b5 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.dao.AlarmRecordsMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecords">
         <id column="ID" property="id"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 818a0fc..7515612 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -83,26 +83,26 @@
     </select>
 
     <select id="getDeptNameById" resultType="String">
-        select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
+        select FULL_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getSimpleDeptNameById" resultType="String">
-        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
-         WHERE valid='1' AND ID = #{deviceTypeId} ;
+         WHERE valid='1' AND ID = #{deviceTypeId}
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
         SELECT ID as "wellId",POSITION as position,DEPTID as deptid
          ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
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 e505933..d3b013a 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
@@ -316,7 +316,7 @@
         <include refid="time_diff"/>
         AS "offlineDays"
         FROM ${tableName} dt
-        JOIN BUS_DEVICE bd ON dt.devcode=bd.devcode
+        JOIN bus_device bd ON dt.devcode=bd.devcode
         where online_state='0'
         GROUP BY bd.devcode
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 8157266..00d3915 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -464,7 +464,7 @@
                 deviceType -> {
                     Integer typeId = Integer.valueOf(deviceType.toString());
                     DeviceDataTableEnum deviceDataTableEnum = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().get(typeId);
-                    if (deviceDataTableEnum == null) return;
+                    if (deviceDataTableEnum == null) {return;}
                     String tableName = deviceDataTableEnum.getTableName();
                     List<Map<String, Object>> timeList = this.baseMapper.getOfflineTimeList(tableName);
                     countRecordList.addAll(timeList);
diff --git a/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java b/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
index cfa22ae..b47631d 100644
--- a/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
+++ b/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
@@ -27,7 +27,7 @@
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public void addJob(String jobName, Class cls, int amount, Map<String,Object> params) {
+    public void addJob(String jobName, Class cls, int amount, Map<String, Object> params) {
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.SECOND, amount);
         addJob(jobName, cls, calendar.getTime(), params);
@@ -39,20 +39,24 @@
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public void addJob(String jobName, Class cls, Date date, Map<String,Object> params) {
+    public void addJob(String jobName, Class cls, Date date, Map<String, Object> params) {
         try {
             Scheduler sched = gSchedulerFactory.getScheduler();
             JobDetail job;
-            if(params != null){
-                 job = JobBuilder.newJob(cls)
+            if (params != null) {
+                job = JobBuilder.newJob(cls)
                         .withIdentity(jobName, JOB_GROUP_NAME)
                         .usingJobData(new JobDataMap(params))
                         .build();
-            }else{
+            } else {
                 job = JobBuilder.newJob(cls)
                         .withIdentity(jobName, JOB_GROUP_NAME)
                         .build();
             }
+//            String tatus=getTriggerState(jobName);
+//            if (){
+//                removeJob(jobName);
+//            }
             Trigger trigger = TriggerBuilder.newTrigger().withIdentity(jobName, TRIGGER_GROUP_NAME)
                     .startAt(date)
                     .withSchedule(SimpleScheduleBuilder.simpleSchedule()).build();

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 a9ced11..62fd6b5 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.dao.AlarmRecordsMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecords">
         <id column="ID" property="id"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 818a0fc..7515612 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -83,26 +83,26 @@
     </select>
 
     <select id="getDeptNameById" resultType="String">
-        select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
+        select FULL_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getSimpleDeptNameById" resultType="String">
-        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
-         WHERE valid='1' AND ID = #{deviceTypeId} ;
+         WHERE valid='1' AND ID = #{deviceTypeId}
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
         SELECT ID as "wellId",POSITION as position,DEPTID as deptid
          ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
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 e505933..d3b013a 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
@@ -316,7 +316,7 @@
         <include refid="time_diff"/>
         AS "offlineDays"
         FROM ${tableName} dt
-        JOIN BUS_DEVICE bd ON dt.devcode=bd.devcode
+        JOIN bus_device bd ON dt.devcode=bd.devcode
         where online_state='0'
         GROUP BY bd.devcode
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 8157266..00d3915 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -464,7 +464,7 @@
                 deviceType -> {
                     Integer typeId = Integer.valueOf(deviceType.toString());
                     DeviceDataTableEnum deviceDataTableEnum = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().get(typeId);
-                    if (deviceDataTableEnum == null) return;
+                    if (deviceDataTableEnum == null) {return;}
                     String tableName = deviceDataTableEnum.getTableName();
                     List<Map<String, Object>> timeList = this.baseMapper.getOfflineTimeList(tableName);
                     countRecordList.addAll(timeList);
diff --git a/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java b/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
index cfa22ae..b47631d 100644
--- a/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
+++ b/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
@@ -27,7 +27,7 @@
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public void addJob(String jobName, Class cls, int amount, Map<String,Object> params) {
+    public void addJob(String jobName, Class cls, int amount, Map<String, Object> params) {
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.SECOND, amount);
         addJob(jobName, cls, calendar.getTime(), params);
@@ -39,20 +39,24 @@
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public void addJob(String jobName, Class cls, Date date, Map<String,Object> params) {
+    public void addJob(String jobName, Class cls, Date date, Map<String, Object> params) {
         try {
             Scheduler sched = gSchedulerFactory.getScheduler();
             JobDetail job;
-            if(params != null){
-                 job = JobBuilder.newJob(cls)
+            if (params != null) {
+                job = JobBuilder.newJob(cls)
                         .withIdentity(jobName, JOB_GROUP_NAME)
                         .usingJobData(new JobDataMap(params))
                         .build();
-            }else{
+            } else {
                 job = JobBuilder.newJob(cls)
                         .withIdentity(jobName, JOB_GROUP_NAME)
                         .build();
             }
+//            String tatus=getTriggerState(jobName);
+//            if (){
+//                removeJob(jobName);
+//            }
             Trigger trigger = TriggerBuilder.newTrigger().withIdentity(jobName, TRIGGER_GROUP_NAME)
                     .startAt(date)
                     .withSchedule(SimpleScheduleBuilder.simpleSchedule()).build();
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index ad9beb0..2956ae4 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:

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 a9ced11..62fd6b5 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
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.casic.missiles.modular.system.dao.AlarmRecordsMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.AlarmRecords">
         <id column="ID" property="id"/>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 818a0fc..7515612 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -83,26 +83,26 @@
     </select>
 
     <select id="getDeptNameById" resultType="String">
-        select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
+        select FULL_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getSimpleDeptNameById" resultType="String">
-        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
+        select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid}
     </select>
 
 
     <select id="getDeviceTypeNameById" resultType="String">
         SELECT type_name as "deviceTypeName"
          FROM base_device_type
-         WHERE valid='1' AND ID = #{deviceTypeId} ;
+         WHERE valid='1' AND ID = #{deviceTypeId}
     </select>
 
     <select id="getWellInfoViaCode" resultType="map">
         SELECT ID as "wellId",POSITION as position,DEPTID as deptid
          ,coalesce(STAFF,'') as staff ,coalesce(TEL,'') as tel
         FROM bus_well_info
-        WHERE WELL_CODE = #{wellCode};
+        WHERE WELL_CODE = #{wellCode}
     </select>
 
     <select id="getAlarmContentName" resultType="String">
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 e505933..d3b013a 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
@@ -316,7 +316,7 @@
         <include refid="time_diff"/>
         AS "offlineDays"
         FROM ${tableName} dt
-        JOIN BUS_DEVICE bd ON dt.devcode=bd.devcode
+        JOIN bus_device bd ON dt.devcode=bd.devcode
         where online_state='0'
         GROUP BY bd.devcode
     </select>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 8157266..00d3915 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -464,7 +464,7 @@
                 deviceType -> {
                     Integer typeId = Integer.valueOf(deviceType.toString());
                     DeviceDataTableEnum deviceDataTableEnum = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().get(typeId);
-                    if (deviceDataTableEnum == null) return;
+                    if (deviceDataTableEnum == null) {return;}
                     String tableName = deviceDataTableEnum.getTableName();
                     List<Map<String, Object>> timeList = this.baseMapper.getOfflineTimeList(tableName);
                     countRecordList.addAll(timeList);
diff --git a/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java b/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
index cfa22ae..b47631d 100644
--- a/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
+++ b/casic-quartz/src/main/java/com/casic/missiles/quartz/service/impl/QuartzManagerImpl.java
@@ -27,7 +27,7 @@
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public void addJob(String jobName, Class cls, int amount, Map<String,Object> params) {
+    public void addJob(String jobName, Class cls, int amount, Map<String, Object> params) {
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.SECOND, amount);
         addJob(jobName, cls, calendar.getTime(), params);
@@ -39,20 +39,24 @@
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public void addJob(String jobName, Class cls, Date date, Map<String,Object> params) {
+    public void addJob(String jobName, Class cls, Date date, Map<String, Object> params) {
         try {
             Scheduler sched = gSchedulerFactory.getScheduler();
             JobDetail job;
-            if(params != null){
-                 job = JobBuilder.newJob(cls)
+            if (params != null) {
+                job = JobBuilder.newJob(cls)
                         .withIdentity(jobName, JOB_GROUP_NAME)
                         .usingJobData(new JobDataMap(params))
                         .build();
-            }else{
+            } else {
                 job = JobBuilder.newJob(cls)
                         .withIdentity(jobName, JOB_GROUP_NAME)
                         .build();
             }
+//            String tatus=getTriggerState(jobName);
+//            if (){
+//                removeJob(jobName);
+//            }
             Trigger trigger = TriggerBuilder.newTrigger().withIdentity(jobName, TRIGGER_GROUP_NAME)
                     .startAt(date)
                     .withSchedule(SimpleScheduleBuilder.simpleSchedule()).build();
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index ad9beb0..2956ae4 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 885b793..0cf0abf 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: postgre
+    active: dev
   servlet:
     multipart:
       max-file-size: 50MB