From 1199031849b7301d2b67cd763b6e3d1d91595ea5 Mon Sep 17 00:00:00 2001
From: wangmengzhao <1036088376@qq.com>
Date: 星期四, 07 十二月 2023 22:07:20 +0800
Subject: [PATCH] 小程序端用户登录创建维修单修改代码优化，在DeviceController新加接口shortListRepair对不同的用户登录后看到自己的设备20231207wmz
---
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
index 0cbdb97..9476b5a 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
@@ -26,6 +27,7 @@
import com.ruoyi.iot.service.IDeviceService;
import com.ruoyi.iot.service.IProductService;
import com.ruoyi.iot.service.IToolService;
+import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.service.ISysUserService;
import org.quartz.SchedulerException;
import org.slf4j.Logger;
@@ -37,6 +39,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Comparator;
@@ -85,6 +88,9 @@
@Autowired
@Lazy
private EmqxService emqxService;
+
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
/**
* 鏌ヨ璁惧
@@ -389,17 +395,39 @@
* @return 璁惧
*/
@Override
- public List<DeviceShortOutput> selectDeviceShortList(Device device) {
+ public List<DeviceShortOutput> selectDeviceShortList(Device device, boolean repairFlag) {
SysUser user = getLoginUser().getUser();
List<SysRole> roles = user.getRoles();
for (int i = 0; i < roles.size(); i++) {
if (roles.get(i).getRoleKey().equals("tenant")) {
// 绉熸埛鏌ョ湅浜у搧涓嬫墍鏈夎澶�
device.setTenantId(user.getUserId());
+ if (repairFlag == true) {
+ device.setInstallFlag(1);
+ }
break;
} else if (roles.get(i).getRoleKey().equals("general")) {
// 鐢ㄦ埛鏌ョ湅鑷繁璁惧
device.setUserId(user.getUserId());
+ if (repairFlag == true) {
+ device.setInstallFlag(1);
+ }
+ break;
+ } else if (roles.get(i).getRoleKey().equals("tenanthelper")) {
+ //鑱旇惀鍟嗗悎浼欎汉鏌ョ湅璁惧
+ //鑱旇惀鍟嗗悎浼欎汉闇�瑕佹牴鎹粬鑷繁鐨剈serid鍘绘煡璇粬涓婄骇鐨勭敤鎴蜂俊鎭紝tenantid鏄鎴穒d鍜屼粬鐨勪竴绾ц仈钀ュ晢鎵�鎷ユ湁鐨勮澶�
+ //鏍规嵁褰撳墠鐧诲綍鐨勮仈钀ュ晢鍚堜紮浜哄幓鏌ヨ浠栫殑涓婄骇閮ㄩ棬id鏄嚑锛屽啀閫氳繃浠栫殑涓婄骇閮ㄩ棬id鍘绘煡璇㈡墍瀵瑰簲鐨勪竴绾ц仈钀ュ晢鍜屾墍瀵瑰簲鐨則enantid
+ //閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
+ SysUser sysUser = userService.selectUserById(user.getUserId());//鎷垮埌鎵�鍦ㄧ殑閮ㄩ棬id
+ SysDept sysDept = sysDeptMapper.selectDeptById(sysUser.getDeptId()); //鏍规嵁閮ㄩ棬id鍘绘煡璇俊鎭緱鍒扮埗绾х殑閮ㄩ棬id
+ SysDept sysDeptParent = sysDeptMapper.selectDeptById(sysDept.getParentId()); //鏍规嵁鐖剁骇閮ㄩ棬鐨刬d鍘绘煡璇俊鎭�
+// SysUser sysUserA = new SysUser(); //鍒涘缓鐢ㄦ埛瀵硅薄
+// sysUserA.setDeptId(sysDeptParent.getDeptId());
+ SysUser sysUserDept = userService.selectUserByDeptId(sysDeptParent.getDeptId());//鏍规嵁寰楀埌鐨勭埗绾х殑閮ㄩ棬id鍘籹ys_user琛ㄩ噷闈㈡煡璇粬鐨勭敤鎴蜂俊鎭�
+ device.setTenantId(sysUserDept.getUserId());
+ if (repairFlag == true) {
+ device.setInstallFlag(1);
+ }
break;
}
}
--
Gitblit v1.8.0