解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/EquipAlarmEventDto.java

@@ -5,6 +5,8 @@ import lombok.experimental.Accessors;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+
 @Data
 @Accessors(chain = true)
 public class EquipAlarmEventDto {
@@ -14,5 +16,12 @@ public class EquipAlarmEventDto {
     private String alarmDesc;
     private String equipName;
     private long sort;
+    /**
+     * 分类   逆变器、箱变、汇流箱
+     */
+    @TableField("frontModule")
+    private String frontModule;
+    @TableField("value")
+    private String value;
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/EquipAlarmEventMapper.java

 package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 
+import java.util.Date;
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.EquipAlarmEventDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.EquipAlarmEvent;
 
-import java.util.List;
-
 public interface EquipAlarmEventMapper extends BaseMapper<EquipAlarmEvent> {
 
-    String getLastDataBySort(String gatewayId);
+	String getLastDataBySort(String gatewayId);
+
+	List<EquipAlarmEvent> getOldDataBySort(String sort, String gatewayId);
 
-    List<EquipAlarmEvent> getOldDataBySort(String sort,String gatewayId);
+	List<EquipAlarmEventDto> getAlarmEventList(String gatewayId, String equipIndex, String frontModule, long current,
+			long size,Date time);
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java

@@ -18,6 +18,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.List;
 
 @Service
@@ -29,7 +30,7 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
     StationBasicMapper stationBasicMapper;
 
     public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex, String frontModule) {
-        List<EquipAlarmEvent> equipAlarmEvents = new ArrayList<>();
+        List<EquipAlarmEventDto> equipAlarmEvents = new ArrayList<>();
         LambdaQueryWrapper<EquipAlarmEvent> queryWrapper = new LambdaQueryWrapper<>();
         if(equipIndex!=null) 
         {
@@ -40,11 +41,15 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
         {
             queryWrapper.eq(EquipAlarmEvent::getFrontModule, frontModule);
         }
-        queryWrapper.orderByDesc(EquipAlarmEvent::getCreatedTime);
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DAY_OF_MONTH, -7);
+        queryWrapper.gt(EquipAlarmEvent::getCreatedTime, calendar.getTime());
+        int count = equipAlarmEventMapper.selectCount(queryWrapper);
+        
         IPage<EquipAlarmEvent> p = new Page<>(current, size);
-        IPage<EquipAlarmEvent>  page = equipAlarmEventMapper.selectPage(p, queryWrapper);
-     //   equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
-        equipAlarmEvents=page.getRecords();
+        equipAlarmEvents=  equipAlarmEventMapper.getAlarmEventList(gatewayId, equipIndex, frontModule, (p.getCurrent()-1)*p.getSize(), p.getSize(),calendar.getTime());
+        //  equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
+        //  equipAlarmEvents=page.getRecords();
         equipAlarmEvents.forEach(i->{
         	if("true".equals(i)) 
         	{
@@ -54,7 +59,7 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
         		i.setValue("分");
         	}
         });
-        DataGridMock DataGridMock = new DataGridMock(current, equipAlarmEvents.size(), false, current, equipAlarmEvents.subList((current - 1) * size, current * size));
+        DataGridMock DataGridMock = new DataGridMock(current, count, false, current, equipAlarmEvents);
         ColModel colModelEventMovement = new ColModel("equipName", "equipName", "设备名", "设备名", "dataGrid", "equipName");
         ColModel colModelStationName = new ColModel("alarmDesc", "alarmDesc", "事件描述", "事件描述", "dataGrid", "alarmDesc");
         ColModel colModelEventDesc = new ColModel("createdTime", "createdTime", "告警时间", "告警时间", "dataGrid", "createdTime");

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/AlarmEventMapper.xml

@@ -21,6 +21,7 @@
             <if test="stationId != null and stationId != ''">
                 station_id = #{stationId}
             </if>
+            AND DATE_SUB(CURDATE(), INTERVAL 6 DAY) &lt;= event_time
         </where>
         order by event_time desc
     </select>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/EquipAlarmEventMapper.xml

@@ -2,6 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.EquipAlarmEventMapper">
 
+
+     <select id="getAlarmEventList" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.EquipAlarmEventDto">
+        SELECT
+	     * 
+        FROM
+	    equip_alarm_event a
+	    JOIN ( SELECT sequence_nbr FROM equip_alarm_event 
+	    <where>
+	        <if test="gatewayId != null and gatewayId != ''">
+	           AND gateway_id = #{gatewayId}
+	        </if>
+            <if test="equipIndex!= null and equipIndex != ''">
+               AND equip_index = #{equipIndex}
+            </if>
+            <if test="frontModule!= null and frontModule != ''">
+               AND front_module = #{frontModule}
+            </if>
+            AND #{time} &lt;= created_time
+        </where>
+	    ORDER BY created_time DESC LIMIT #{current}, #{size} ) b ON a.sequence_nbr = b.sequence_nbr
+    </select>
+
+
+
     <select id="getLastDataBySort" resultType="java.lang.String">
         select
         sort