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 idList; + private List imeiList; - public SysUserAgri(List idList) { - this.idList = idList; + public SysUserAgri(List 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 idList - = offlineList.stream().map(SysAgriInfo::getId).collect(Collectors.toList()); + List imeiList + = offlineList.stream().map(SysAgriInfo::getImei).collect(Collectors.toList()); List 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 - + user_agri.agri_id IN - - #{id} + + #{imei} and user_agri.agri_id = #{agriId}