优化sql语句

nb-service/web-service/src/main/java/com/nb/web/service/bus/hospital/config/HospitalFunctionExtraConfigHandler.java

@@ -1,5 +1,6 @@
 package com.nb.web.service.bus.hospital.config;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.nb.web.api.enums.FlowStatusEnum;
 import com.nb.web.service.bus.hospital.config.bean.FunctionExtraConfig;
@@ -109,7 +110,11 @@ public class HospitalFunctionExtraConfigHandler  extends  AbstractHospitalConfig
         //仅智能泵存在
         if(DeviceTypeEnum.intelligent.equals(source.getType())){
             DeviceOperator operator = deviceRegistry.getOperator(source.getDeviceId());
-            if (source.getFlowDownLimit()!=null&&source.getContinueDose().compareTo(source.getFlowDownLimit())<1) {
+            if(source.getFlowUpLimit()!=null&&ObjectUtil.compare(source.getContinueDose(),source.getFlowUpLimit())>=0){
+                source.setWarnFlow(FlowStatusEnum.MaxFlow);
+            }
+            if (source.getFlowDownLimit()!=null
+                    &&source.getContinueDose().compareTo(source.getFlowDownLimit())<1) {
                 if(log.isDebugEnabled()) {
                     log.debug("消息【{}】,设备【{}】，持续量【{}】，下限【{}】，触发【低输注】判定", source.getMsgId(),source.getDeviceId(), source.getContinueDose(), source.getFlowDownLimit());
                 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceAlarmService.java

@@ -173,9 +173,6 @@ public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper
             alarmMap.put(deviceAlarmResult.getTenantId(),map);
         }
 
-
-
-
         // 获取告警信息
         List<DeviceWarnCountResult> warnResults = this.baseMapper.selectWarnCount(query);
         //处理告警信息
@@ -198,8 +195,7 @@ public class LocalBusDeviceAlarmService extends BaseService<BusDeviceAlarmMapper
         }
 
         // 遍历医院
-        for (BusHospitalEntity hospital:hospitalEntities
-             ) {
+        for (BusHospitalEntity hospital:hospitalEntities) {
             DeviceUse deviceUse = new DeviceUse();
             deviceUse.setTenantId(hospital.getId());
             deviceUse.setAddress(hospital.getAddress());

nb-service/web-service/src/main/resources/mapper/bus/BusDeviceAlarmMapper.xml

@@ -27,12 +27,12 @@
 
     <select id="selectWarnCount" parameterType="com.nb.web.service.bus.service.dto.DeviceAlarmQuery" resultType="com.nb.web.service.bus.service.dto.DeviceWarnCountResult">
         SELECT
-        da.tenant_id,
+        tenant_id,
         SUM(CASE warn_will_finished WHEN 1 THEN 1 ELSE 0 END) as 'warn_will_finished',
         SUM(CASE warn_low_battery WHEN 1 THEN 1 ELSE 0 END) as 'warn_low_battery',
         SUM(CASE warn_analgesic_poor WHEN 1 THEN 1 ELSE 0 END) as 'warn_analgesic_poor'
         FROM
-        (select * from bus_device_alarm
+        bus_device_alarm
         <where>
             <if test="query.uploadTimeMin!=null">
                 and upload_time &gt;= #{query.uploadTimeMin}
@@ -44,30 +44,18 @@
                 AND device_type = #{query.type}
             </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>
-        </where>
-        ) AS d ON da.device_id = d.device_id
         GROUP BY
-        da.tenant_id
+        tenant_id
     </select>
 
 
     <select id="selectAlarmCount" parameterType="com.nb.web.service.bus.service.dto.DeviceAlarmQuery" resultType="com.nb.web.service.bus.service.dto.DeviceAlarmCountResult">
         SELECT
-        da.tenant_id,
-        da.alarm_state,
+        tenant_id,
+        alarm_state,
         COUNT(1) as alarm_count
         FROM
-        (select * from bus_device_alarm
+        bus_device_alarm
         <where>
             alarm_state !=-1
             <if test="query.uploadTimeMin!=null">
@@ -80,13 +68,9 @@
                 AND device_type = #{query.type}
             </if>
         </where>
-        ) AS da
-        left JOIN (
-        select * from bus_device
-        )AS d ON da.device_id = d.device_id
         GROUP BY
-        da.tenant_id,
-        da.alarm_state
+        tenant_id,
+        alarm_state
     </select>
 
     <select id="selectDeviceCount" parameterType="com.nb.web.api.entity.BusDeviceAlarmEntity" resultType="com.nb.web.service.bus.service.dto.DeviceCountResult">