From 528318ff0afb0cf902eafbb3671779c53f79e596 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Mon, 9 Dec 2024 16:16:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(notice):=20=E9=87=8D=E6=9E=84=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 优化公告查询接口，新增分页查询功能 - 重构公告发布逻辑，支持批量发布 - 完善公告详情接口，增加用户信息 - 新增公告删除接口 - 优化公告状态切换逻辑 -调整公告附件处理方式 --- .../common/enums/EnableState.java | 2 +- .../{ => framework}/common/enums/IState.java | 2 +- .../common/mapstruct/BaseMapper.java | 2 +- .../{ => framework}/common/util/TreeUtil.java | 2 +- .../framework/security/UserDetailsImpl.java | 1 - .../controller/AttachmentController.java | 5 ++ .../attachment/service/AttachmentService.java | 3 + .../service/impl/AttachmentServiceImpl.java | 24 ++++++-- .../modules/attachment/vo/AttachmentVo.java | 13 +++- .../notice/controller/BulletinController.java | 2 +- .../modules/notice/entity/Bulletin.java | 2 +- .../modules/notice/entity/MessageType.java | 2 +- .../modules/notice/mapper/BulletinMapper.java | 2 +- .../modules/notice/mapper/MessageMapper.java | 2 +- .../notice/service/BulletinService.java | 2 + .../service/impl/BulletinServiceImpl.java | 14 +++++ .../gateway/modules/notice/vo/BulletinVo.java | 2 + .../gateway/modules/system/entity/User.java | 1 - .../system/mapper/AuthorityMapper.java | 2 +- .../modules/system/mapper/DeptMapper.java | 2 +- .../system/mapper/RoleAuthorityMapper.java | 2 +- .../modules/system/mapper/RoleMapper.java | 2 +- .../modules/system/mapper/UserMapper.java | 2 +- .../service/impl/AuthorityServiceImpl.java | 5 -- .../system/service/impl/DeptServiceImpl.java | 2 +- .../mappers/noticeMappers/BulletinMapper.xml | 59 +++++++------------ 26 files changed, 91 insertions(+), 68 deletions(-) rename src/main/java/com/zsc/edu/gateway/{ => framework}/common/enums/EnableState.java (89%) rename src/main/java/com/zsc/edu/gateway/{ => framework}/common/enums/IState.java (94%) rename src/main/java/com/zsc/edu/gateway/{ => framework}/common/mapstruct/BaseMapper.java (86%) rename src/main/java/com/zsc/edu/gateway/{ => framework}/common/util/TreeUtil.java (99%) diff --git a/src/main/java/com/zsc/edu/gateway/common/enums/EnableState.java b/src/main/java/com/zsc/edu/gateway/framework/common/enums/EnableState.java similarity index 89% rename from src/main/java/com/zsc/edu/gateway/common/enums/EnableState.java rename to src/main/java/com/zsc/edu/gateway/framework/common/enums/EnableState.java index 06c6151..08580ab 100644 --- a/src/main/java/com/zsc/edu/gateway/common/enums/EnableState.java +++ b/src/main/java/com/zsc/edu/gateway/framework/common/enums/EnableState.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.common.enums; +package com.zsc.edu.gateway.framework.common.enums; import com.baomidou.mybatisplus.annotation.IEnum; diff --git a/src/main/java/com/zsc/edu/gateway/common/enums/IState.java b/src/main/java/com/zsc/edu/gateway/framework/common/enums/IState.java similarity index 94% rename from src/main/java/com/zsc/edu/gateway/common/enums/IState.java rename to src/main/java/com/zsc/edu/gateway/framework/common/enums/IState.java index 7d63a58..e2b01e5 100644 --- a/src/main/java/com/zsc/edu/gateway/common/enums/IState.java +++ b/src/main/java/com/zsc/edu/gateway/framework/common/enums/IState.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.common.enums; +package com.zsc.edu.gateway.framework.common.enums; import com.zsc.edu.gateway.exception.StateException; diff --git a/src/main/java/com/zsc/edu/gateway/common/mapstruct/BaseMapper.java b/src/main/java/com/zsc/edu/gateway/framework/common/mapstruct/BaseMapper.java similarity index 86% rename from src/main/java/com/zsc/edu/gateway/common/mapstruct/BaseMapper.java rename to src/main/java/com/zsc/edu/gateway/framework/common/mapstruct/BaseMapper.java index 3e23405..dc8e581 100644 --- a/src/main/java/com/zsc/edu/gateway/common/mapstruct/BaseMapper.java +++ b/src/main/java/com/zsc/edu/gateway/framework/common/mapstruct/BaseMapper.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.common.mapstruct; +package com.zsc.edu.gateway.framework.common.mapstruct; import org.mapstruct.MappingTarget; diff --git a/src/main/java/com/zsc/edu/gateway/common/util/TreeUtil.java b/src/main/java/com/zsc/edu/gateway/framework/common/util/TreeUtil.java similarity index 99% rename from src/main/java/com/zsc/edu/gateway/common/util/TreeUtil.java rename to src/main/java/com/zsc/edu/gateway/framework/common/util/TreeUtil.java index 312f984..55b3d5f 100644 --- a/src/main/java/com/zsc/edu/gateway/common/util/TreeUtil.java +++ b/src/main/java/com/zsc/edu/gateway/framework/common/util/TreeUtil.java @@ -1,4 +1,4 @@ -package com.zsc.edu.gateway.common.util; +package com.zsc.edu.gateway.framework.common.util; import java.util.*; import java.util.function.*; diff --git a/src/main/java/com/zsc/edu/gateway/framework/security/UserDetailsImpl.java b/src/main/java/com/zsc/edu/gateway/framework/security/UserDetailsImpl.java index 39197ab..44395ee 100644 --- a/src/main/java/com/zsc/edu/gateway/framework/security/UserDetailsImpl.java +++ b/src/main/java/com/zsc/edu/gateway/framework/security/UserDetailsImpl.java @@ -1,7 +1,6 @@ package com.zsc.edu.gateway.framework.security; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.zsc.edu.gateway.common.enums.EnableState; import com.zsc.edu.gateway.modules.system.entity.Authority; import com.zsc.edu.gateway.modules.system.entity.Dept; import com.zsc.edu.gateway.modules.system.entity.Role; diff --git a/src/main/java/com/zsc/edu/gateway/modules/attachment/controller/AttachmentController.java b/src/main/java/com/zsc/edu/gateway/modules/attachment/controller/AttachmentController.java index f7d2c29..072c267 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/attachment/controller/AttachmentController.java +++ b/src/main/java/com/zsc/edu/gateway/modules/attachment/controller/AttachmentController.java @@ -77,6 +77,11 @@ public class AttachmentController { public Attachment getAttachmentInfo(@PathVariable("id") String id) { return service.getById(id); } + + + /** + * 批量上传附件 + */ @PostMapping("uploadMultipleFiles") public List uploadMultipleFiles( @RequestParam(defaultValue = "其他") Attachment.Type type, diff --git a/src/main/java/com/zsc/edu/gateway/modules/attachment/service/AttachmentService.java b/src/main/java/com/zsc/edu/gateway/modules/attachment/service/AttachmentService.java index c8f1014..950b3c6 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/attachment/service/AttachmentService.java +++ b/src/main/java/com/zsc/edu/gateway/modules/attachment/service/AttachmentService.java @@ -6,6 +6,7 @@ import org.springframework.core.io.Resource; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.List; /** * @author fantianzhi @@ -21,5 +22,7 @@ public interface AttachmentService extends IService { Attachment.Wrapper loadAsWrapper(String id); + List selectList(List dis); + Boolean delete(String id); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/attachment/service/impl/AttachmentServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/attachment/service/impl/AttachmentServiceImpl.java index d479e05..1b0d0f0 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/attachment/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/attachment/service/impl/AttachmentServiceImpl.java @@ -1,7 +1,6 @@ package com.zsc.edu.gateway.modules.attachment.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zsc.edu.gateway.framework.storage.StorageProperties; import com.zsc.edu.gateway.framework.storage.exception.StorageFileEmptyException; @@ -9,6 +8,9 @@ import com.zsc.edu.gateway.framework.storage.exception.StorageFileNotFoundExcept import com.zsc.edu.gateway.modules.attachment.entity.Attachment; import com.zsc.edu.gateway.modules.attachment.repo.AttachmentRepository; import com.zsc.edu.gateway.modules.attachment.service.AttachmentService; +import com.zsc.edu.gateway.modules.notice.entity.BulletinAttachment; +import com.zsc.edu.gateway.modules.notice.repo.BulletinAttachmentRepository; +import com.zsc.edu.gateway.modules.notice.service.BulletinAttachmentService; import jakarta.annotation.PostConstruct; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; @@ -43,11 +45,13 @@ public class AttachmentServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("id", id); - return remove(queryWrapper); + public List selectList(List dis) { + return repo.selectList(new LambdaQueryWrapper().in(Attachment::getId, dis)); } + @Override + public Boolean delete(String id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BulletinAttachment::getAttachmentId, id); + List bulletinAttachments = bulletin.selectList(wrapper); + if (!bulletinAttachments.isEmpty()) { + bulletin.delete(wrapper); + } + return removeById(id); + } } diff --git a/src/main/java/com/zsc/edu/gateway/modules/attachment/vo/AttachmentVo.java b/src/main/java/com/zsc/edu/gateway/modules/attachment/vo/AttachmentVo.java index 7b8fed0..8e070c2 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/attachment/vo/AttachmentVo.java +++ b/src/main/java/com/zsc/edu/gateway/modules/attachment/vo/AttachmentVo.java @@ -7,7 +7,16 @@ import lombok.Data; */ @Data public class AttachmentVo { - public Long attachmentId; - public String fileName; + /** + * 附件ID + */ + public String attachmentId; + /** + * 附件地址 + */ public String url; + /** + * 附件名称 + */ + public String fileName; } diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/controller/BulletinController.java b/src/main/java/com/zsc/edu/gateway/modules/notice/controller/BulletinController.java index 749fb89..bbf978c 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/controller/BulletinController.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/controller/BulletinController.java @@ -149,7 +149,7 @@ public class BulletinController { @DeleteMapping("/{id}") @PreAuthorize("hasAuthority('BULLETIN_DELETE')") public Boolean delete(@PathVariable("id") Long id) { - return service.removeById(id); + return service.delete(id); } } diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/entity/Bulletin.java b/src/main/java/com/zsc/edu/gateway/modules/notice/entity/Bulletin.java index 71497b0..efad3a3 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/entity/Bulletin.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/entity/Bulletin.java @@ -3,7 +3,7 @@ package com.zsc.edu.gateway.modules.notice.entity; import com.baomidou.mybatisplus.annotation.IEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.zsc.edu.gateway.common.enums.IState; +import com.zsc.edu.gateway.framework.common.enums.IState; import com.zsc.edu.gateway.modules.system.entity.BaseEntity; import com.zsc.edu.gateway.modules.attachment.entity.Attachment; import lombok.*; diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/entity/MessageType.java b/src/main/java/com/zsc/edu/gateway/modules/notice/entity/MessageType.java index b1e94aa..6d06c41 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/entity/MessageType.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/entity/MessageType.java @@ -1,7 +1,7 @@ package com.zsc.edu.gateway.modules.notice.entity; import com.baomidou.mybatisplus.annotation.IEnum; -import com.zsc.edu.gateway.common.enums.IState; +import com.zsc.edu.gateway.framework.common.enums.IState; /** * 消息类型 diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/mapper/BulletinMapper.java b/src/main/java/com/zsc/edu/gateway/modules/notice/mapper/BulletinMapper.java index e1e6390..87d17ff 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/mapper/BulletinMapper.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/mapper/BulletinMapper.java @@ -1,6 +1,6 @@ package com.zsc.edu.gateway.modules.notice.mapper; -import com.zsc.edu.gateway.common.mapstruct.BaseMapper; +import com.zsc.edu.gateway.framework.common.mapstruct.BaseMapper; import com.zsc.edu.gateway.modules.notice.dto.BulletinDto; import com.zsc.edu.gateway.modules.notice.entity.Bulletin; import org.mapstruct.Mapper; diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/mapper/MessageMapper.java b/src/main/java/com/zsc/edu/gateway/modules/notice/mapper/MessageMapper.java index b6158fb..71c3604 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/mapper/MessageMapper.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/mapper/MessageMapper.java @@ -1,6 +1,6 @@ package com.zsc.edu.gateway.modules.notice.mapper; -import com.zsc.edu.gateway.common.mapstruct.BaseMapper; +import com.zsc.edu.gateway.framework.common.mapstruct.BaseMapper; import com.zsc.edu.gateway.modules.notice.dto.UserMessageDto; import com.zsc.edu.gateway.modules.notice.entity.Message; import org.mapstruct.Mapper; diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/service/BulletinService.java b/src/main/java/com/zsc/edu/gateway/modules/notice/service/BulletinService.java index 8395869..3f5a72f 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/service/BulletinService.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/service/BulletinService.java @@ -33,4 +33,6 @@ public interface BulletinService extends IService { Boolean close(UserDetailsImpl userDetails,Long id); IPage selectPageByConditions(Page page, BulletinQuery query); + + Boolean delete(Long id); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/service/impl/BulletinServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/notice/service/impl/BulletinServiceImpl.java index a3c70d3..8088f84 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/service/impl/BulletinServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/service/impl/BulletinServiceImpl.java @@ -12,6 +12,7 @@ import com.zsc.edu.gateway.modules.notice.dto.BulletinDto; import com.zsc.edu.gateway.modules.notice.entity.Bulletin; import com.zsc.edu.gateway.modules.notice.entity.BulletinAttachment; import com.zsc.edu.gateway.modules.notice.query.BulletinQuery; +import com.zsc.edu.gateway.modules.notice.repo.BulletinAttachmentRepository; import com.zsc.edu.gateway.modules.notice.repo.BulletinRepository; import com.zsc.edu.gateway.modules.notice.service.BulletinAttachmentService; import com.zsc.edu.gateway.modules.notice.service.BulletinService; @@ -39,6 +40,7 @@ public class BulletinServiceImpl extends ServiceImpl selectPageByConditions(Page page, BulletinQuery query) { return baseMapper.selectPageByConditions(page, query); } + + @Override + //TODO 解决重复 + public Boolean delete(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BulletinAttachment::getAttachmentId, id); + List bulletinAttachments = bulletinAttachmentRepository.selectList(queryWrapper); + if (!bulletinAttachments.isEmpty()) { + bulletinAttachmentRepository.delete(queryWrapper); + } + return removeById(id); + } } diff --git a/src/main/java/com/zsc/edu/gateway/modules/notice/vo/BulletinVo.java b/src/main/java/com/zsc/edu/gateway/modules/notice/vo/BulletinVo.java index 162ec28..58c3225 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/notice/vo/BulletinVo.java +++ b/src/main/java/com/zsc/edu/gateway/modules/notice/vo/BulletinVo.java @@ -2,6 +2,7 @@ package com.zsc.edu.gateway.modules.notice.vo; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonInclude; import com.zsc.edu.gateway.modules.attachment.entity.Attachment; import com.zsc.edu.gateway.modules.attachment.vo.AttachmentVo; import com.zsc.edu.gateway.modules.notice.entity.Bulletin; @@ -17,6 +18,7 @@ import java.util.Set; * @author zhuang */ @Data +@JsonInclude public class BulletinVo { /** * 公告id diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/entity/User.java b/src/main/java/com/zsc/edu/gateway/modules/system/entity/User.java index 82715f2..4023559 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/entity/User.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/entity/User.java @@ -3,7 +3,6 @@ package com.zsc.edu.gateway.modules.system.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.zsc.edu.gateway.common.enums.EnableState; import lombok.*; /** diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/AuthorityMapper.java b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/AuthorityMapper.java index 7a770e8..52d0254 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/AuthorityMapper.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/AuthorityMapper.java @@ -1,6 +1,6 @@ package com.zsc.edu.gateway.modules.system.mapper; -import com.zsc.edu.gateway.common.mapstruct.BaseMapper; +import com.zsc.edu.gateway.framework.common.mapstruct.BaseMapper; import com.zsc.edu.gateway.modules.system.dto.AuthorityDto; import com.zsc.edu.gateway.modules.system.entity.Authority; import org.mapstruct.Mapper; diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/DeptMapper.java b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/DeptMapper.java index 028c139..022b2a0 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/DeptMapper.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/DeptMapper.java @@ -1,6 +1,6 @@ package com.zsc.edu.gateway.modules.system.mapper; -import com.zsc.edu.gateway.common.mapstruct.BaseMapper; +import com.zsc.edu.gateway.framework.common.mapstruct.BaseMapper; import com.zsc.edu.gateway.modules.system.dto.DeptDto; import com.zsc.edu.gateway.modules.system.entity.Dept; import org.mapstruct.Mapper; diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/RoleAuthorityMapper.java b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/RoleAuthorityMapper.java index 5e08302..f7fc2b5 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/RoleAuthorityMapper.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/RoleAuthorityMapper.java @@ -1,6 +1,6 @@ package com.zsc.edu.gateway.modules.system.mapper; -import com.zsc.edu.gateway.common.mapstruct.BaseMapper; +import com.zsc.edu.gateway.framework.common.mapstruct.BaseMapper; import com.zsc.edu.gateway.modules.system.dto.RoleAuthorityDto; import com.zsc.edu.gateway.modules.system.entity.RoleAuthority; import org.mapstruct.Mapper; diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/RoleMapper.java b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/RoleMapper.java index ec03476..844ad2d 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/RoleMapper.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/RoleMapper.java @@ -1,6 +1,6 @@ package com.zsc.edu.gateway.modules.system.mapper; -import com.zsc.edu.gateway.common.mapstruct.BaseMapper; +import com.zsc.edu.gateway.framework.common.mapstruct.BaseMapper; import com.zsc.edu.gateway.modules.system.dto.RoleDto; import com.zsc.edu.gateway.modules.system.entity.Role; import org.mapstruct.Mapper; diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/UserMapper.java b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/UserMapper.java index 8819b6c..8b10001 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/mapper/UserMapper.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/mapper/UserMapper.java @@ -1,6 +1,6 @@ package com.zsc.edu.gateway.modules.system.mapper; -import com.zsc.edu.gateway.common.mapstruct.BaseMapper; +import com.zsc.edu.gateway.framework.common.mapstruct.BaseMapper; import com.zsc.edu.gateway.modules.system.dto.UserCreateDto; import com.zsc.edu.gateway.modules.system.entity.User; import org.mapstruct.Mapper; diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/AuthorityServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/AuthorityServiceImpl.java index 6836a89..2106894 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/AuthorityServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/AuthorityServiceImpl.java @@ -2,21 +2,16 @@ package com.zsc.edu.gateway.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zsc.edu.gateway.common.util.TreeUtil; import com.zsc.edu.gateway.exception.ConstraintException; import com.zsc.edu.gateway.modules.system.dto.AuthorityDto; //import com.zsc.edu.gateway.modules.system.dto.RoleAuthorityDto; import com.zsc.edu.gateway.modules.system.entity.Authority; -import com.zsc.edu.gateway.modules.system.entity.Dept; -import com.zsc.edu.gateway.modules.system.entity.Role; import com.zsc.edu.gateway.modules.system.mapper.AuthorityMapper; import com.zsc.edu.gateway.modules.system.repo.AuthorityRepository; import com.zsc.edu.gateway.modules.system.service.AuthorityService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Objects; import java.util.Set; /** diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java index 83fc465..7322921 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/service/impl/DeptServiceImpl.java @@ -2,7 +2,7 @@ package com.zsc.edu.gateway.modules.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zsc.edu.gateway.exception.ConstraintException; -import com.zsc.edu.gateway.common.util.TreeUtil; +import com.zsc.edu.gateway.framework.common.util.TreeUtil; import com.zsc.edu.gateway.modules.system.dto.DeptDto; import com.zsc.edu.gateway.modules.system.entity.Dept; import com.zsc.edu.gateway.modules.system.mapper.DeptMapper; diff --git a/src/main/resources/mappers/noticeMappers/BulletinMapper.xml b/src/main/resources/mappers/noticeMappers/BulletinMapper.xml index ec5d79c..87199ae 100644 --- a/src/main/resources/mappers/noticeMappers/BulletinMapper.xml +++ b/src/main/resources/mappers/noticeMappers/BulletinMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,49 +25,31 @@ - - + + - - + + \ No newline at end of file