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 a045439..0a5a162 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.unisinsight.project.entity.dao.DeviceImageMapping; import com.unisinsight.project.entity.dao.Image; import com.unisinsight.project.entity.req.DeleteIdReq; import com.unisinsight.project.entity.req.ImageReq; @@ -13,6 +14,7 @@ import com.unisinsight.project.entity.res.ImageRes; import com.unisinsight.project.entity.res.PageResult; import com.unisinsight.project.exception.BaseErrorCode; import com.unisinsight.project.exception.Result; +import com.unisinsight.project.mapper.DeviceImageMappingMapper; import com.unisinsight.project.mapper.ImageMapper; import com.unisinsight.project.service.ImageService; import lombok.extern.slf4j.Slf4j; @@ -46,6 +48,9 @@ public class ImageServiceImpl extends ServiceImpl @Resource private ImageMapper imageMapper; + @Resource + private DeviceImageMappingMapper deviceImageMappingMapper; + // 请求bt配置 @Value("${file.upload.bt-url}") private String btUrl; @@ -84,6 +89,12 @@ public class ImageServiceImpl extends ServiceImpl @Override public Result delete(DeleteIdReq deleteIdReq) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(DeviceImageMapping::getImageId, deleteIdReq.getId()); + int delete = deviceImageMappingMapper.delete(lambdaQueryWrapper); + if (delete > 0) { + log.info("镜像删除关联关系insert:{}", delete); + } Image image = imageMapper.selectById(deleteIdReq.getId()); if (ObjectUtils.isNotEmpty(image)) { try { diff --git a/nex-be/src/main/java/com/unisinsight/project/service/impl/UserServiceImpl.java b/nex-be/src/main/java/com/unisinsight/project/service/impl/UserServiceImpl.java index e76718a..dbb3b82 100644 --- a/nex-be/src/main/java/com/unisinsight/project/service/impl/UserServiceImpl.java +++ b/nex-be/src/main/java/com/unisinsight/project/service/impl/UserServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.unisinsight.project.entity.dao.DeviceUserMapping; import com.unisinsight.project.entity.dao.User; import com.unisinsight.project.entity.dao.UserDeviceGroup; import com.unisinsight.project.entity.req.DeleteIdReq; @@ -16,6 +17,7 @@ import com.unisinsight.project.entity.res.PageResult; import com.unisinsight.project.entity.res.UserRes; import com.unisinsight.project.exception.BaseErrorCode; import com.unisinsight.project.exception.Result; +import com.unisinsight.project.mapper.DeviceUserMappingMapper; import com.unisinsight.project.mapper.UserDeviceGroupMapper; import com.unisinsight.project.mapper.UserMapper; import com.unisinsight.project.service.UserService; @@ -42,10 +44,12 @@ public class UserServiceImpl extends ServiceImpl @Resource private UserMapper userMapper; - @Resource private UserDeviceGroupMapper groupMapper; + @Resource + private DeviceUserMappingMapper deviceUserMappingMapper; + @Override public Result insert(UserReq userReq) { User user = BeanUtil.copyProperties(userReq, User.class); @@ -75,6 +79,12 @@ public class UserServiceImpl extends ServiceImpl @Override public Result delete(DeleteIdReq deleteIdReq) { + LambdaQueryWrapper groupLambdaQueryWrapper = new LambdaQueryWrapper<>(); + groupLambdaQueryWrapper.in(DeviceUserMapping::getUserId, deleteIdReq.getId()); + int delete = deviceUserMappingMapper.delete(groupLambdaQueryWrapper); + if (delete > 0) { + log.info("用户删除关联关系insert:{}", delete); + } int deleted = userMapper.deleteById(deleteIdReq.getId()); log.info("用户删除insert:{}", deleted); if (deleted == 1) {