设备信息卡设备告警列表优化

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipInformationCardController.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveOutputParameters;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.entity.EquipQrcodeRecord;
 import com.yeejoin.equipmanage.common.enums.CheckStatusEnum;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
@@ -21,6 +22,7 @@ import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -31,6 +33,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Slf4j
 @RestController
@@ -53,20 +56,24 @@ public class EquipInformationCardController {
     @RequestMapping(value = "/equipOrPatrol",method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "运维信息-设备告警/巡检", notes = "运维信息-设备告警/巡检")
-    public ResponseModel getEquipAlarmList(String equipmentId,String type) {
-        HashMap<String, Object> map = new HashMap<>();
+    public ResponseModel getEquipAlarmList(String equipmentId,String type, @RequestParam(value = "current") int pageNum,
+                                           @RequestParam(value = "size") int pageSize) {
+        HashMap<String, Object> map = new HashMap<>(2);
+
         List<Map<String, Object>> list = new ArrayList<>();
+        Page<Map<String, Object>> page = new Page<Map<String, Object>>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
 
         List<String> idList = new ArrayList<>();
         if (type.equals("alarm")){
-            list = equipmentSpecificAlarmLogMapper.getEquipAlarmList(equipmentId);
-            idList = equipmentSpecificAlarmLogMapper.getEquipAlarmIdList(equipmentId);
+            page = equipmentSpecificAlarmLogMapper.getEquipAlarmList(page, equipmentId);
+            list = page.getRecords();
         } else if(type.equals("check")){
-            list = equipmentSpecificMapper.selectListByPatrolCheck(equipmentId);
+            page = equipmentSpecificMapper.selectListByPatrolCheck(page, equipmentId);
             list.stream().forEach(e->e.put("is_ok", CheckStatusEnum.getNameByCode(e.get("is_ok").toString())));
-            idList = equipmentSpecificMapper.selectIdsByPatrolCheck(equipmentId);
         }
-        String ids = String.join(",", idList);
+        String ids = list.stream().map(map1 -> map1.get("id").toString()).collect(Collectors.joining(","));
         JSONObject  obj= idxFeign.queryDefectByCodes(idList, ids);
         List<JSONObject> jsonObjects = JSONArray.parseArray(JSON.toJSONString(obj.get("result")), JSONObject.class);
         //缺陷对应记录 是否存在上报问题
@@ -82,7 +89,7 @@ public class EquipInformationCardController {
             });
         }
         map.put("data", list);
-        map.put("total", list.size());
+        map.put("total", page.getTotal());
         return CommonResponseUtil.success(map);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificAlarmLogMapper.java

 package com.yeejoin.equipmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.datasync.vo.AppAlarmExtVo;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
@@ -47,7 +48,7 @@ public interface EquipmentSpecificAlarmLogMapper extends BaseMapper<EquipmentSpe
 
     void updateStatusByAlarm(String confirmUserName, String resolveResult , String confirmTypeName);
 
-   List<Map<String,Object>> getEquipAlarmList(String equipmentSpecificId);
+    Page<Map<String,Object>> getEquipAlarmList(Page<Map<String,Object>> page, String equipmentSpecificId);
 
    List <String> getEquipAlarmIdList(String equipmentSpecificId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -268,7 +268,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     String updateEquipSpecificStatusByCheckInput(String id);
 
-    List<Map<String,Object>> selectListByPatrolCheck(String id);
+    Page<Map<String,Object>> selectListByPatrolCheck(Page<Map<String,Object>> page, String id);
 
     List<String> selectIdsByPatrolCheck(String id);
 

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmLogMapper.xml

@@ -289,12 +289,12 @@
 
     <select id="getEquipAlarmList" resultType="map">
         SELECT
+            id as id,
             equipment_specific_index_name AS alarmType,
             create_date AS alarmDate,
             clean_time AS cleanTime,
             concat( equipment_specific_name, equipment_specific_index_name ) AS alarmContent,
-            ( CASE clean_time is NULL  WHEN TRUE THEN '未消除' ELSE '已消除' END ) AS clearStatus,
-            id AS id
+            ( CASE clean_time is NULL  WHEN TRUE THEN '未消除' ELSE '已消除' END ) AS clearStatus
         FROM
             wl_equipment_specific_alarm_log
         WHERE