add the function of deleteBatchNoticeType

Pinnacle/src/main/java/com/cfive/pinnacle/controller/NoticeController.java

@@ -9,6 +9,7 @@ import com.cfive.pinnacle.service.INoticeReceiveService;
 import com.cfive.pinnacle.service.INoticeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,6 +37,7 @@ public class NoticeController {
 
     //根据公告id查公告信息及发布人
     @GetMapping("/{nid}")
+    @PreAuthorize("hasAuthority('notice:manage:get')")
     public ResponseResult<Notice> selectByNoticeId(@PathVariable Long nid) {
         Notice noticeById = noticeService.selectByNoticeId(nid);
         Integer code = noticeById != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
@@ -45,6 +47,7 @@ public class NoticeController {
 
     //查询所有公告或模糊查询
     @GetMapping
+    @PreAuthorize("hasAuthority('notice:manage:get')")
     public ResponseResult<List<Notice>> selectAllNotice(String title, String type, String startTime, String endTime) {
         List<Notice> noticeList;
         if (!StringUtils.hasText(title) && !StringUtils.hasText(type) && !StringUtils.hasText(startTime) && !StringUtils.hasText(endTime)) {
@@ -60,6 +63,7 @@ public class NoticeController {
 
     //根据登录用户id查询所接收的公告
     @GetMapping("/self")
+    @PreAuthorize("hasAuthority('notice:self:get')")
     public ResponseResult<List<Notice>> selectByUserId(Integer readStatus) {
         List<Notice> noticesByUserId = noticeReceiveService.selectByUserId(readStatus);
         Integer code = noticesByUserId != null ? ResponseCode.DATABASE_SELECT_OK : ResponseCode.DATABASE_SELECT_ERROR;
@@ -69,6 +73,7 @@ public class NoticeController {
 
     //修改登录用户所接收公告的阅读状态
     @PutMapping("/modify_notice_read")
+    @PreAuthorize("hasAuthority('notice:self:get')")
     public ResponseResult<?> modifyNoticeIsRead(@RequestBody Notice notice) {
         Boolean updateById = false;
         if (null != notice) {
@@ -81,6 +86,7 @@ public class NoticeController {
 
     //更新公告
     @PutMapping
+    @PreAuthorize("hasAuthority('notice:manage:modify')")
     public ResponseResult<?> updateNotice(@RequestBody Notice notice) {
         Boolean updateById = noticeService.updateNotice(notice);
         String msg = updateById ? "" : "数据修改失败，请重试！";
@@ -89,6 +95,7 @@ public class NoticeController {
 
     //修改公告置顶状态
     @PutMapping("/update_notice_top")
+    @PreAuthorize("hasAuthority('notice:self:get')")
     public ResponseResult<?> updateNoticeTop(@RequestBody Notice notice) {
         String operationMessage = notice.getTop() == 1 ? "取消置顶" : "置顶";
         Boolean updateResult = noticeService.updateNoticeTop(notice);
@@ -98,6 +105,7 @@ public class NoticeController {
 
     //添加公告
     @PostMapping
+    @PreAuthorize("hasAuthority('notice:manage:add')")
     public ResponseResult<?> addNotice(@RequestBody Notice notice) {
         Boolean insertNotice = noticeService.addNotice(notice);
         String msg = insertNotice ? "" : "数据添加失败，请重试！";
@@ -106,6 +114,7 @@ public class NoticeController {
 
     //删除公告
     @DeleteMapping("/{nid}")
+    @PreAuthorize("hasAuthority('notice:manage:delete')")
     public ResponseResult<?> deleteByNoticeId(@PathVariable Long nid) {
         Boolean removeById = noticeService.deleteById(nid);
         String msg = removeById ? "" : "数据删除失败，请重试！";
@@ -114,6 +123,7 @@ public class NoticeController {
 
     //批量删除公告
     @PostMapping("/batch")
+    @PreAuthorize("hasAuthority('notice:manage:delete')")
     public ResponseResult<?> deleteBatchByIds(@RequestBody List<String> noticeIds){
         //	List<String>转List<Long>
         List<Long> nIds = noticeIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
@@ -124,6 +134,7 @@ public class NoticeController {
 
     //分页查询所有公告或分页模糊查询
     @GetMapping("/page")
+    @PreAuthorize("hasAuthority('notice:manage:get')")
     public ResponseResult<List<Notice>> selectPageAllNotice(Integer currentPage, Integer pageSize, String title, String type, String startTime, String endTime) {
         IPage<Notice> noticePageList;
         Page<Notice> page = new Page();

Pinnacle/src/main/java/com/cfive/pinnacle/controller/NoticeTypeController.java

@@ -13,6 +13,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -53,6 +54,7 @@ public class NoticeTypeController {
 
     //分页查询所有公告类型
     @GetMapping("/page")
+    @PreAuthorize("hasAuthority('notice:type:get')")
     public ResponseResult<List<NoticeType>> selectPageTypeList(Integer currentPage, Integer pageSize){
         Page<NoticeType> noticeTypePage=new Page<>();
         if (null != currentPage && null != pageSize) {
@@ -108,4 +110,15 @@ public class NoticeTypeController {
         String msg = removeById ? "" : "数据删除失败，请重试！";
         return ResponseResult.build(removeById ? ResponseCode.DATABASE_DELETE_OK : ResponseCode.DATABASE_DELETE_ERROR, msg, null);
     }
+
+    //批量删除公告
+    @PostMapping("/batch")
+    @PreAuthorize("hasAuthority('notice:manage:delete')")
+    public ResponseResult<?> deleteBatchByTypeIds(@RequestBody List<String> noticeTypeIds){
+        //	List<String>转List<Long>
+        List<Long> nTypeIds = noticeTypeIds.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+        Boolean deleteBatchByIds = noticeTypeService.deleteBatchByTypeIds(nTypeIds);
+        String msg = deleteBatchByIds ? "" : "数据删除失败，请重试！";
+        return ResponseResult.build(deleteBatchByIds ? ResponseCode.DATABASE_DELETE_OK : ResponseCode.DATABASE_DELETE_ERROR, msg, null);
+    }
 }

Pinnacle/src/main/java/com/cfive/pinnacle/service/INoticeTypeService.java

@@ -28,5 +28,7 @@ public interface INoticeTypeService extends IService<NoticeType> {
 
     Boolean deleteNoticeTypeById(Long typeId);
 
+    Boolean deleteBatchByTypeIds(List<Long> typeIds);
+
 
 }

Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeTypeServiceImpl.java

@@ -70,4 +70,9 @@ public class NoticeTypeServiceImpl extends ServiceImpl<NoticeTypeMapper, NoticeT
     public Boolean deleteNoticeTypeById(Long typeId) {
         return noticeTypeMapper.deleteById(typeId)>0;
     }
+
+    @Override
+    public Boolean deleteBatchByTypeIds(List<Long> typeIds) {
+        return noticeTypeMapper.deleteBatchIds(typeIds)>0;
+    }
 }

Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java

@@ -112,6 +112,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public User getUserWithPower(String username) {
         User user = userMapper.getOneWithPowerByUsername(username);
+        if (user == null) {
+            return null;
+        }
         if (user.getId() == 1L) {
             List<Menu> menus = menuMapper.selectList(Wrappers.emptyWrapper());
             List<Element> elements = elementMapper.selectList(Wrappers.emptyWrapper());