From 04a21567aa2a11337a09a7a54bce05ebdce2e9e0 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Sat, 11 Oct 2025 09:04:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/mqtt/rule/xinghan/XinghanSendMsgRule.java | 11 +++++++---- .../equipment/domain/query/DeviceQueryCriteria.java | 1 + .../main/resources/mapper/equipment/DeviceMapper.xml | 3 +++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java index 0f44c6cf..7eeaf3d0 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java +++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java @@ -17,10 +17,7 @@ import org.springframework.stereotype.Component; import java.nio.charset.Charset; import java.time.Duration; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY; import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY; @@ -42,6 +39,12 @@ public class XinghanSendMsgRule implements MqttMessageRule { @Override public String getCommandType() { + List list = Arrays.asList(1, 2, 3, 4, 5); + + // 三种等价的写法 + Integer[] array1 = list.toArray(new Integer[0]); + Integer[] array2 = list.toArray(size -> new Integer[size]); + return XingHanCommandTypeConstants.XingHan_ESEND_MSG; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java index 9ab461dc..fa053673 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java @@ -105,6 +105,7 @@ public class DeviceQueryCriteria extends BaseEntity { /** * 设备所属分组 + * group_id */ private Long groupId; diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index 46fa3f44..24bd3575 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -140,6 +140,9 @@ and d.device_status = #{criteria.deviceStatus} + + and d.group_id = #{criteria.groupId} + and d.current_owner_id = #{criteria.currentOwnerId} From 5cdacad46860578864744867c17b6434f56ca878 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Sat, 11 Oct 2025 10:32:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=A2=91=E6=AC=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/equipment/DeviceMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index 68f7d0a1..38600bce 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -478,7 +478,7 @@ d.type_name AS deviceName, COUNT(*) AS frequency FROM device_log dl - LEFT JOIN device d ON dl.device_id = d.id + INNER JOIN device d ON dl.device_id = d.id WHERE dl.create_time >= DATE_SUB(NOW(), INTERVAL #{days} DAY) GROUP BY d.device_type, d.type_name ORDER BY frequency DESC