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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 7e75c9b..746eb6c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -6,7 +6,7 @@
         ID AS id, CONCENCODE AS concencode, SIMID AS simid, DEPTID AS deptid, POSITION AS position, LAT AS lat, LNG AS lng, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LAT_GAODE AS latGaode, LNG_GAODE AS lngGaode, PHOTOS AS photos, STATUS AS status, LASTTIME AS lasttime, VALID AS valid, SETUPDATE AS setupdate, TS AS ts
     </sql>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 7e75c9b..746eb6c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -6,7 +6,7 @@
         ID AS id, CONCENCODE AS concencode, SIMID AS simid, DEPTID AS deptid, POSITION AS position, LAT AS lat, LNG AS lng, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LAT_GAODE AS latGaode, LNG_GAODE AS lngGaode, PHOTOS AS photos, STATUS AS status, LASTTIME AS lasttime, VALID AS valid, SETUPDATE AS setupdate, TS AS ts
     </sql>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index a519d7a..2590fb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -32,7 +32,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 7e75c9b..746eb6c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -6,7 +6,7 @@
         ID AS id, CONCENCODE AS concencode, SIMID AS simid, DEPTID AS deptid, POSITION AS position, LAT AS lat, LNG AS lng, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LAT_GAODE AS latGaode, LNG_GAODE AS lngGaode, PHOTOS AS photos, STATUS AS status, LASTTIME AS lasttime, VALID AS valid, SETUPDATE AS setupdate, TS AS ts
     </sql>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index a519d7a..2590fb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -32,7 +32,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
index c13eab4..3e4070f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
@@ -20,7 +20,7 @@
     </resultMap>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{devcode}|| '%'
