From 5738872b14be7cda07bf52b6d2f82f62772ba10b Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Tue, 13 Aug 2024 16:11:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=88=86=E9=A1=B5=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=A4=B1=E6=95=88=E4=BF=AE=E5=A4=8D=202024=E5=B9=B48?=
 =?UTF-8?q?=E6=9C=8813=E6=97=A516:11:49?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarm/service/impl/AlarmRuleLogServiceImpl.java   |  4 +++-
 .../alarm/service/impl/AlarmRuleServiceImpl.java      | 11 +++++++++--
 .../main/resources/mapper/AlarmRuleEntityMapper.xml   |  6 ++++++
 .../src/main/resources/mapper/AlarmRuleLogMapper.xml  |  6 +++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmRuleLogServiceImpl.java b/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmRuleLogServiceImpl.java
index 8563508..f6cea1e 100644
--- a/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmRuleLogServiceImpl.java
+++ b/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmRuleLogServiceImpl.java
@@ -17,6 +17,7 @@ import com.thing.alarm.configuration.event.LogSaveActionEvent;
 import com.thing.common.core.enumeration.AlarmStatus;
 import com.thing.common.core.exception.SysException;
 import com.thing.common.core.utils.DateTimeUtils;
+import com.thing.common.core.utils.PageUtils;
 import com.thing.common.core.web.response.PageData;
 import com.thing.common.orm.annotation.DataFilter;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
@@ -79,7 +80,8 @@ public class AlarmRuleLogServiceImpl extends BaseServiceImpl<AlarmRuleLogMapper,
         }
         List<AlarmRuleLogDTO> list = mapper.getList(params);
         fillExtraInfo(list);
-        return new PageData<>(list, count);
+        List<AlarmRuleLogDTO> alarmRuleLogDTOS = PageUtils.startPage(list, page, limit);
+        return new PageData<>(alarmRuleLogDTOS, count);
     }
 
     private List<String> getThingCodesByPlantIds(Map<String, Object> params) {
diff --git a/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmRuleServiceImpl.java b/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmRuleServiceImpl.java
index e808447..48f528f 100644
--- a/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmRuleServiceImpl.java
+++ b/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmRuleServiceImpl.java
@@ -98,10 +98,17 @@ public class AlarmRuleServiceImpl extends BaseServiceImpl<AlarmRuleMapper, Alarm
 
     private void getIdByThingName(Map<String, Object> params) {
         String thingName = (String) params.get("thingName");
-        if (StringUtils.isBlank(thingName)) {
+        String thingId = (String) params.get("thingId");
+        if (StringUtils.isBlank(thingName) && StringUtils.isBlank(thingId)) {
             return;
         }
-        paramsToLike(params, "thingName");
+        if (StringUtils.isNotBlank(thingName)) {
+            paramsToLike(params, "thingName");
+        }
+        if (StringUtils.isNotBlank(thingId)) {
+            List<Long> thingList = Arrays.stream(thingId.split(",")).map(Long::parseLong).toList();
+            params.put("thingIds", thingList);
+        }
         List<AlarmRuleEntityDTO> list = alarmRuleEntityService.getThingNameList(params);
         List<Long> collect = list.stream().map(AlarmRuleEntityDTO::getRuleId).distinct().collect(Collectors.toList());
         params.put("ids", CollectionUtil.isNotEmpty(collect) ? collect : CollectionUtil.newArrayList(-1L));
diff --git a/modules/alarm/src/main/resources/mapper/AlarmRuleEntityMapper.xml b/modules/alarm/src/main/resources/mapper/AlarmRuleEntityMapper.xml
index d8bd1c7..6295394 100644
--- a/modules/alarm/src/main/resources/mapper/AlarmRuleEntityMapper.xml
+++ b/modules/alarm/src/main/resources/mapper/AlarmRuleEntityMapper.xml
@@ -31,6 +31,12 @@
                     #{id}
                 </foreach>
             </if>
+            <if test="thingIds != null">
+                and a.thing_id in
+                <foreach item="thingId" collection="thingIds" open="(" separator="," close=")">
+                    #{thingId}
+                </foreach>
+            </if>
         </where>
     </select>
 
diff --git a/modules/alarm/src/main/resources/mapper/AlarmRuleLogMapper.xml b/modules/alarm/src/main/resources/mapper/AlarmRuleLogMapper.xml
index 5acd7ba..5082a99 100644
--- a/modules/alarm/src/main/resources/mapper/AlarmRuleLogMapper.xml
+++ b/modules/alarm/src/main/resources/mapper/AlarmRuleLogMapper.xml
@@ -79,9 +79,9 @@
             LEFT JOIN iot_thing_entity te ON ae.thing_id = te.id
         </if>
         <include refid="pageCondition" />
-        <if test="params.limit!=null and params.offset">
-            limit #{params.limit} offset #{params.offset}
-        </if>
+<!--        <if test="params.limit!=null and params.offset">-->
+<!--            limit #{params.limit} offset #{params.offset}-->
+<!--        </if>-->
     </select>
 
     <select id="getProcessingUserList" resultType="com.thing.alarm.alarm.dto.AlarmProcessingUserDTO">