add 病号格式化

nb-admin/src/main/resources/logback.xml

@@ -47,7 +47,7 @@
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
-            <level>DEBUG</level>
+            <level>INFO</level>
             <!-- 匹配时的操作：接收（记录） -->
             <onMatch>ACCEPT</onMatch>
             <!-- 不匹配时的操作：拒绝（不记录） -->

nb-system/src/main/resources/mapper/bus/BusDeviceAlarmMapper.xml

@@ -46,16 +46,16 @@
         select * from bus_device
         <where>
             <if test="query.uploadTimeMin != null">
-                and da.update_time >= #{query.uploadTimeMin}
+                and update_time >= #{query.uploadTimeMin}
             </if>
             <if test="query.uploadTimeMax != null">
-                AND da.update_time &lt;= #{query.uploadTimeMax}
+                AND update_time &lt;= #{query.uploadTimeMax}
             </if>
             <if test="query.type != null">
-                AND d.type = #{query.type}
+                AND type = #{query.type}
             </if>
         </where>
-        ) AS d ON da.device_id = d.id
+        ) AS d ON da.device_id = d.device_id
         GROUP BY
             da.tenant_id
     </select>
@@ -67,19 +67,31 @@
         da.alarm_state,
         COUNT(1) as alarm_count
         FROM
-        bus_device_alarm AS da
-        left JOIN bus_device AS d ON da.device_id = d.id
-        WHERE
-        da.alarm_state !=-1
-        <if test="query.uploadTimeMin != null">
-        and da.update_time >= #{query.uploadTimeMin}
-        </if>
-        <if test="query.uploadTimeMax != null">
-        AND da.update_time &lt;= #{query.uploadTimeMax}
-        </if>
-        <if test="query.type != null">
-        AND d.type = #{query.type}
-        </if>
+        (select * from bus_device_alarm
+        <where>
+            alarm_state !=-1
+            <if test="query.uploadTimeMin!=null">
+                and upload_time &gt;= #{query.uploadTimeMin}
+            </if>
+            <if test="query.uploadTimeMax!=null">
+                and upload_time &lt;= #{query.uploadTimeMax}
+            </if>
+        </where>
+        ) AS da
+        left JOIN (
+        select * from bus_device
+        <where>
+            <if test="query.uploadTimeMin != null">
+                and update_time >= #{query.uploadTimeMin}
+            </if>
+            <if test="query.uploadTimeMax != null">
+                AND update_time &lt;= #{query.uploadTimeMax}
+            </if>
+            <if test="query.type != null">
+                AND type = #{query.type}
+            </if>
+        </where>
+        )AS d ON da.device_id = d.device_id
         GROUP BY
         da.tenant_id,
         da.alarm_state