+        CONCAT('%',#{devcode},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{devcode},'%')

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 7e75c9b..746eb6c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -6,7 +6,7 @@
         ID AS id, CONCENCODE AS concencode, SIMID AS simid, DEPTID AS deptid, POSITION AS position, LAT AS lat, LNG AS lng, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LAT_GAODE AS latGaode, LNG_GAODE AS lngGaode, PHOTOS AS photos, STATUS AS status, LASTTIME AS lasttime, VALID AS valid, SETUPDATE AS setupdate, TS AS ts
     </sql>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index a519d7a..2590fb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -32,7 +32,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
index c13eab4..3e4070f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
@@ -20,7 +20,7 @@
     </resultMap>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{devcode}|| '%'
+        CONCAT('%',#{devcode},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{devcode},'%')
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 ce3338f..b2e590f 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
@@ -47,7 +47,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||#{keywords}||'%'
+          CONCAT('%',#{keywords},'%')
     </sql>
 
     <sql id="keywords_sql" databaseId="mysql">

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 7e75c9b..746eb6c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -6,7 +6,7 @@
         ID AS id, CONCENCODE AS concencode, SIMID AS simid, DEPTID AS deptid, POSITION AS position, LAT AS lat, LNG AS lng, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LAT_GAODE AS latGaode, LNG_GAODE AS lngGaode, PHOTOS AS photos, STATUS AS status, LASTTIME AS lasttime, VALID AS valid, SETUPDATE AS setupdate, TS AS ts
     </sql>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index a519d7a..2590fb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -32,7 +32,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
index c13eab4..3e4070f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
@@ -20,7 +20,7 @@
     </resultMap>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{devcode}|| '%'
+        CONCAT('%',#{devcode},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{devcode},'%')
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 ce3338f..b2e590f 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
@@ -47,7 +47,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||#{keywords}||'%'
+          CONCAT('%',#{keywords},'%')
     </sql>
 
     <sql id="keywords_sql" databaseId="mysql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index 0ed47e1..579f5c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -22,13 +22,13 @@
     </sql>
 
     <sql id="devCode_sql" databaseId="oracle">
-        #{devCode}
+             CONCAT('%',#{devCode},'%')
     </sql>
     <sql id="devCode_sql" databaseId="mysql">
-        CONCAT(#{devCode})
+                CONCAT('%',#{devCode},'%')
     </sql>
     <sql id="devCode_sql" databaseId="pgsql">
-        CONCAT(#{devCode})
+             CONCAT('%',#{devCode},'%')
     </sql>
 
     <select id="getSensorCodeByDevCode" resultType="String">

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 7e75c9b..746eb6c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -6,7 +6,7 @@
         ID AS id, CONCENCODE AS concencode, SIMID AS simid, DEPTID AS deptid, POSITION AS position, LAT AS lat, LNG AS lng, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LAT_GAODE AS latGaode, LNG_GAODE AS lngGaode, PHOTOS AS photos, STATUS AS status, LASTTIME AS lasttime, VALID AS valid, SETUPDATE AS setupdate, TS AS ts
     </sql>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index a519d7a..2590fb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -32,7 +32,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
index c13eab4..3e4070f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
@@ -20,7 +20,7 @@
     </resultMap>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{devcode}|| '%'
+        CONCAT('%',#{devcode},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{devcode},'%')
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 ce3338f..b2e590f 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
@@ -47,7 +47,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||#{keywords}||'%'
+          CONCAT('%',#{keywords},'%')
     </sql>
 
     <sql id="keywords_sql" databaseId="mysql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index 0ed47e1..579f5c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -22,13 +22,13 @@
     </sql>
 
     <sql id="devCode_sql" databaseId="oracle">
-        #{devCode}
+             CONCAT('%',#{devCode},'%')
     </sql>
     <sql id="devCode_sql" databaseId="mysql">
-        CONCAT(#{devCode})
+                CONCAT('%',#{devCode},'%')
     </sql>
     <sql id="devCode_sql" databaseId="pgsql">
-        CONCAT(#{devCode})
+             CONCAT('%',#{devCode},'%')
     </sql>
 
     <select id="getSensorCodeByDevCode" resultType="String">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index 1a5c013..7b1ef1c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -13,7 +13,7 @@
 
 
     <sql id="fuzzy_sql" databaseId="oracle">
-        '%' ||#{typeName}||'%'
+         CONCAT('%',#{typeName},'%')
     </sql>
 
     <sql id="fuzzy_sql" databaseId="mysql">

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 7e75c9b..746eb6c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -6,7 +6,7 @@
         ID AS id, CONCENCODE AS concencode, SIMID AS simid, DEPTID AS deptid, POSITION AS position, LAT AS lat, LNG AS lng, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LAT_GAODE AS latGaode, LNG_GAODE AS lngGaode, PHOTOS AS photos, STATUS AS status, LASTTIME AS lasttime, VALID AS valid, SETUPDATE AS setupdate, TS AS ts
     </sql>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index a519d7a..2590fb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -32,7 +32,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
index c13eab4..3e4070f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
@@ -20,7 +20,7 @@
     </resultMap>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{devcode}|| '%'
+        CONCAT('%',#{devcode},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{devcode},'%')
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 ce3338f..b2e590f 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
@@ -47,7 +47,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||#{keywords}||'%'
+          CONCAT('%',#{keywords},'%')
     </sql>
 
     <sql id="keywords_sql" databaseId="mysql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index 0ed47e1..579f5c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -22,13 +22,13 @@
     </sql>
 
     <sql id="devCode_sql" databaseId="oracle">
-        #{devCode}
+             CONCAT('%',#{devCode},'%')
     </sql>
     <sql id="devCode_sql" databaseId="mysql">
-        CONCAT(#{devCode})
+                CONCAT('%',#{devCode},'%')
     </sql>
     <sql id="devCode_sql" databaseId="pgsql">
-        CONCAT(#{devCode})
+             CONCAT('%',#{devCode},'%')
     </sql>
 
     <select id="getSensorCodeByDevCode" resultType="String">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index 1a5c013..7b1ef1c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -13,7 +13,7 @@
 
 
     <sql id="fuzzy_sql" databaseId="oracle">
-        '%' ||#{typeName}||'%'
+         CONCAT('%',#{typeName},'%')
     </sql>
 
     <sql id="fuzzy_sql" databaseId="mysql">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/MetaModuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/MetaModuleMapper.xml
index 68d56f5..adf9f41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/MetaModuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/MetaModuleMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.MetaModuleMapper">
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+                CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -59,7 +59,7 @@
         deptid AS "deptid",
         bwi.well_code as "wellCode",
         type_name as "deviceTypeName"
-        FROM  ${tableName} tb
+        FROM ${tableName} tb
         JOIN bus_device bd ON bd.DEVCODE=tb.DEVCODE
         JOIN bus_well_info bwi ON bwi.WELL_CODE = tb.WELL_CODE
         JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
@@ -81,10 +81,10 @@
         </if>
         <if test="keywords != null and keywords !=''">
             and (bd.devcode like
-                    <include refid="keywords_sql"/>
-                    OR bwi.well_code LIKE
-                    <include refid="keywords_sql"/>
-                )
+            <include refid="keywords_sql"/>
+            OR bwi.well_code LIKE
+            <include refid="keywords_sql"/>
+            )
         </if>
         ORDER BY tb.logtime DESC
     </select>

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 7c0a003..f64e629 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
@@ -87,7 +87,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -559,7 +559,7 @@
                 </include>
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListApp" resultType="map">
@@ -623,7 +623,7 @@
                 <!-- GROUP BY aj.id -->
             </otherwise>
         </choose>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListDelayRe" resultType="map">
@@ -804,7 +804,8 @@
             AND ar.ALARM_TYPE = '1'
             AND bwi.VALID = '1'
             <if test="jobListParam.keywords!='' and jobListParam.keywords!=null">
-                AND aj.WELL_CODE like <include refid="keywords_sql"/>
+                AND aj.WELL_CODE like
+                <include refid="keywords_sql"/>
             </if>
             <if test="jobListParam.alarmLevel!='' and jobListParam.alarmLevel!=null">
                 AND ar.ALARM_LEVEL = #{jobListParam.alarmLevel}
@@ -876,7 +877,7 @@
                 </include>
             </if>
         </where>
-        ORDER  BY    aj.JOB_STATUS,aj.CREATE_TIME  DESC
+        ORDER BY aj.JOB_STATUS,aj.CREATE_TIME DESC
     </select>
 
     <select id="jobListSearchApp" resultType="map">
@@ -1047,19 +1048,19 @@
         coalesce(aj.FLOW,'') AS "flow",
         bwi.RESPONSIBLE_DEPT AS "deptid"
         FROM
-        (   SELECT *
-            FROM alarm_job
-            WHERE 1=1
-            <if test="id !=''  and id != null ">
-                AND id=#{id}
-            </if>
-            ORDER BY create_time DESC
-            LIMIT 1
+        ( SELECT *
+        FROM alarm_job
+        WHERE 1=1
+        <if test="id !=''  and id != null ">
+            AND id=#{id}
+        </if>
+        ORDER BY create_time DESC
+        LIMIT 1
         ) aj
-        JOIN  alarm_records  ar ON aj.ID = ar.JOB_ID
+        JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         JOIN (SELECT devcode
-             from bus_device
-             where valid='1'
+        from bus_device
+        where valid='1'
         )bd on bd.devcode=aj.devcode
         JOIN bus_well_info bwi on bwi.well_code=aj.well_code
         <if test="id !=''  and id != null ">
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 2399620..4190f17 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
@@ -37,7 +37,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index bce2a38..3fb2cc5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -17,7 +17,7 @@
 
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%'||#{keywords}||'%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 2d4fdea..7bdab1d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -53,8 +53,7 @@
     </select>
 
     <select id="deviceStaticsByType" resultType="map">
-         SELECT
-						 bdt.ID  AS  "id",
+         SELECT bdt.ID  AS  "id",
              bdt.TYPE_NAME AS "deviceType",
              COALESCE(A.devicecount ,0)  AS "deviceCount"
          FROM base_device_type bdt
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 91bfcba..d96939d 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+            CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index 5b2b89e..91919f7 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -57,7 +57,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+           CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index d213f42..564d85e 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -27,7 +27,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
index 7e75c9b..746eb6c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConcentratorMapper.xml
@@ -6,7 +6,7 @@
         ID AS id, CONCENCODE AS concencode, SIMID AS simid, DEPTID AS deptid, POSITION AS position, LAT AS lat, LNG AS lng, LAT_BAIDU AS latBaidu, LNG_BAIDU AS lngBaidu, LAT_GAODE AS latGaode, LNG_GAODE AS lngGaode, PHOTOS AS photos, STATUS AS status, LASTTIME AS lasttime, VALID AS valid, SETUPDATE AS setupdate, TS AS ts
     </sql>
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
index a519d7a..2590fb2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml
@@ -32,7 +32,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+        CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
index c13eab4..3e4070f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusNbDeviceMapper.xml
@@ -20,7 +20,7 @@
     </resultMap>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{devcode}|| '%'
+        CONCAT('%',#{devcode},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{devcode},'%')
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 ce3338f..b2e590f 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
@@ -47,7 +47,7 @@
     </sql>
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' ||#{keywords}||'%'
+          CONCAT('%',#{keywords},'%')
     </sql>
 
     <sql id="keywords_sql" databaseId="mysql">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
index 0ed47e1..579f5c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceRuleMapper.xml
@@ -22,13 +22,13 @@
     </sql>
 
     <sql id="devCode_sql" databaseId="oracle">
-        #{devCode}
+             CONCAT('%',#{devCode},'%')
     </sql>
     <sql id="devCode_sql" databaseId="mysql">
-        CONCAT(#{devCode})
+                CONCAT('%',#{devCode},'%')
     </sql>
     <sql id="devCode_sql" databaseId="pgsql">
-        CONCAT(#{devCode})
+             CONCAT('%',#{devCode},'%')
     </sql>
 
     <select id="getSensorCodeByDevCode" resultType="String">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
index 1a5c013..7b1ef1c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTypeMapper.xml
@@ -13,7 +13,7 @@
 
 
     <sql id="fuzzy_sql" databaseId="oracle">
-        '%' ||#{typeName}||'%'
+         CONCAT('%',#{typeName},'%')
     </sql>
 
     <sql id="fuzzy_sql" databaseId="mysql">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/MetaModuleMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/MetaModuleMapper.xml
index 68d56f5..adf9f41 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/MetaModuleMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/MetaModuleMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.MetaModuleMapper">
 
     <sql id="keywords_sql" databaseId="oracle">
-        '%' || #{keywords}|| '%'
+                CONCAT('%',#{keywords},'%')
     </sql>
     <sql id="keywords_sql" databaseId="mysql">
         CONCAT('%',#{keywords},'%')
@@ -59,7 +59,7 @@
         deptid AS "deptid",
         bwi.well_code as "wellCode",
         type_name as "deviceTypeName"
-        FROM  ${tableName} tb
+        FROM ${tableName} tb
         JOIN bus_device bd ON bd.DEVCODE=tb.DEVCODE
         JOIN bus_well_info bwi ON bwi.WELL_CODE = tb.WELL_CODE
         JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
@@ -81,10 +81,10 @@
         </if>
         <if test="keywords != null and keywords !=''">
             and (bd.devcode like
-                    <include refid="keywords_sql"/>
-                    OR bwi.well_code LIKE
-                    <include refid="keywords_sql"/>
-                )
+            <include refid="keywords_sql"/>
+            OR bwi.well_code LIKE
+            <include refid="keywords_sql"/>
+            )
         </if>
         ORDER BY tb.logtime DESC
     </select>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index 2d90bc0..a512344 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -212,7 +212,7 @@
 
 
     <sql id="area_sql" databaseId="oracle">
-        '%'||#{area}||'%'
+         CONCAT('%',#{area},'%')
     </sql>
     <sql id="area_sql" databaseId="mysql">
         CONCAT('%',#{area},'%')