From b3304804a1460312b2d0566f6ea4d7eb735a30ab Mon Sep 17 00:00:00 2001 From: rdpnr_puzhi <13060209078@163.com> Date: Tue, 12 Aug 2025 16:14:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=90=8E=E7=AB=AF):=20=E8=81=94=E8=B0=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/ClientController.java | 43 ++++------ .../DeviceImageMappingController.java | 2 +- .../DeviceUserMappingController.java | 6 +- .../entity/res/DeviceUserMappingRes.java | 12 ++- .../service/impl/ClientServiceImpl.java | 43 +++++----- .../impl/DeviceImageMappingServiceImpl.java | 9 +- .../service/impl/DeviceServiceImpl.java | 8 +- .../impl/DeviceUserMappingServiceImpl.java | 82 +++++++------------ .../service/impl/ImageServiceImpl.java | 45 ++++------ 9 files changed, 112 insertions(+), 138 deletions(-) diff --git a/nex-be/src/main/java/com/unisinsight/project/controller/ClientController.java b/nex-be/src/main/java/com/unisinsight/project/controller/ClientController.java index af47f90..9f9b772 100644 --- a/nex-be/src/main/java/com/unisinsight/project/controller/ClientController.java +++ b/nex-be/src/main/java/com/unisinsight/project/controller/ClientController.java @@ -18,9 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Objects; /** @@ -68,11 +66,7 @@ public class ClientController { deviceUserReq.setDeviceId(loginReq.getDeviceId()); deviceUserReq.setUserName(loginReq.getUsername()); deviceUserReq.setPassword(loginReq.getPassword()); - //todo 后面再调 -// Result result = deviceUserMappingService.loginUser(deviceUserReq); - HashMap hashMap = new HashMap<>(); - hashMap.put("token", "123456"); - return Result.successResult(hashMap); + return deviceUserMappingService.loginUser(deviceUserReq); } @ApiOperation(value = "获取镜像列表") @@ -83,24 +77,23 @@ public class ClientController { } log.info("获取镜像列表请求参数为:{}", JSONUtil.toJsonStr(loginReq)); -// Result imageList = clientService.getImageList(loginReq.getDeviceId(), loginReq.getToken()); - List> hashMaps = new ArrayList<>(); - HashMap map = new HashMap<>(); - map.put("name", "ubuntu-20.04.6-desktop-amd64.iso"); - map.put("torrent", "https://releases.ubuntu.com/20.04.6/ubuntu-20.04.6-desktop-amd64.iso.torrent"); - hashMaps.add(map); - HashMap map1 = new HashMap<>(); - map1.put("name", "uos_nbd_20250806.qcow2"); - map1.put("torrent", "http://10.100.51.86:8114/api/vdi/file/down/win10_v2307_uefi_demo.vhdx.torrent"); - hashMaps.add(map1); - HashMap map2 = new HashMap<>(); - map2.put("name", "win10_v2307_uefi_demo.vhdx"); - map2.put("torrent", "http://10.100.51.86:8114/api/vdi/file/down/win10_v2307_uefi_demo.vhdx.torrent"); - hashMaps.add(map2); - - HashMap hashMap = new HashMap<>(); - hashMap.put("list", hashMaps); - return Result.successResult(hashMap); + // List> hashMaps = new ArrayList<>(); +// HashMap map = new HashMap<>(); +// map.put("name", "ubuntu-20.04.6-desktop-amd64.iso"); +// map.put("torrent", "https://releases.ubuntu.com/20.04.6/ubuntu-20.04.6-desktop-amd64.iso.torrent"); +// hashMaps.add(map); +// HashMap map1 = new HashMap<>(); +// map1.put("name", "uos_nbd_20250806.qcow2"); +// map1.put("torrent", "http://10.100.51.86:8114/api/vdi/file/down/uos_nbd_20250806.qcow2.torrent"); +// hashMaps.add(map1); +// HashMap map2 = new HashMap<>(); +// map2.put("name", "win10_v2307_uefi_demo.vhdx"); +// map2.put("torrent", "http://10.100.51.86:8114/api/vdi/file/down/win10_v2307_uefi_demo.vhdx.torrent"); +// hashMaps.add(map2); +// +// HashMap hashMap = new HashMap<>(); +// hashMap.put("list", hashMaps); + return clientService.getImageList(loginReq.getDeviceId(), loginReq.getToken()); } @ApiOperation(value = "版本更新") diff --git a/nex-be/src/main/java/com/unisinsight/project/controller/DeviceImageMappingController.java b/nex-be/src/main/java/com/unisinsight/project/controller/DeviceImageMappingController.java index d7688bc..90c4451 100644 --- a/nex-be/src/main/java/com/unisinsight/project/controller/DeviceImageMappingController.java +++ b/nex-be/src/main/java/com/unisinsight/project/controller/DeviceImageMappingController.java @@ -48,7 +48,7 @@ public class DeviceImageMappingController { log.info("终端镜像映射新增请求参数为：{}", JSONUtil.toJsonStr(deviceImageMappingReq)); List reqData = deviceImageMappingReq.getData(); - List addList = reqData.stream().filter(e -> Objects.isNull(e.getId())).collect(Collectors.toList()); + List addList = reqData.stream().distinct().filter(e -> Objects.isNull(e.getId())).collect(Collectors.toList()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda().eq(DeviceImageMapping::getDeviceId, reqData.get(0).getDeviceId()); diff --git a/nex-be/src/main/java/com/unisinsight/project/controller/DeviceUserMappingController.java b/nex-be/src/main/java/com/unisinsight/project/controller/DeviceUserMappingController.java index 1344b39..99accc7 100644 --- a/nex-be/src/main/java/com/unisinsight/project/controller/DeviceUserMappingController.java +++ b/nex-be/src/main/java/com/unisinsight/project/controller/DeviceUserMappingController.java @@ -47,7 +47,7 @@ public class DeviceUserMappingController { } log.info("终端用户映射新增请求参数为：{}", JSONUtil.toJsonStr(deviceUserMappingReq)); List userMappingReqData = deviceUserMappingReq.getData(); - List addList = userMappingReqData.stream().filter(e -> Objects.isNull(e.getId())).collect(Collectors.toList()); + List addList = userMappingReqData.stream().distinct().filter(e -> Objects.isNull(e.getId())).collect(Collectors.toList()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda().eq(DeviceUserMapping::getDeviceId, userMappingReqData.get(0).getDeviceId()); @@ -55,12 +55,14 @@ public class DeviceUserMappingController { if (CollectionUtil.isNotEmpty(list)) { Set requestIds = userMappingReqData.stream() + .distinct() .map(DeviceUserMappingReq::getId) .filter(Objects::nonNull) .collect(Collectors.toSet()); List idsToDelete = list.stream() .map(DeviceUserMapping::getId) + .distinct() .filter(Objects::nonNull) .filter(id -> !requestIds.contains(id)) .collect(Collectors.toList()); @@ -72,7 +74,7 @@ public class DeviceUserMappingController { } if (CollectionUtil.isNotEmpty(addList)) { List deviceUserMappings = BeanUtil.copyToList(addList, DeviceUserMapping.class); - List deviceUserMapping = deviceUserMappings.stream().peek(e -> { + List deviceUserMapping = deviceUserMappings.stream().distinct().peek(e -> { e.setCreateUser("admin"); }).collect(Collectors.toList()); boolean insert = deviceUserMappingService.saveBatch(deviceUserMapping); diff --git a/nex-be/src/main/java/com/unisinsight/project/entity/res/DeviceUserMappingRes.java b/nex-be/src/main/java/com/unisinsight/project/entity/res/DeviceUserMappingRes.java index 0770afb..d0ab0e9 100644 --- a/nex-be/src/main/java/com/unisinsight/project/entity/res/DeviceUserMappingRes.java +++ b/nex-be/src/main/java/com/unisinsight/project/entity/res/DeviceUserMappingRes.java @@ -37,9 +37,9 @@ public class DeviceUserMappingRes implements Serializable { private Long deviceGroupId; /** - * 分组名称 + * 终端分组名称 */ - @ApiModelProperty("分组名称") + @ApiModelProperty("终端分组名称") @JsonProperty("device_group_name") private String deviceGroupName; @@ -50,6 +50,14 @@ public class DeviceUserMappingRes implements Serializable { @JsonProperty("user_group_id") private Long userGroupId; + /** + * 用户分组名称 + */ + @ApiModelProperty("用户分组名称") + @JsonProperty("user_group_name") + private String userGroupName; + + /** * 用户ID */ diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java index 31a2b13..0f967ee 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/ClientServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashMap; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -46,28 +47,28 @@ public class ClientServiceImpl implements ClientService { if (CollectionUtil.isEmpty(deviceImageMappings)) { return Result.errorResultMessage(BaseErrorCode.PARAMS_CHK_ERROR, "请先配置终端镜像"); } - List imageIdList = deviceImageMappings.stream().map(DeviceImageMapping::getImageId).collect(Collectors.toList()); - - QueryWrapper imageQueryWrapper = new QueryWrapper<>(); - String imageListStr = StringUtils.join(imageIdList, ","); - log.info("用户登录查询镜像id结果:{}", JSONUtil.toJsonStr(imageListStr)); - imageQueryWrapper.lambda().in(Image::getId, imageListStr); - List images = imageMapper.selectList(imageQueryWrapper); - log.info("用户登录查询镜像结果:{}", JSONUtil.toJsonStr(images)); - List imageRes = BeanUtil.copyToList(images, ImageRes.class); - List> collect = imageRes.stream().distinct().map(e -> { + List imageIdList = deviceImageMappings.stream().map(DeviceImageMapping::getImageId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(imageIdList)) { + QueryWrapper imageQueryWrapper = new QueryWrapper<>(); + imageQueryWrapper.lambda().in(Image::getId, imageIdList); + List images = imageMapper.selectList(imageQueryWrapper); + log.info("用户登录查询镜像结果:{}", JSONUtil.toJsonStr(images)); + List imageRes = BeanUtil.copyToList(images, ImageRes.class); + List> collect = imageRes.stream().distinct().map(e -> { + HashMap hashMap = new HashMap<>(); + if (StringUtils.isNotBlank(e.getImageName())) { + hashMap.put("name", e.getImageName()); + } + if (StringUtils.isNotBlank(e.getBtPath())) { + hashMap.put("torrent", e.getBtPath()); + } + return hashMap; + }).collect(Collectors.toList()); HashMap hashMap = new HashMap<>(); - if (StringUtils.isNotBlank(e.getImageName())) { - hashMap.put("name", e.getImageName()); - } - if (StringUtils.isNotBlank(e.getBtPath())) { - hashMap.put("torrent", e.getBtPath()); - } - return hashMap; - }).collect(Collectors.toList()); - HashMap hashMap = new HashMap<>(); - hashMap.put("list", collect); - return Result.successResult(hashMap); + hashMap.put("list", collect); + return Result.successResult(hashMap); + } + return Result.successResult(); } } diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceImageMappingServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceImageMappingServiceImpl.java index 71e24f0..d8091fd 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceImageMappingServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceImageMappingServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -59,9 +60,9 @@ public class DeviceImageMappingServiceImpl extends ServiceImpl deviceImageMappingRes = BeanUtil.copyToList(deviceUserMappings, DeviceImageMappingRes.class); - List imageIds = deviceImageMappingRes.stream().map(DeviceImageMappingRes::getImageId).collect(Collectors.toList()); + List imageIds = deviceImageMappingRes.stream().map(DeviceImageMappingRes::getImageId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(imageIds)) { - LambdaQueryWrapper imageLambdaQueryWrapper = new QueryWrapper().lambda().eq(Image::getId, imageIds); + LambdaQueryWrapper imageLambdaQueryWrapper = new QueryWrapper().lambda().in(Image::getId, imageIds); List images = imageMapper.selectList(imageLambdaQueryWrapper); if (CollectionUtil.isNotEmpty(images)) { deviceImageMappingRes.forEach(deviceImage -> { @@ -73,9 +74,9 @@ public class DeviceImageMappingServiceImpl extends ServiceImpl groupIdList = deviceImageMappingRes.stream().map(DeviceImageMappingRes::getDeviceGroupId).collect(Collectors.toList()); + List groupIdList = deviceImageMappingRes.stream().map(DeviceImageMappingRes::getDeviceGroupId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(groupIdList)) { - LambdaQueryWrapper groupLambdaQueryWrapper = new QueryWrapper().lambda().eq(UserDeviceGroup::getId, groupIdList); + LambdaQueryWrapper groupLambdaQueryWrapper = new QueryWrapper().lambda().in(UserDeviceGroup::getId, groupIdList); List userDeviceGroups = groupMapper.selectList(groupLambdaQueryWrapper); if (CollectionUtil.isNotEmpty(userDeviceGroups)) { deviceImageMappingRes.forEach(deviceImage -> { diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceServiceImpl.java index e6b936b..34f4086 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceServiceImpl.java @@ -48,6 +48,12 @@ public class DeviceServiceImpl extends ServiceImpl @Override public Result insert(DeviceReq deviceReq) { Device device = BeanUtil.copyProperties(deviceReq, Device.class); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Device::getDeviceId, deviceReq.getDeviceId()); + Device selectOne = deviceMapper.selectOne(queryWrapper); + if (ObjectUtils.isNotEmpty(selectOne)) { + return new Result<>("200", "终端已存在"); + } device.setCreateUser("admin"); int insert = deviceMapper.insert(device); log.info("终端新增insert:{}", insert); @@ -111,7 +117,7 @@ public class DeviceServiceImpl extends ServiceImpl } else { PageResult convert = PageResult.convertIPage(userPage, DeviceRes.class); List deviceResList = convert.getData(); - List deviceIdList = deviceResList.stream().distinct().map(DeviceRes::getDeviceGroupId).filter(Objects::nonNull).collect(Collectors.toList()); + List deviceIdList = deviceResList.stream().map(DeviceRes::getDeviceGroupId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda().in(UserDeviceGroup::getId, deviceIdList); List userDeviceGroups = groupMapper.selectList(wrapper); diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceUserMappingServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceUserMappingServiceImpl.java index 11a51fa..2e78f88 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceUserMappingServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/DeviceUserMappingServiceImpl.java @@ -20,7 +20,6 @@ import com.unisinsight.project.mapper.UserMapper; import com.unisinsight.project.service.DeviceUserMappingService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -70,68 +69,49 @@ public class DeviceUserMappingServiceImpl extends ServiceImpl deviceUserMappingRes = BeanUtil.copyToList(deviceUserMappings, DeviceUserMappingRes.class); - if (ObjectUtil.isEmpty(deviceUserMappingReq.getType())) { - List userList = deviceUserMappingRes.stream().distinct().map(DeviceUserMappingRes::getUserId).filter(Objects::nonNull).collect(Collectors.toList()); - userList = new ArrayList<>(new HashSet<>(userList)); - if (CollectionUtil.isNotEmpty(userList)) { - QueryWrapper userQueryWrapper = new QueryWrapper<>(); - userQueryWrapper.lambda().in(User::getId, userList); - List users = userMapper.selectList(userQueryWrapper); - deviceUserMappingRes = deviceUserMappingRes.stream().distinct().peek(device -> { - for (User user : users) { - if (!ObjectUtils.isEmpty(device.getUserId()) && device.getUserId().equals(user.getId())) { - device.setUserName(user.getUserName()); - } - } - }).collect(Collectors.toList()); - } - List deviceList = deviceUserMappingRes.stream().distinct().map(DeviceUserMappingRes::getDeviceGroupId).filter(Objects::nonNull).collect(Collectors.toList()); - deviceList = new ArrayList<>(new HashSet<>(deviceList)); - if (CollectionUtil.isNotEmpty(deviceList)) { - QueryWrapper groupQueryWrapper = new QueryWrapper<>(); - groupQueryWrapper.lambda().in(UserDeviceGroup::getId, deviceList); - List userDeviceGroups = groupMapper.selectList(groupQueryWrapper); - deviceUserMappingRes = deviceUserMappingRes.stream().distinct().peek(device -> { - for (UserDeviceGroup userDeviceGroup : userDeviceGroups) { - if (!ObjectUtils.isEmpty(device.getDeviceGroupId()) && device.getDeviceGroupId().equals(userDeviceGroup.getId())) { - device.setDeviceGroupName(userDeviceGroup.getName()); - } - } - }).collect(Collectors.toList()); - } - - return Result.successResult(deviceUserMappingRes); - } else if (deviceUserMappingReq.getType() == 1) { - List userList = deviceUserMappingRes.stream().distinct().map(DeviceUserMappingRes::getUserId).filter(Objects::nonNull).collect(Collectors.toList()); - userList = new ArrayList<>(new HashSet<>(userList)); + List userList = deviceUserMappingRes.stream().map(DeviceUserMappingRes::getUserId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(userList)) { QueryWrapper userQueryWrapper = new QueryWrapper<>(); userQueryWrapper.lambda().in(User::getId, userList); List users = userMapper.selectList(userQueryWrapper); - List collect = deviceUserMappingRes.stream().distinct().peek(device -> { + deviceUserMappingRes = deviceUserMappingRes.stream().distinct().peek(device -> { for (User user : users) { if (!ObjectUtils.isEmpty(device.getUserId()) && device.getUserId().equals(user.getId())) { device.setUserName(user.getUserName()); } } }).collect(Collectors.toList()); - return Result.successResult(collect); - } else { - List deviceList = deviceUserMappingRes.stream().distinct().map(DeviceUserMappingRes::getDeviceGroupId).filter(Objects::nonNull).collect(Collectors.toList()); - deviceList = new ArrayList<>(new HashSet<>(deviceList)); + } + + List deviceList = deviceUserMappingRes.stream().map(DeviceUserMappingRes::getDeviceGroupId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(deviceList)) { QueryWrapper groupQueryWrapper = new QueryWrapper<>(); - groupQueryWrapper.lambda().eq(UserDeviceGroup::getType, 1); groupQueryWrapper.lambda().in(UserDeviceGroup::getId, deviceList); List userDeviceGroups = groupMapper.selectList(groupQueryWrapper); - List collect = deviceUserMappingRes.stream().distinct().peek(device -> { + deviceUserMappingRes = deviceUserMappingRes.stream().distinct().peek(device -> { for (UserDeviceGroup userDeviceGroup : userDeviceGroups) { if (!ObjectUtils.isEmpty(device.getDeviceGroupId()) && device.getDeviceGroupId().equals(userDeviceGroup.getId())) { device.setDeviceGroupName(userDeviceGroup.getName()); } } }).collect(Collectors.toList()); - return Result.successResult(collect); } + List userGroupId = deviceUserMappingRes.stream().map(DeviceUserMappingRes::getUserGroupId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(userGroupId)) { + QueryWrapper groupQueryWrapper = new QueryWrapper<>(); + groupQueryWrapper.lambda().in(UserDeviceGroup::getId, userGroupId); + List userDeviceGroups = groupMapper.selectList(groupQueryWrapper); + deviceUserMappingRes = deviceUserMappingRes.stream().distinct().peek(group -> { + for (UserDeviceGroup userDeviceGroup : userDeviceGroups) { + if (!ObjectUtils.isEmpty(group.getUserGroupId()) && group.getUserGroupId().equals(userDeviceGroup.getId())) { + group.setUserGroupName(userDeviceGroup.getName()); + } + } + }).collect(Collectors.toList()); + } + + return Result.successResult(deviceUserMappingRes); } } @@ -140,20 +120,16 @@ public class DeviceUserMappingServiceImpl extends ServiceImpl loginUser(DeviceUserReq deviceUserReq) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.lambda().eq(DeviceUserMapping::getDeviceId, deviceUserReq.getDeviceId()); - List deviceUserMappings = deviceUserMappingMapper.selectList(wrapper); log.info("用户登录查询映射结果:{}", JSONUtil.toJsonStr(deviceUserMappings)); List users = new ArrayList<>(); - List userIdList = deviceUserMappings.stream().map(DeviceUserMapping::getUserId).filter(Objects::nonNull).collect(Collectors.toList()); + List userIdList = deviceUserMappings.stream().map(DeviceUserMapping::getUserId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); log.info("用户登录查询用户id结果:{}", JSONUtil.toJsonStr(userIdList)); if (CollectionUtil.isNotEmpty(userIdList)) { QueryWrapper groupWrapper = new QueryWrapper<>(); - String userListStr = StringUtils.join(userIdList, ","); - log.info("用户id结果:{}", JSONUtil.toJsonStr(userListStr)); - groupWrapper.lambda().in(User::getId, userListStr); + groupWrapper.lambda().in(User::getId, userIdList); List userList = userMapper.selectList(groupWrapper); log.info("用户id查询结果:{}", JSONUtil.toJsonStr(userList)); if (CollectionUtil.isNotEmpty(userList)) { @@ -162,13 +138,11 @@ public class DeviceUserMappingServiceImpl extends ServiceImpl groupList = deviceUserMappings.stream().map(DeviceUserMapping::getUserGroupId).filter(Objects::nonNull).collect(Collectors.toList()); + List groupList = deviceUserMappings.stream().map(DeviceUserMapping::getUserGroupId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); log.info("用户登录查询用户组id结果:{}", JSONUtil.toJsonStr(groupList)); if (CollectionUtil.isNotEmpty(groupList)) { QueryWrapper groupWrapper = new QueryWrapper<>(); - String groupListStr = StringUtils.join(groupList, ","); - log.info("用户组id结果:{}", JSONUtil.toJsonStr(groupListStr)); - groupWrapper.lambda().in(User::getUserGroupId, groupListStr); + groupWrapper.lambda().in(User::getUserGroupId, groupList); List userDeviceGroups = userMapper.selectList(groupWrapper); log.info("用户组id查询结果:{}", JSONUtil.toJsonStr(userDeviceGroups)); if (CollectionUtil.isNotEmpty(userDeviceGroups)) { @@ -186,7 +160,7 @@ public class DeviceUserMappingServiceImpl extends ServiceImpl hashMap = new HashMap<>(); - hashMap.put("token", users.get(0).getId()); + hashMap.put("token", users.get(0).getId().toString()); return new Result<>("200", "登录成功", hashMap); } diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/ImageServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/ImageServiceImpl.java index ed05ae0..fc8bd6f 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/ImageServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/ImageServiceImpl.java @@ -66,39 +66,28 @@ public class ImageServiceImpl extends ServiceImpl public Result delete(DeleteIdReq deleteIdReq) { Image image = imageMapper.selectById(deleteIdReq.getId()); if (ObjectUtils.isNotEmpty(image)) { - boolean cleanUploadFile = cleanUploadFile(image.getStoragePath(), image.getImageName()); - if (cleanUploadFile) { - int deleted = imageMapper.deleteById(deleteIdReq.getId()); - log.info("镜像删除insert:{}", deleted); - if (deleted == 1) { - return Result.successResult(); + try { + Path filePath = Paths.get(image.getStoragePath(), image.getImageName()); + if (Files.exists(filePath)) { + // 删除文件 + Files.delete(filePath); + log.info("已删除文件: {}", filePath); + int deleted = imageMapper.deleteById(deleteIdReq.getId()); + log.info("镜像删除insert:{}", deleted); + if (deleted == 1) { + return Result.successResult(); + } + } else { + log.warn("文件不存在，无需删除: {}", filePath); + return Result.errorResultMessage(BaseErrorCode.HTTP_ERROR_CODE_500, "文件不存在，无需删除"); } + } catch (IOException e) { + log.error("删除文件失败: {}", e.getMessage(), e); } } - return Result.errorResult(BaseErrorCode.HTTP_ERROR_CODE_500); + return Result.errorResultMessage(BaseErrorCode.HTTP_ERROR_CODE_500, "删除文件失败"); } - /** - * 根据文件名删除已上传的文件 - * - * @param fileName 文件名 - */ - private boolean cleanUploadFile(String uploadDir, String fileName) { - try { - Path filePath = Paths.get(uploadDir, fileName); - if (Files.exists(filePath)) { - // 删除文件 - Files.delete(filePath); - log.info("已删除文件: {}", filePath); - return true; - } else { - log.warn("文件不存在，无需删除: {}", filePath); - } - } catch (IOException e) { - log.error("删除文件失败: {}", e.getMessage(), e); - } - return false; - } }