fix:修复bug

84edb026 · 卓清洪 · c74dd9b0 · 84edb026 · 84edb026 · 84edb026
Commit 84edb026 authored Nov 30, 2023 by 卓清洪
Showing with 69 additions and 17 deletions
server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
--- a/server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java
 package com.makeit.service.platform.auth.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -219,23 +221,33 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
    }
+    /**
+     * 平台用户唯一校验
+     * @param dto
+     */
    private void checkPerson(PlatPersonDTOVO dto) {
+        // 账户全局唯一
+        List<PlatUser> countList = list(Wrappers.<PlatUser>lambdaQuery().eq(PlatUser::getAccount, dto.getAccount())
+                .ne(StrUtil.isNotBlank(dto.getId()), PlatUser::getId, dto.getId()));
        List<PlatUser> userList = list(
                new QueryWrapper<PlatUser>().lambda()
                        .eq(PlatUser::getIsTenant, IsTenantAccountEnum.NO.getValue())
-                        .and(qw -> qw.eq(PlatUser::getAccount, dto.getAccount())
+                        .and(qw ->
-                                .or()
+                                qw.eq(PlatUser::getMobile, dto.getMobile())
-                                .eq(PlatUser::getMobile, dto.getMobile())
                                .or()
                                .eq(StringUtils.isNotBlank(dto.getEmail()),PlatUser::getEmail,dto.getEmail())
                        )
        );
-        userList.forEach(e -> {
+        if (CollUtil.isNotEmpty(countList)) {
-            if (e.getAccount().equals(dto.getAccount()) && !e.getId().equals(dto.getId())) {
            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_ACCOUNT_DUPLICATE);
        }
+        userList.forEach(e -> {
+            //if (e.getAccount().equals(dto.getAccount()) && !e.getId().equals(dto.getId())) {
+            //    throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_ACCOUNT_DUPLICATE);
+            //}
            if (e.getMobile().equals(dto.getMobile()) && !e.getId().equals(dto.getId())) {
                throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_USER_MOBILE_DUPLICATE);
            }

--- a/server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java
 package com.makeit.service.platform.device.impl;
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -130,6 +131,11 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
    @Autowired
    private AliyunOSSRepository aliyunOSSRepository;
+    /**
+     * 平台设备列表
+     * @param pageReqDTO
+     * @return
+     */
    @Override
    public PageVO<PlatDeviceListVO> page(PageReqDTO<PlatDeviceQueryDTO> pageReqDTO) {
        PlatDeviceQueryDTO dto = pageReqDTO.getData();
@@ -367,18 +373,30 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
    }
+    /**
+     * saas设备列表
+     * @param pageReqDTO
+     * @return
+     */
    @Override
    public PageVO<PlatDeviceListVO> pageSaas(PageReqDTO<PlatDevice> pageReqDTO) {
-        PlatDevice param = pageReqDTO.getData();
+        //PlatDevice param = pageReqDTO.getData();
        Page<PlatDevice> page = PageUtil.toMpPage(pageReqDTO);
-        LambdaQueryWrapper<PlatDevice> lambdaQueryWrapper = getLambdaQueryWrapper(param);
+        //LambdaQueryWrapper<PlatDevice> lambdaQueryWrapper = getLambdaQueryWrapper(param);
-        Page<PlatDevice> devicePage = page(page, lambdaQueryWrapper);
+        //Page<PlatDevice> devicePage = page(page, lambdaQueryWrapper);
-        List<PlatDevice> records = devicePage.getRecords();
+        //List<PlatDevice> records = devicePage.getRecords();
-        List<PlatDeviceListVO> platDeviceListVOS = BeanDtoVoUtils.listVo(records, PlatDeviceListVO.class);
+        PlatDeviceQueryDTO platDeviceQueryDTO = BeanUtil.copyProperties(pageReqDTO.getData(), PlatDeviceQueryDTO.class);
+        PageReqDTO<PlatDeviceQueryDTO> request = new PageReqDTO<>();
+        request.setData(platDeviceQueryDTO);
+        PageVO<PlatDeviceListVO> pageVO = page(request);
+        List<PlatDeviceListVO> platDeviceListVOS = BeanDtoVoUtils.listVo(pageVO.getList(), PlatDeviceListVO.class);
        JoinUtil.join(platDeviceListVOS, platTenantService, BaseTenantDTO::getTenantId, BaseEntity::getId, (d, o) -> {
            d.setTenantName(o.getName());
        });
-        return PageUtil.toPageVO(platDeviceListVOS, devicePage);
+        return PageUtil.toPageVO(platDeviceListVOS, page);
    }
    @Override

--- a/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
@@ -53,7 +53,6 @@ import com.makeit.utils.sql.join.JoinUtil;
 import com.makeit.utils.sys.FileUtil;
 import com.makeit.utils.user.plat.PlatUserUtil;
 import com.makeit.utils.user.plat.PlatUserVO;
-import com.makeit.utils.user.wechat.WechatUserUtil;
 import com.makeit.vo.platform.elder.PlatElderExportVO;
 import com.makeit.vo.platform.elder.PlatElderListVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
@@ -468,10 +467,10 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                List<String> excelField = Arrays.asList(
-                        "小区",
+                        "一级空间",
-                        "楼栋",
+                        "二级空间",
-                        "单元",
+                        "三级空间",
-                        "楼层"
+                        "四级空间"
                );
                List<String> spaceName = Arrays.asList(
@@ -556,7 +555,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                );
                if (c == 0 && StreamUtil.anyMatch(roomAndBed, StringUtils::isNotBlank)) {
-                    errorVoList.add(new ExcelErrorVo(i + start, "小区、楼栋、单元、楼层", "不能为空"));
+                    errorVoList.add(new ExcelErrorVo(i + start, "一级空间，二级空间，三级空间，四级空间", "不能为空"));
                    for (int j = 0; j < 2; j++) {
                        if (StringUtils.isBlank(roomAndBed.get(j))) {

--- a/server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
 package com.makeit.service.platform.space.impl;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import com.google.common.collect.Lists;
@@ -40,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.*;
 import java.util.function.BiConsumer;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -150,6 +154,25 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
            platRoom.setSpacePath(dto.getParentPath() + "," + space.getId());
            platRoomService.updateById(platRoom);
        }
+        List<String> roomIds = platRoomList.stream().map(PlatRoom::getId).collect(Collectors.toList());
+        Map<String, PlatRoom> roomMap = platRoomList.stream().collect(Collectors.toMap(PlatRoom::getId,
+                Function.identity()));
+        if (CollUtil.isEmpty(roomIds)) {
+            return;
+        }
+        List<PlatElder> elderList = platElderService.list(Wrappers.<PlatElder>lambdaQuery().in(PlatElder::getRoomId,
+                roomIds));
+        if (CollUtil.isNotEmpty(elderList)) {
+            elderList.forEach(e -> {
+                String roomId = e.getRoomId();
+                if (StrUtil.isBlank(roomId) || !roomMap.containsKey(roomId)) {
+                    return;
+                }
+                PlatRoom platRoom = roomMap.get(roomId);
+                e.setSpacePath(platRoom.getSpacePath() + "," + e.getBedId());
+                platElderService.updateById(e);
+            });
+        }
    }
    @Override