From ad59eea2a98a2ba9532ef62a540ca14f39872b56 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Wed, 23 Jul 2025 14:27:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=BE=E5=A4=87:?= =?UTF-8?q?=E5=88=86=E9=85=8D=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/service/impl/DeviceServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index cfb4805..ba105bb 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -190,7 +190,8 @@ public class DeviceServiceImpl extends ServiceImpl impleme device.setPubTopic("A/" + device.getDeviceImei()); device.setSubTopic("B/" + device.getDeviceImei()); } - + // 0 未绑定 + device.setBindingStatus(0); deviceMapper.insert(device); // 新增设备类型记录 @@ -303,7 +304,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme throw new BadRequestException(device.getDeviceName() + ":设备已分配，请先解绑设备！！！"); } - if (device.getBindingStatus().equals(1)){ + if (device.getBindingStatus() != null && device.getBindingStatus().equals(1)) { throw new BadRequestException(device.getDeviceName() + ":设备已绑定，请先解绑设备！！！"); } @@ -312,6 +313,10 @@ public class DeviceServiceImpl extends ServiceImpl impleme invalidIds.add(deviceAssignment.getDeviceId()); } + deviceAssignmentsMapper.delete(new LambdaQueryWrapper() + .eq(DeviceAssignments::getDeviceId, deviceAssignment.getDeviceId()) + .eq(DeviceAssignments::getAssigneeId, deviceAssignment.getAssigneeId())); + } deviceAssignmentsMapper.deleteByIds(ids); From f80debbf2b80d5c3e81a63d1cd1ba205aac07c0c Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Wed, 23 Jul 2025 15:51:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java index b578144..862cfbd 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java @@ -59,6 +59,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy { if (ObjectUtil.isNull(user)) { //新增Appuser AppUser appUser = addAppUser(tenantId, phonenumber); + user = new AppUserVo(); MapstructUtils.convert(appUser, user); // user = appUserMapper.selectVoOne(new LambdaQueryWrapper().eq(AppUser::getPhonenumber, phonenumber)); // loginService.recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists", phonenumber)); @@ -70,6 +71,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy { }); loginUser.setClientKey(client.getClientKey()); loginUser.setDeviceType(client.getDeviceType()); + loginUser.setUserType(UserType.APP_USER.getUserType()); SaLoginParameter model = new SaLoginParameter(); model.setDeviceType(client.getDeviceType()); // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置 From d849be68ede3134f084bc623621bc28d50555c04 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Wed, 23 Jul 2025 19:22:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AE=BE=E5=A4=87:?= =?UTF-8?q?=E5=88=86=E9=85=8D=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index ba105bb..850c680 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -313,6 +313,7 @@ public class DeviceServiceImpl extends ServiceImpl impleme invalidIds.add(deviceAssignment.getDeviceId()); } + // 删除设备:分配记录 deviceAssignmentsMapper.delete(new LambdaQueryWrapper() .eq(DeviceAssignments::getDeviceId, deviceAssignment.getDeviceId()) .eq(DeviceAssignments::getAssigneeId, deviceAssignment.getAssigneeId()));