bug修复

src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/entity/bo/CountAlarmBo.java

@@ -0,0 +1,10 @@
+package com.zhgd.xmgl.modules.bridgeerectmachine.entity.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CountAlarmBo {
+    @ApiModelProperty(value = "状态：0正常1报警")
+    private java.lang.Integer alarmStatus;
+}

src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/BridgeErectMachineAlarmMapper.java

@@ -1,9 +1,12 @@
 package com.zhgd.xmgl.modules.bridgeerectmachine.mapper;
 
 import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineAlarm;
+import com.zhgd.xmgl.modules.bridgeerectmachine.entity.bo.CountAlarmBo;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.Map;
+
 /**
  * @Description: 架桥机-报警数据表
  * @author： pds
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Mapper
 public interface BridgeErectMachineAlarmMapper extends BaseMapper<BridgeErectMachineAlarm> {
 
+    CountAlarmBo countAlarm(Map<String, Object> map);
 }

src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineAlarmMapper.xml

@@ -1,4 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineAlarmMapper">
+    <select id="countAlarm" resultType="com.zhgd.xmgl.modules.bridgeerectmachine.entity.bo.CountAlarmBo">
+        select ifnull(if(add_time>=current_date,1,0),0) alarmStatus from bridge_erect_machine_alarm
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+        <if test="devSn != null and devSn != ''">
+            and dev_sn = #{devSn}
+        </if>
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataMapper.xml

@@ -23,16 +23,7 @@
     </select>
 
     <select id="selectNewestData" resultType="com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData">
-        select bemd.*,
+        select bemd.*
-        if((select count(*) from bridge_erect_machine_alarm where 1=1
-        and add_time>=current_date
-        <if test="projectSn != null and projectSn != ''">
-            and bemd.project_sn = project_sn
-        </if>
-        <if test="devSn != null and devSn != ''">
-            and bemd.dev_sn = bemd.dev_sn
-        </if>
-        )>0,1,0) alarmStatus
         from bridge_erect_machine_data bemd
         where 1 = 1
         <if test="projectSn != null and projectSn != ''">

src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineAlarmServiceImpl.java

@@ -54,7 +54,7 @@ public class BridgeErectMachineAlarmServiceImpl extends ServiceImpl<BridgeErectM
     private QueryWrapper<BridgeErectMachineAlarm> getQueryWrapper(HashMap<String, Object> paramMap) {
         String alias = "";
         QueryWrapper<BridgeErectMachineAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(BridgeErectMachineAlarm.class, paramMap, alias);
-        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(BridgeErectMachineAlarm::getId));
+        queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(BridgeErectMachineAlarm::getAddTime));
         return queryWrapper;
     }
 

src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/service/impl/BridgeErectMachineDataServiceImpl.java

@@ -5,7 +5,9 @@ import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.base.entity.vo.TrendOneVo;
 import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineData;
 import com.zhgd.xmgl.modules.bridgeerectmachine.entity.BridgeErectMachineDev;
+import com.zhgd.xmgl.modules.bridgeerectmachine.entity.bo.CountAlarmBo;
 import com.zhgd.xmgl.modules.bridgeerectmachine.entity.vo.CountTodayVo;
+import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineAlarmMapper;
 import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDataMapper;
 import com.zhgd.xmgl.modules.bridgeerectmachine.mapper.BridgeErectMachineDevMapper;
 import com.zhgd.xmgl.modules.bridgeerectmachine.service.IBridgeErectMachineDataService;
@@ -38,6 +40,8 @@ import com.zhgd.xmgl.util.RefUtil;
 public class BridgeErectMachineDataServiceImpl extends ServiceImpl<BridgeErectMachineDataMapper, BridgeErectMachineData> implements IBridgeErectMachineDataService {
     @Autowired
     private BridgeErectMachineDevMapper bridgeErectMachineDevMapper;
+    @Autowired
+    private BridgeErectMachineAlarmMapper bridgeErectMachineAlarmMapper;
 
     @Override
     public IPage<BridgeErectMachineData> queryPageList(HashMap<String, Object> paramMap) {
@@ -86,6 +90,10 @@ public class BridgeErectMachineDataServiceImpl extends ServiceImpl<BridgeErectMa
         if (data != null) {
             data.setWindSpeedLevel(AqiUtil.getWindSpeedLevel(data.getWindSpeed()));
         }
+        CountAlarmBo bo = bridgeErectMachineAlarmMapper.countAlarm(map);
+        if (data != null && bo != null) {
+            data.setAlarmStatus(bo.getAlarmStatus());
+        }
         return data;
     }
 
@@ -115,7 +123,7 @@ public class BridgeErectMachineDataServiceImpl extends ServiceImpl<BridgeErectMa
 
     private QueryWrapper<BridgeErectMachineData> getQueryWrapper(HashMap<String, Object> paramMap) {
         QueryWrapper<BridgeErectMachineData> queryWrapper = QueryGenerator.initPageQueryWrapper(BridgeErectMachineData.class, paramMap);
-        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(BridgeErectMachineData::getId));
+        queryWrapper.orderByDesc(RefUtil.fieldNameUlc(BridgeErectMachineData::getCreateDate));
         return queryWrapper;
     }