fix："优化子账号设置管理机器功能"

src/main/java/com/szwl/controller/AlarmClockIndexController.java

@@ -61,14 +61,11 @@ public class AlarmClockIndexController  {
                     }
                 }
                 jsonObject.put("data", JsonUtils.toJson(li));
-//                return JsonMessage.success(jsonObject);
                 return jsonObject.toJSONString();
             }else{
-//                return JsonMessage.error("无闹钟数据");
                 return "无闹钟数据";
             }
         }else{
-//            return JsonMessage.error("数据为空");
             return "数据为空";
         }
 

src/main/java/com/szwl/controller/TAdminController.java

@@ -192,24 +192,20 @@ public class TAdminController {
         }
 
         // 管理的机器 需要再建立一个关系表 type区分全部还是部分
-        if (StringUtils.isNotEmpty(param.getEquipmentIds())) {
-            String equipmentIds = param.getEquipmentIds();
-            if (equipmentIds.equals("all")) {
-                //管理全部机器
-                TAdminEquipment tAdminEquipment = new TAdminEquipment();
-                tAdminEquipment.setAdminId(entity.getId());
-                //0:全部机器，1：部分机器
-                tAdminEquipment.setType("0");
-                tAdminEquipmentService.save(tAdminEquipment);
-            } else {
-                //部分机器
-                TAdminEquipment tAdminEquipment = new TAdminEquipment();
-                tAdminEquipment.setAdminId(entity.getId());
-                //0:全部机器，1：部分机器
-                tAdminEquipment.setType("1");
-                tAdminEquipment.setEquipmentIds(param.getEquipmentIds());
-                tAdminEquipmentService.save(tAdminEquipment);
-            }
+        String equipmentIds = param.getEquipmentIds();
+        if (StringUtils.isNotEmpty(equipmentIds) && equipmentIds.equals("all")) {
+            //管理全部机器
+            TAdminEquipment tAdminEquipment = new TAdminEquipment();
+            tAdminEquipment.setAdminId(entity.getId());
+            tAdminEquipment.setType("0");
+            tAdminEquipmentService.save(tAdminEquipment);
+        } else {
+            //部分机器或者没有机器
+            TAdminEquipment tAdminEquipment = new TAdminEquipment();
+            tAdminEquipment.setAdminId(entity.getId());
+            tAdminEquipment.setType("1");
+            tAdminEquipment.setEquipmentIds(param.getEquipmentIds());
+            tAdminEquipmentService.save(tAdminEquipment);
         }
 
         List<String> roleList = param.getRoleList();
@@ -238,32 +234,43 @@ public class TAdminController {
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getParentId, parentId);
         query.eq(TAdmin::getId, param.getId());
-        List<TAdmin> list = tAdminService.list(query);
-        if (!list.isEmpty()) {
-            TAdmin admin = list.get(0);
+        TAdmin admin = tAdminService.getOne(query);
+        if (admin != null) {
             // 管理的机器 需要再建立一个关系表 type区分全部还是部分
             String equipmentIds = param.getEquipmentIds();
-            if (StringUtils.isNotEmpty(equipmentIds)) {
-                LambdaQueryWrapper<TAdminEquipment> query1 = Wrappers.lambdaQuery();
-                query1.eq(TAdminEquipment::getAdminId, admin.getId());
-                List<TAdminEquipment> list1 = tAdminEquipmentService.list(query1);
-                if (list1.size() > 0) {
-                    TAdminEquipment tAdminEquipment1 = list1.get(0);
-                    if (equipmentIds.equals("all")) {
-                        //管理全部机器
-                        //0:全部机器，1：部分机器
-                        tAdminEquipment1.setType("0");
-                        tAdminEquipment1.setEquipmentIds(null);
-                    } else {
-                        //部分机器
-                        //0:全部机器，1：部分机器
-                        tAdminEquipment1.setType("1");
-                        tAdminEquipment1.setEquipmentIds(param.getEquipmentIds());
-                    }
-                    tAdminEquipmentService.updateById(tAdminEquipment1);
+            LambdaQueryWrapper<TAdminEquipment> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(TAdminEquipment::getAdminId, admin.getId());
+            TAdminEquipment adminEquipment = tAdminEquipmentService.getOne(queryWrapper);
+            if (adminEquipment != null) {
+                if (StringUtils.isNotEmpty(equipmentIds) && equipmentIds.equals("all")) {
+                    //管理全部机器
+                    //0:全部机器，1：部分机器
+                    adminEquipment.setType("0");
+                    adminEquipment.setEquipmentIds(null);
+                } else {
+                    //部分机器或者没有机器
+                    //0:全部机器，1：部分机器
+                    adminEquipment.setType("1");
+                    adminEquipment.setEquipmentIds(param.getEquipmentIds());
                 }
-
+                tAdminEquipmentService.updateById(adminEquipment);
+            } else {
+                TAdminEquipment tAdminEquipment = new TAdminEquipment();
+                tAdminEquipment.setAdminId(admin.getId());
+                if (StringUtils.isNotEmpty(equipmentIds) && equipmentIds.equals("all")) {
+                    //管理全部机器
+                    //0:全部机器，1：部分机器
+                    tAdminEquipment.setType("0");
+                    tAdminEquipment.setEquipmentIds(null);
+                } else {
+                    //部分机器或者没有机器
+                    //0:全部机器，1：部分机器
+                    tAdminEquipment.setType("1");
+                    tAdminEquipment.setEquipmentIds(param.getEquipmentIds());
+                }
+                tAdminEquipmentService.save(tAdminEquipment);
             }
+
             LambdaQueryWrapper<SysUserRole> query1 = Wrappers.lambdaQuery();
             query1.eq(SysUserRole::getUserId, admin.getId());
             SysUserRole sysUserRole = sysUserRoleService.getOne(query1);
@@ -274,22 +281,6 @@ public class TAdminController {
                     sysUserRoleService.updateById(sysUserRole);
                 }
             }
-//            List<SysUserRole> list1 = sysUserRoleService.list(query1);
-//            if (!list1.isEmpty()) {
-//                for (SysUserRole sysUserRole : list1) {
-//                    sysUserRoleService.removeById(sysUserRole.getId());
-//                }
-//
-//            }
-            // 保存用户角色关系
-//            List<SysUserRole> userRoleList = param.getRoleList()
-//                    .stream()
-//                    .map(e -> new SysUserRole().setRoleId(e).setUserId(String.valueOf(admin.getId())))
-//                    .collect(Collectors.toList());
-
-//            if (CollUtil.isNotEmpty(userRoleList)) {
-//                sysUserRoleService.saveBatch(userRoleList);
-//            }
             admin.setName(param.getName());
             admin.setIsEnabled(param.getIsEnabled());
             admin.setPhone(param.getPhone());

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -439,6 +439,9 @@ public class TEquipmentController {
         if (type == 3) {
             //查找属于这个商家子账户的设备
             TAdminEquipment adminEquipment = tAdminEquipmentService.getById(admin.getId());
+            if (adminEquipment == null) {
+                return R.ok();
+            }
             if (adminEquipment.getType().equals("0")) {
                 //全部机器
                 query.eq(TEquipment::getAdminId, admin.getParentId());
@@ -939,17 +942,23 @@ public class TEquipmentController {
         if (type == 3) {
             // 查找属于这个子账户的设备
             TAdminEquipment adminEquipment = tAdminEquipmentService.getById(paramAdminId);
-            if (!adminEquipment.getType().equals("0")) {
-                //全部机器
-//            } else {
-                String adminEquipmentIds = adminEquipment.getEquipmentIds();
-                List<String> equipmentIds = Arrays.asList(adminEquipmentIds.split(","));
-                param.setEquipmentIds(equipmentIds);
+            if (adminEquipment != null) {
+                if (!adminEquipment.getType().equals("0")) {
+                    //全部机器
+                    String adminEquipmentIds = adminEquipment.getEquipmentIds();
+                    List<String> equipmentIds = Arrays.asList(adminEquipmentIds.split(","));
+                    param.setEquipmentIds(equipmentIds);
+                }
+            } else {
+                // 没有机器
+                Map<String, String> map = new HashMap<>();
+                map.put("machineTotalNum", "0");
+                map.put("machineUseNum", "0");
+                return R.ok(map);
             }
             param.setAdminId(String.valueOf(admin.getParentId()));
         }
         machineTotalNum = tEquipmentService.findMachineTotalNum(param);
-//        machineUseNum = tEquipmentService.findMachineUseNum(param);
         switch (type) {
             case 0:
             case 1: