From e535b745eada1b862d2d9b87885397e9e2329e85 Mon Sep 17 00:00:00 2001 From: zhuangtianxiang <2913129173@qq.com> Date: Sat, 7 Dec 2024 17:31:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B6=88=E6=81=AF=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=8E=E9=83=A8=E9=97=A8=E6=A8=A1=E5=9D=97):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=B6=88=E6=81=AF=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?bug=E5=B9=B6=E4=BB=8E=E6=96=B0=E5=BB=BA=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=AD=E7=8B=AC=E7=AB=8B=E5=87=BA=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6=E6=8E=A5=E5=8F=A3=EF=BC=8C=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=A8=A1=E5=9D=97=E6=96=B0=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=91=E8=BF=94=E5=9B=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/gateway/exception/ApiExceptionHandler.java | 10 +++++----- .../gateway/framework/response/ResponseResult.java | 2 +- .../framework/security/SpringSecurityConfig.java | 2 +- .../controller/AttachmentController.java | 7 +++++++ .../attachment/repo/AttachmentRepository.java | 3 +++ .../attachment/service/AttachmentService.java | 2 ++ .../service/impl/AttachmentServiceImpl.java | 8 ++++++++ .../notice/service/impl/BulletinServiceImpl.java | 14 -------------- .../system/controller/AuthorityController.java | 2 +- .../mappers/noticeMappers/BulletinMapper.xml | 1 - .../zsc/edu/gateway/rest/RoleControllerTest.java | 2 +- 11 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java b/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java index 934bf3c..0e16523 100644 --- a/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java +++ b/src/main/java/com/zsc/edu/gateway/exception/ApiExceptionHandler.java @@ -66,10 +66,10 @@ public class ApiExceptionHandler { } //TODO 跟全局security 冲突 -// @ExceptionHandler(value = {Exception.class}) -// public ResponseEntity handleException(Exception ex) throws JsonProcessingException { -// log.error("Exception: {}", objectMapper.writeValueAsString(Map.of("msg", ex.getMessage()))); -// return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR); -// } + @ExceptionHandler(value = {Exception.class}) + public ResponseEntity handleException(Exception ex) throws JsonProcessingException { + log.error("Exception: {}", objectMapper.writeValueAsString(Map.of("msg", ex.getMessage()))); + return new ResponseEntity<>(objectMapper.writeValueAsString(Map.of("msg", ex.getMessage())), HttpStatus.INTERNAL_SERVER_ERROR); + } } diff --git a/src/main/java/com/zsc/edu/gateway/framework/response/ResponseResult.java b/src/main/java/com/zsc/edu/gateway/framework/response/ResponseResult.java index 0356316..dd8ca08 100644 --- a/src/main/java/com/zsc/edu/gateway/framework/response/ResponseResult.java +++ b/src/main/java/com/zsc/edu/gateway/framework/response/ResponseResult.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class ResponseResult { - +//TODO 返回封装处理 /** * 状态码 */ diff --git a/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java b/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java index cac0de0..cf55e91 100644 --- a/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java +++ b/src/main/java/com/zsc/edu/gateway/framework/security/SpringSecurityConfig.java @@ -24,7 +24,7 @@ import javax.sql.DataSource; * @author harry_yao */ @AllArgsConstructor -@EnableMethodSecurity +//@EnableMethodSecurity //TODO 加入全局注解会报错 @Configuration public class SpringSecurityConfig { 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 f6f074d..f7d2c29 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 @@ -91,4 +91,11 @@ public class AttachmentController { return attachments; } + /** + * 根据附件ID删除附件信息 + */ + @DeleteMapping("delete/{id}") + public Boolean delete(@PathVariable("id") String id) { + return service.delete(id); + } } diff --git a/src/main/java/com/zsc/edu/gateway/modules/attachment/repo/AttachmentRepository.java b/src/main/java/com/zsc/edu/gateway/modules/attachment/repo/AttachmentRepository.java index 53445b0..206cbb9 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/attachment/repo/AttachmentRepository.java +++ b/src/main/java/com/zsc/edu/gateway/modules/attachment/repo/AttachmentRepository.java @@ -2,6 +2,9 @@ package com.zsc.edu.gateway.modules.attachment.repo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zsc.edu.gateway.modules.attachment.entity.Attachment; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @author ftz 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 8101dba..c8f1014 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 @@ -20,4 +20,6 @@ public interface AttachmentService extends IService { Resource loadAsResource(String id); Attachment.Wrapper loadAsWrapper(String id); + + 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 a2c0636..d479e05 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,6 +1,7 @@ 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; @@ -201,4 +202,11 @@ public class AttachmentServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id", id); + return remove(queryWrapper); + } + } 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 b054120..a3c70d3 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 @@ -48,20 +48,6 @@ public class BulletinServiceImpl extends ServiceImpl bulletins = repo.selectByBulletinId(id); -// if (bulletins.isEmpty()) { -// return Collections.emptyList(); -// } -// for (BulletinVo bulletin : bulletins) { -// if (state != null) { -// bulletin.getState().checkStatus(state); -// } -// bulletin.setEditUsername(userRepository.selectNameById(bulletin.getEditUserId())); -// bulletin.setPublishUsername(userRepository.selectNameById(bulletin.getPublishUserId())); -// bulletin.setCloseUsername(userRepository.selectNameById(bulletin.getCloseUserId())); -// } -// -// return bulletins; BulletinVo bulletinVo = repo.selectByBulletinId(id); if (state != null) { bulletinVo.getState().checkStatus(state); diff --git a/src/main/java/com/zsc/edu/gateway/modules/system/controller/AuthorityController.java b/src/main/java/com/zsc/edu/gateway/modules/system/controller/AuthorityController.java index c193743..3fe7b9c 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/system/controller/AuthorityController.java +++ b/src/main/java/com/zsc/edu/gateway/modules/system/controller/AuthorityController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/rest/authority") public class AuthorityController { - + //TODO 导入IOT private AuthorityService service; /** diff --git a/src/main/resources/mappers/noticeMappers/BulletinMapper.xml b/src/main/resources/mappers/noticeMappers/BulletinMapper.xml index ed4dec6..ec5d79c 100644 --- a/src/main/resources/mappers/noticeMappers/BulletinMapper.xml +++ b/src/main/resources/mappers/noticeMappers/BulletinMapper.xml @@ -31,7 +31,6 @@