From 2da9a54c309179ba6dc3f9cf5683c8f25305d31c Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Wed, 1 Apr 2026 21:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/agri/system/domain/SysUserAgri.java   | 6 +++---
 .../java/com/agri/system/service/impl/AgriServiceImpl.java  | 6 +++---
 .../src/main/resources/mapper/system/SysUserAgriMapper.xml  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/agri-system/src/main/java/com/agri/system/domain/SysUserAgri.java b/agri-system/src/main/java/com/agri/system/domain/SysUserAgri.java
index 335a3d7..a770ced 100644
--- a/agri-system/src/main/java/com/agri/system/domain/SysUserAgri.java
+++ b/agri-system/src/main/java/com/agri/system/domain/SysUserAgri.java
@@ -89,10 +89,10 @@ public class SysUserAgri extends BaseEntity
     private Boolean disabled;
 
     @TableField(exist = false)
-    private List<Long> idList;
+    private List<String> imeiList;
 
-    public SysUserAgri(List<Long> idList) {
-        this.idList = idList;
+    public SysUserAgri(List<String> imeiList) {
+        this.imeiList = imeiList;
     }
 
     public SysUserAgri() {
diff --git a/agri-system/src/main/java/com/agri/system/service/impl/AgriServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/AgriServiceImpl.java
index e59dfcb..91b381e 100644
--- a/agri-system/src/main/java/com/agri/system/service/impl/AgriServiceImpl.java
+++ b/agri-system/src/main/java/com/agri/system/service/impl/AgriServiceImpl.java
@@ -35,11 +35,11 @@ public class AgriServiceImpl implements AgriService {
         if (CollectionUtils.isEmpty(offlineList)) {
             return Collections.emptyList();
         }
-        List<Long> idList
-                = offlineList.stream().map(SysAgriInfo::getId).collect(Collectors.toList());
+        List<String> imeiList
+                = offlineList.stream().map(SysAgriInfo::getImei).collect(Collectors.toList());
 
         List<SysUserAgri> agriUser
-                = userAgriService.findAgriUser(new SysUserAgri(idList));
+                = userAgriService.findAgriUser(new SysUserAgri(imeiList));
         if (CollectionUtils.isEmpty(agriUser)) {
             log.info("大棚未关联用户，暂停推送消息");
             return Collections.emptyList();
diff --git a/agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml b/agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml
index 8caaef5..b5c3e08 100644
--- a/agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml
+++ b/agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml
@@ -180,10 +180,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sys_user_agri user_agri
         LEFT JOIN sys_user `u` ON user_agri.user_id = `u`.user_id and `u`.del_flag=0
         <where>
-            <if test="idList != null and idList.size() > 0">
+            <if test="imeiList != null and imeiList.size() > 0">
                 user_agri.agri_id IN
-                <foreach collection="idList" item="id" open="(" separator="," close=")">
-                    #{id}
+                <foreach collection="imeiList" item="imei" open="(" separator="," close=")">
+                    #{imei}
                 </foreach>
             </if>
             <if test="agriId != null "> and user_agri.agri_id = #{agriId}</if>