报警导出修改

sms_water/src/main/java/com/huaxu/controller/AlarmDetailsController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -192,13 +193,13 @@ public class AlarmDetailsController {
             @ApiParam(value = "报警类型") @RequestParam(required = false) String alarmType,
             @ApiParam(value = "处理状态") @RequestParam(required = false) Integer opState,
             @ApiParam(value = "所属场景id") @RequestParam(required = false)  Integer sceneId,
-            @ApiParam(value = "所属场景id") @RequestParam(required = false)  List<Integer> ids,
+            @ApiParam(value = "报警信息id") @RequestParam(required = false)  Integer[] ids,
             @ApiParam(value = "查询：开始时间yyyy-MM-dd") @RequestParam(required = false) String startTime,
             @ApiParam(value = "查询：结束时间yyyy-MM-dd") @RequestParam(required = false) String endTime
 
     ){
-        if(ids != null && ids.size()>0){
-            String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "历史报警记录",alarmDetailsService.selectByIds(ids) );
+        if(ids != null && ids.length>0){
+            String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsHistoryDto.class, "历史报警记录",alarmDetailsService.selectHistoryByIds(Arrays.asList(ids)) );
             return new AjaxMessage<>(ResultStatus.OK, filePath);
         }
         AlarmDetailsDto alarmDetailsDto = new AlarmDetailsDto();
@@ -288,13 +289,13 @@ public class AlarmDetailsController {
             @ApiParam(value = "报警类型") @RequestParam(required = false) String alarmType,
             @ApiParam(value = "处理状态") @RequestParam(required = false) Integer opState,
             @ApiParam(value = "所属场景id") @RequestParam(required = false)  Integer sceneId,
-            @ApiParam(value = "所属场景id") @RequestParam(required = false)  List<Integer> ids,
+            @ApiParam(value = "报警信息id") @RequestParam(required = false)  Integer[] ids,
             @ApiParam(value = "查询：开始时间yyyy-MM-dd") @RequestParam(required = false) String startTime,
             @ApiParam(value = "查询：结束时间yyyy-MM-dd") @RequestParam(required = false) String endTime
     ){
 
-        if(ids != null && ids.size()>0){
-            String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "实时报警记录",alarmDetailsService.selectByIds(ids) );
+        if(ids != null && ids.length >0){
+            String filePath = EasyExcelUtil.excelWrite(baseDir, AlarmDetailsRealTimeDto.class, "实时报警记录",alarmDetailsService.selectRealTimeByIds(Arrays.asList(ids)));
             return new AjaxMessage<>(ResultStatus.OK, filePath);
         }
         AlarmDetailsDto alarmDetailsDto = new AlarmDetailsDto();

sms_water/src/main/java/com/huaxu/dao/AlarmDetailMapper.java

@@ -29,7 +29,8 @@ public interface AlarmDetailMapper {
      * 查询设备报警
      * @return
      */
-    List<AlarmDetailsDto> selectByIds( @Param("ids") List<Integer> ids);
+    List<AlarmDetailsRealTimeDto> selectRealTimeByIds( @Param("ids") List<Integer> ids);
+    List<AlarmDetailsHistoryDto> selectHistoryByIds( @Param("ids") List<Integer> ids);
     /**
      * 添加设备报警
      * @return

sms_water/src/main/java/com/huaxu/service/AlarmDetailsService.java

@@ -24,7 +24,9 @@ public interface AlarmDetailsService {
      * 查询设备
      * @return
      */
-    List<AlarmDetailsDto> selectByIds(List<Integer> ids);
+    List<AlarmDetailsRealTimeDto> selectRealTimeByIds(List<Integer> ids);
+
+    List<AlarmDetailsHistoryDto> selectHistoryByIds(List<Integer> ids);
     /**
      * 添加设备
      * @return

sms_water/src/main/java/com/huaxu/service/impl/AlarmDetailsServiceImpl.java

@@ -35,10 +35,13 @@ public class AlarmDetailsServiceImpl implements AlarmDetailsService {
     }
 
     @Override
-    public List<AlarmDetailsDto> selectByIds(List<Integer> ids) {
-        return alarmDetailMapper.selectByIds(ids);
+    public List<AlarmDetailsRealTimeDto> selectRealTimeByIds(List<Integer> ids) {
+        return alarmDetailMapper.selectRealTimeByIds(ids);
+    }
+    @Override
+    public List<AlarmDetailsHistoryDto> selectHistoryByIds(List<Integer> ids) {
+        return alarmDetailMapper.selectHistoryByIds(ids);
     }
-
     @Override
     public Integer insert(AlarmDetailsEntity alarmDetailsEntity) {
         return alarmDetailMapper.insert(alarmDetailsEntity);

sms_water/src/main/resources/mapper/AlarmDetailMapper.xml

@@ -98,9 +98,9 @@
             and a.id=#{id}
     </select>
 
-    <select id="selectByIds" resultType="com.huaxu.dto.AlarmDetailsDto">
+    <select id="selectRealTimeByIds" resultType="com.huaxu.dto.AlarmDetailsRealTimeDto">
         select
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List_real_time"/>
         from sms_alarm_details a
         <include refid="alarmDetailJoins"/>
         where a.`STATUS` = 1
@@ -110,6 +110,17 @@
             </foreach>
     </select>
 
+    <select id="selectHistoryByIds" resultType="com.huaxu.dto.AlarmDetailsHistoryDto">
+        select
+        <include refid="Base_Column_List_history"/>
+        from sms_alarm_details a
+        <include refid="alarmDetailJoins"/>
+        where a.`STATUS` = 1
+        and a.id in
+        <foreach collection="ids" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
     <!--通过实体作为筛选条件查询-->
     <select id="selectList" resultType="com.huaxu.dto.AlarmDetailsDto">
         select