page = new Page<>(current, size); - Page articlePage = articleService.getArticlePagAdmine(page, keyword); + Page articlePage = articleService.getArticlePagAdmin(page, keyword); return PageResponse.of( (int) articlePage.getCurrent(), diff --git a/src/main/java/cn/cxdproject/coder/controller/DramaController.java b/src/main/java/cn/cxdproject/coder/controller/DramaController.java index eed0712..682d331 100644 --- a/src/main/java/cn/cxdproject/coder/controller/DramaController.java +++ b/src/main/java/cn/cxdproject/coder/controller/DramaController.java @@ -81,9 +81,6 @@ public CursorPageResponseVO page( return new CursorPageResponseVO<>(list, nextCursor); } - // ==================== 普通用户接口 ==================== - - // ==================== 管理员接口 ==================== /** @@ -97,6 +94,7 @@ public ApiResponse updateDramaByAdmin( return ApiResponse.success(dramaVO); } + //管理员分页 @GetMapping("/admin/page") public PageResponse getDramaPageAdmin( @RequestParam(defaultValue = "1") Integer current, diff --git a/src/main/java/cn/cxdproject/coder/controller/HotelController.java b/src/main/java/cn/cxdproject/coder/controller/HotelController.java index 0363659..dc6af4a 100644 --- a/src/main/java/cn/cxdproject/coder/controller/HotelController.java +++ b/src/main/java/cn/cxdproject/coder/controller/HotelController.java @@ -73,21 +73,7 @@ public CursorPageResponseVO page( return new CursorPageResponseVO<>(list, nextCursor); } - // ==================== 管理员接口 ==================== - - /** - * 管理员创建旅店信息 - */ - @PostMapping("/admin/create") - public ApiResponse createHotelByAdmin(@Valid @RequestBody CreateHotelDTO createDTO) { - User currentUser = AuthContext.getCurrentUser(); - if (currentUser == null) { - return ApiResponse.error(401, "未登录"); - } - HotelVO hotelVO = hotelService.createHotelByAdmin(currentUser.getId(),createDTO); - return ApiResponse.success(hotelVO); - } - + //用户分页查询（游标分页） @GetMapping("/admin/page") public PageResponse getHotelPageAdmin( @RequestParam(defaultValue = "1") Integer current, @@ -105,6 +91,23 @@ public PageResponse getHotelPageAdmin( ); } + + // ==================== 管理员接口 ==================== + + /** + * 管理员创建旅店信息 + */ + @PostMapping("/admin/create") + public ApiResponse createHotelByAdmin(@Valid @RequestBody CreateHotelDTO createDTO) { + User currentUser = AuthContext.getCurrentUser(); + if (currentUser == null) { + return ApiResponse.error(401, "未登录"); + } + HotelVO hotelVO = hotelService.createHotelByAdmin(currentUser.getId(),createDTO); + return ApiResponse.success(hotelVO); + } + + /** * 管理员更新旅店 */ diff --git a/src/main/java/cn/cxdproject/coder/controller/LocationController.java b/src/main/java/cn/cxdproject/coder/controller/LocationController.java index 817f90d..68fdc98 100644 --- a/src/main/java/cn/cxdproject/coder/controller/LocationController.java +++ b/src/main/java/cn/cxdproject/coder/controller/LocationController.java @@ -81,7 +81,6 @@ public CursorPageResponseVO page( return new CursorPageResponseVO<>(list, nextCursor); } - // ==================== 普通用户接口 ==================== // ==================== 管理员接口 ==================== @@ -99,6 +98,7 @@ public ApiResponse createLocation(@Valid @RequestBody CreateLocation return ApiResponse.success(locationVO); } + //管理员分页 @GetMapping("/admin/page") public PageResponse getLocationPageAdmin( @RequestParam(defaultValue = "1") Integer current, diff --git a/src/main/java/cn/cxdproject/coder/controller/OperationLogController.java b/src/main/java/cn/cxdproject/coder/controller/OperationLogController.java index a09ca9a..d174308 100644 --- a/src/main/java/cn/cxdproject/coder/controller/OperationLogController.java +++ b/src/main/java/cn/cxdproject/coder/controller/OperationLogController.java @@ -1,6 +1,12 @@ package cn.cxdproject.coder.controller; +import cn.cxdproject.coder.common.PageResponse; +import cn.cxdproject.coder.common.anno.PublicAccess; +import cn.cxdproject.coder.model.dto.UpdateArticleDTO; +import cn.cxdproject.coder.model.entity.Article; import cn.cxdproject.coder.model.entity.OperationLog; +import cn.cxdproject.coder.model.vo.ArticleVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; import cn.cxdproject.coder.service.OperationLogService; import cn.cxdproject.coder.common.ApiResponse; import cn.cxdproject.coder.common.PageRequest; @@ -8,6 +14,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -24,74 +32,41 @@ public OperationLogController(OperationLogService operationLogService) { this.operationLogService = operationLogService; } - /** - * 新增 OperationLog 记录 - * @param entity 实体对象 - * @return 是否新增成功 - */ - @PostMapping - public ApiResponse add(@RequestBody OperationLog entity) { - return ApiResponse.success(operationLogService.save(entity)); - } + //分页获取操作信息 + @GetMapping("/admin/page") + public PageResponse getOperationPageAdmin( + @RequestParam(defaultValue = "1") Integer current, + @RequestParam(defaultValue = "10") Integer size, + @RequestParam(required = false) String keyword) { - /** - * 更新 OperationLog 记录 - * @param entity 实体对象（必须包含主键 ID） - * @return 是否更新成功 - */ - @PutMapping - public ApiResponse update(@RequestBody OperationLog entity) { - return ApiResponse.success(operationLogService.updateById(entity)); - } + Page page = new Page<>(current, size); + Page operationPage = operationLogService.getOperationPage(page, keyword); - /** - * 删除指定 ID 的 OperationLog 记录 - * @param id 主键 ID - * @return 是否删除成功 - */ - @DeleteMapping("/{id}") - public ApiResponse delete(@PathVariable("id") Integer id) { - return ApiResponse.success(operationLogService.removeById(id)); + return PageResponse.of( + (int) operationPage.getCurrent(), + (int) operationPage.getSize(), + operationPage.getTotal(), + operationPage.getRecords() + ); } - /** - * 根据 ID 获取 OperationLog 详情 - * @param id 主键 ID - * @return 匹配的实体对象 - */ - @GetMapping("/{id}") - public ApiResponse getById(@PathVariable("id") Integer id) { - return ApiResponse.success(operationLogService.getById(id)); + //根据id获取操作信息 + @GetMapping("/admin/{id}") + @PublicAccess + public ApiResponse getOperationById(@PathVariable @NotNull(message = "记录ID不能为空") Long id) { + OperationLogVO operationLogVO = operationLogService.getOperationById(id); + return ApiResponse.success(operationLogVO); } - /** - * 获取所有 OperationLog 列表（不分页） - * @return 实体列表 - */ - @GetMapping - public ApiResponse> list() { - return ApiResponse.success(operationLogService.list()); - } /** - * 分页查询 OperationLog 列表 - * 支持关键字模糊搜索与排序 - * @param pageRequest 分页与筛选请求参数 - * @return 分页结果 + * 管理员删除文章 */ - @PostMapping("/page") - public ApiResponse> getPage(@RequestBody PageRequest pageRequest) { - Page page = new Page<>(pageRequest.getPage(), pageRequest.getSize()); - QueryWrapper wrapper = new QueryWrapper<>(); - - if (pageRequest.getKeyword() != null && !pageRequest.getKeyword().isEmpty()) { - wrapper.like("name", pageRequest.getKeyword()); // 可自定义字段 - } + @DeleteMapping("/admin/delete/{id}") + public ApiResponse deleteOperation(@PathVariable @NotNull(message = "记录ID不能为空") Long id) { + operationLogService.deleteArticle(id); + return ApiResponse.success(); + } - if (pageRequest.getSortBy() != null && !pageRequest.getSortBy().isEmpty()) { - wrapper.orderBy(true, "asc".equalsIgnoreCase(pageRequest.getSortOrder()), pageRequest.getSortBy()); - } - return ApiResponse.success(operationLogService.page(page, wrapper)); - } } diff --git a/src/main/java/cn/cxdproject/coder/controller/PolicyController.java b/src/main/java/cn/cxdproject/coder/controller/PolicyController.java index 0382d4c..4b2c796 100644 --- a/src/main/java/cn/cxdproject/coder/controller/PolicyController.java +++ b/src/main/java/cn/cxdproject/coder/controller/PolicyController.java @@ -77,7 +77,6 @@ public CursorPageResponseVO page( return new CursorPageResponseVO<>(list, nextCursor); } - // ==================== 普通用户接口 ==================== // ==================== 管理员接口 ==================== @@ -95,6 +94,7 @@ public ApiResponse createPolicy(@Valid @RequestBody CreatePolicyDTO cr return ApiResponse.success(policyVO); } + //管理员分页查询 @GetMapping("/admin/page") public PageResponse getPolicyPageAdmin( @RequestParam(defaultValue = "1") Integer current, diff --git a/src/main/java/cn/cxdproject/coder/controller/ReportController.java b/src/main/java/cn/cxdproject/coder/controller/ReportController.java index 3cf1b49..b0041e4 100644 --- a/src/main/java/cn/cxdproject/coder/controller/ReportController.java +++ b/src/main/java/cn/cxdproject/coder/controller/ReportController.java @@ -2,10 +2,10 @@ import cn.cxdproject.coder.common.ApiResponse; import cn.cxdproject.coder.common.PageResponse; -import cn.cxdproject.coder.common.anno.PublicAccess; import cn.cxdproject.coder.common.context.AuthContext; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; @@ -69,7 +69,7 @@ public ApiResponse createReport(@Valid @RequestBody CreateReportDTO cr @PutMapping("/update/{id}") public ApiResponse updateReport( @PathVariable @NotNull(message = "ID不能为空") Long id, - @Valid @RequestBody UpdateReportDTO updateDTO) { + @Valid @RequestBody UpdateReportUserDTO updateDTO) { User currentUser = AuthContext.getCurrentUser(); if (currentUser == null) { return ApiResponse.error(401, "未登录"); @@ -128,7 +128,7 @@ public PageResponse getMyReportPage( @PutMapping("/admin/update/{id}") public ApiResponse updateReportByAdmin( @PathVariable @NotNull(message = "ID不能为空") Long id, - @Valid @RequestBody UpdateReportDTO updateDTO) { + @Valid @RequestBody UpdateReportAdminDTO updateDTO) { ReportVO reportVO = reportService.updateReportByAdmin(id, updateDTO); return ApiResponse.success(reportVO); } diff --git a/src/main/java/cn/cxdproject/coder/mapper/ArticleMapper.java b/src/main/java/cn/cxdproject/coder/mapper/ArticleMapper.java index 5ef1323..a01b214 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/ArticleMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/ArticleMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateArticleDTO; import cn.cxdproject.coder.model.entity.Banner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.cxdproject.coder.model.entity.Article; @@ -30,4 +31,9 @@ List getAdminPage( List selectLatest10(); + int updateArticle( + @Param("articleId") Long articleId, + @Param("dto") UpdateArticleDTO updateArticleDTO + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java b/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java index 4c8aac7..b9b82b5 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateDramaDTO; import cn.cxdproject.coder.model.entity.Article; import cn.cxdproject.coder.model.entity.Banner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -27,7 +28,11 @@ List getAdminPage( ); - List selectLatest10(); + int updateDrama( + @Param("dramaId") Long dramaId, + @Param("dto") UpdateDramaDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java b/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java index e441d48..cbf8bdc 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateHotelDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Hotel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -21,4 +22,8 @@ List getAdminPage( ); List selectLatest10(); + + int updateHotel(@Param("id") Long id, + @Param("dto") UpdateHotelDTO dto + ); } diff --git a/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java b/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java index e05b5f9..847e248 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateLocationDTO; import cn.cxdproject.coder.model.entity.Article; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Drama; @@ -27,8 +28,10 @@ List getAdminPage( @Param("size") long size ); - - - List selectLatest10(); + + int updateLocation( + @Param("id") Long id, + @Param("dto") UpdateLocationDTO dto + ); } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java b/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java index 9afbe9e..59a9331 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java @@ -1,8 +1,12 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.entity.Banner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.cxdproject.coder.model.entity.OperationLog; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * OperationLog Mapper 接口 @@ -11,4 +15,10 @@ @Mapper public interface OperationLogMapper extends BaseMapper { + List getPage( + @Param("keyword") String keyword, + @Param("offset") long offset, + @Param("size") long size + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java b/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java index 8c28e6a..274a579 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdatePolicyDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Location; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -25,7 +26,11 @@ List getAdminPage( @Param("size") long size ); - List selectLatest10(); + int updatePolicy( + @Param("id") Long id, + @Param("dto") UpdatePolicyDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java b/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java index 5a239d0..7995a2b 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.cxdproject.coder.model.entity.Report; import org.apache.ibatis.annotations.Mapper; @@ -26,5 +27,15 @@ List selectPageByAdmin( @Param("size") long size ); + int updateReportByUser( + @Param("id") Long id, + @Param("dto") UpdateReportUserDTO dto + ); + + int updateReportByAdmin( + @Param("id") Long id, + @Param("status") String status + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java b/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java index c0de075..5e31730 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateShootDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Drama; import cn.cxdproject.coder.model.entity.Location; @@ -27,7 +28,11 @@ List getAdminPage( @Param("size") long size ); - List selectLatest10(); + int updateShoot( + @Param("id") Long id, + @Param("dto") UpdateShootDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java b/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java index a4fca5c..d0ad1a4 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateTourDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Shoot; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -28,4 +29,9 @@ List getAdminPage( List selectLatest10(); + int updateTour( + @Param("id") Long id, + @Param("dto") UpdateTourDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java new file mode 100644 index 0000000..e4ec377 --- /dev/null +++ b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java @@ -0,0 +1,8 @@ +package cn.cxdproject.coder.model.dto; + +import lombok.Data; + +@Data +public class UpdateReportAdminDTO { + private String status; +} diff --git a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java similarity index 93% rename from src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java rename to src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java index 4c5b443..629060e 100644 --- a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java +++ b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java @@ -11,7 +11,7 @@ * @author heathcetide */ @Data -public class UpdateReportDTO { +public class UpdateReportUserDTO { private String name; private String type; @@ -27,7 +27,6 @@ public class UpdateReportDTO { private String contact; private String phoneNumber; private String crewPosition; - private String status; private String shootPermit; private String thumbShootPermit; private String approvalFile; diff --git a/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java b/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java new file mode 100644 index 0000000..f145663 --- /dev/null +++ b/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java @@ -0,0 +1,60 @@ +package cn.cxdproject.coder.model.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OperationLogVO { + + private Long id; + + /** + * 操作类型（如：LOGIN、DOC_EDIT） + */ + private String type; + + /** + * 操作描述 + */ + private String description; + + /** + * 执行用户ID + */ + private Long userId; + + /** + * 操作人标识（用户名或IP） + */ + private String operator; + + /** + * 是否成功 + */ + private Boolean success; + + /** + * 输入参数快照 + */ + private String params; + + /** + * 输出结果快照 + */ + private String result; + + /** + * 操作时间 + */ + private LocalDateTime timestamp; + +} diff --git a/src/main/java/cn/cxdproject/coder/service/ArticleService.java b/src/main/java/cn/cxdproject/coder/service/ArticleService.java index c7dbc71..9ab0784 100644 --- a/src/main/java/cn/cxdproject/coder/service/ArticleService.java +++ b/src/main/java/cn/cxdproject/coder/service/ArticleService.java @@ -70,5 +70,5 @@ public interface ArticleService extends IService { List getPageFallback(Long lastId, int size, String keyword, Throwable e); - Page getArticlePagAdmine(Page page, String keyword); + Page getArticlePagAdmin(Page page, String keyword); } diff --git a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java index b602817..227a2c7 100644 --- a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java +++ b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java @@ -1,5 +1,9 @@ package cn.cxdproject.coder.service; +import cn.cxdproject.coder.model.entity.Location; +import cn.cxdproject.coder.model.vo.LocationVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.cxdproject.coder.model.entity.OperationLog; @@ -9,4 +13,11 @@ */ public interface OperationLogService extends IService { + OperationLogVO getOperationById(Long id); + + void deleteArticle(Long id); + + Page getOperationPage(Page page, String keyword); + + OperationLogVO toOperationVO(OperationLog operationLog); } diff --git a/src/main/java/cn/cxdproject/coder/service/ReportService.java b/src/main/java/cn/cxdproject/coder/service/ReportService.java index 8b93098..ac81cc6 100644 --- a/src/main/java/cn/cxdproject/coder/service/ReportService.java +++ b/src/main/java/cn/cxdproject/coder/service/ReportService.java @@ -1,7 +1,8 @@ package cn.cxdproject.coder.service; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.vo.ReportVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,11 +15,11 @@ public interface ReportService extends IService { ReportVO createReport(Long userId, CreateReportDTO createDTO); - ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO); void deleteReport(Long userId, Long reportId); ReportVO getReportById(Long reportId,Long userId); Page getMyReportPage(Long userId, Page page); - ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO); Page getReportPageByAdmin(Page page, String keyword); ReportVO getReportByIdByAdmin(Long reportId); ReportVO toReportVO(Report report); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java index 46a35bf..89ed4a1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java @@ -1,7 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateArticleDTO; @@ -59,6 +61,10 @@ public ArticleServiceImpl( @Override @CircuitBreaker(name = "articleGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_GET, + value = "Get article by ID: #{#articleId}" + ) public ArticleVO getArticleById(Long articleId) { Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { @@ -68,7 +74,7 @@ public ArticleVO getArticleById(Long articleId) { if (article == null || Boolean.TRUE.equals(article.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); + cache.put(CaffeineConstants.ARTICLE + articleId, article); return toArticleVO(article); } } @@ -77,6 +83,10 @@ public ArticleVO getArticleById(Long articleId) { @Override @CircuitBreaker(name = "articleGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get page " + ) public List getArticlePage(Long lastId, int size, String keyword) { List ids = articleMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -96,7 +106,10 @@ public List getArticlePage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_CREATE, + value = "Create article " + ) public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { // 获取当前管理员用户 User currentUser = AuthContext.getCurrentUser(); @@ -124,26 +137,40 @@ public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_UPDATE, + value = "update article ID: #{#articleId}" + ) public ArticleVO updateArticleByAdmin(Long articleId, UpdateArticleDTO updateDTO) { - Article article = this.getById(articleId); - if (article == null || Boolean.TRUE.equals(article.getDeleted())) { + // 1. 先校验文章是否存在且未删除（必须做，用于抛出 NotFoundException） + Article existing = this.getById(articleId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) article.setTitle(updateDTO.getTitle()); - if (updateDTO.getIssueUnit() != null) article.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getContent() != null) article.setContent(updateDTO.getContent()); - if (updateDTO.getThumbImage() != null) article.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新（只更新非空字段） + int updated = articleMapper.updateArticle(articleId,updateDTO); + // 3. 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); - this.updateById(article); - return toArticleVO(article); + // 4. 重新加载最新数据 + Article updatedArticle = this.getById(articleId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.ARTICLE + articleId, updatedArticle); + + // 6. 返回 VO + return toArticleVO(updatedArticle); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_DELETE, + value = "Delete article ID: #{#articleId}" + ) public void deleteArticleByAdmin(Long articleId) { boolean updated = articleMapper.update(null, Wrappers.lambdaUpdate() @@ -183,22 +210,26 @@ public ArticleVO toArticleVO(Article article) { @Override public ArticleVO getByIdFallback(Long articleId,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); - if (store != null) { - return toArticleVO((Article) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.ARTICLE+articleId); + + Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { - Article article = JsonUtils.fromJson((String) store, Article.class); - return toArticleVO(article); + return toArticleVO((Article) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.ARTICLE); @@ -221,7 +252,12 @@ public List getPageFallback(Long lastId, int size, String keyword, Th } @Override - public Page getArticlePagAdmine(Page page, String keyword) { + @Loggable( + type = LogType.ARTICLE_ADMIN_GET_PAGE, + value = "Admin get article page" + ) + public Page getArticlePagAdmin(Page page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean
getAdminPage( List selectLatest10(); + int updateArticle( + @Param("articleId") Long articleId, + @Param("dto") UpdateArticleDTO updateArticleDTO + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java b/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java index 4c8aac7..b9b82b5 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateDramaDTO; import cn.cxdproject.coder.model.entity.Article; import cn.cxdproject.coder.model.entity.Banner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -27,7 +28,11 @@ List getAdminPage( ); - List selectLatest10(); + int updateDrama( + @Param("dramaId") Long dramaId, + @Param("dto") UpdateDramaDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java b/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java index e441d48..cbf8bdc 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateHotelDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Hotel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -21,4 +22,8 @@ List getAdminPage( ); List selectLatest10(); + + int updateHotel(@Param("id") Long id, + @Param("dto") UpdateHotelDTO dto + ); } diff --git a/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java b/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java index e05b5f9..847e248 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateLocationDTO; import cn.cxdproject.coder.model.entity.Article; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Drama; @@ -27,8 +28,10 @@ List getAdminPage( @Param("size") long size ); - - - List selectLatest10(); + + int updateLocation( + @Param("id") Long id, + @Param("dto") UpdateLocationDTO dto + ); } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java b/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java index 9afbe9e..59a9331 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java @@ -1,8 +1,12 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.entity.Banner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.cxdproject.coder.model.entity.OperationLog; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * OperationLog Mapper 接口 @@ -11,4 +15,10 @@ @Mapper public interface OperationLogMapper extends BaseMapper { + List getPage( + @Param("keyword") String keyword, + @Param("offset") long offset, + @Param("size") long size + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java b/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java index 8c28e6a..274a579 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdatePolicyDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Location; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -25,7 +26,11 @@ List getAdminPage( @Param("size") long size ); - List selectLatest10(); + int updatePolicy( + @Param("id") Long id, + @Param("dto") UpdatePolicyDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java b/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java index 5a239d0..7995a2b 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.cxdproject.coder.model.entity.Report; import org.apache.ibatis.annotations.Mapper; @@ -26,5 +27,15 @@ List selectPageByAdmin( @Param("size") long size ); + int updateReportByUser( + @Param("id") Long id, + @Param("dto") UpdateReportUserDTO dto + ); + + int updateReportByAdmin( + @Param("id") Long id, + @Param("status") String status + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java b/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java index c0de075..5e31730 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateShootDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Drama; import cn.cxdproject.coder.model.entity.Location; @@ -27,7 +28,11 @@ List getAdminPage( @Param("size") long size ); - List selectLatest10(); + int updateShoot( + @Param("id") Long id, + @Param("dto") UpdateShootDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java b/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java index a4fca5c..d0ad1a4 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateTourDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Shoot; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -28,4 +29,9 @@ List getAdminPage( List selectLatest10(); + int updateTour( + @Param("id") Long id, + @Param("dto") UpdateTourDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java new file mode 100644 index 0000000..e4ec377 --- /dev/null +++ b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java @@ -0,0 +1,8 @@ +package cn.cxdproject.coder.model.dto; + +import lombok.Data; + +@Data +public class UpdateReportAdminDTO { + private String status; +} diff --git a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java similarity index 93% rename from src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java rename to src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java index 4c5b443..629060e 100644 --- a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java +++ b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java @@ -11,7 +11,7 @@ * @author heathcetide */ @Data -public class UpdateReportDTO { +public class UpdateReportUserDTO { private String name; private String type; @@ -27,7 +27,6 @@ public class UpdateReportDTO { private String contact; private String phoneNumber; private String crewPosition; - private String status; private String shootPermit; private String thumbShootPermit; private String approvalFile; diff --git a/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java b/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java new file mode 100644 index 0000000..f145663 --- /dev/null +++ b/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java @@ -0,0 +1,60 @@ +package cn.cxdproject.coder.model.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OperationLogVO { + + private Long id; + + /** + * 操作类型（如：LOGIN、DOC_EDIT） + */ + private String type; + + /** + * 操作描述 + */ + private String description; + + /** + * 执行用户ID + */ + private Long userId; + + /** + * 操作人标识（用户名或IP） + */ + private String operator; + + /** + * 是否成功 + */ + private Boolean success; + + /** + * 输入参数快照 + */ + private String params; + + /** + * 输出结果快照 + */ + private String result; + + /** + * 操作时间 + */ + private LocalDateTime timestamp; + +} diff --git a/src/main/java/cn/cxdproject/coder/service/ArticleService.java b/src/main/java/cn/cxdproject/coder/service/ArticleService.java index c7dbc71..9ab0784 100644 --- a/src/main/java/cn/cxdproject/coder/service/ArticleService.java +++ b/src/main/java/cn/cxdproject/coder/service/ArticleService.java @@ -70,5 +70,5 @@ public interface ArticleService extends IService { List getPageFallback(Long lastId, int size, String keyword, Throwable e); - Page getArticlePagAdmine(Page page, String keyword); + Page getArticlePagAdmin(Page page, String keyword); } diff --git a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java index b602817..227a2c7 100644 --- a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java +++ b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java @@ -1,5 +1,9 @@ package cn.cxdproject.coder.service; +import cn.cxdproject.coder.model.entity.Location; +import cn.cxdproject.coder.model.vo.LocationVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.cxdproject.coder.model.entity.OperationLog; @@ -9,4 +13,11 @@ */ public interface OperationLogService extends IService { + OperationLogVO getOperationById(Long id); + + void deleteArticle(Long id); + + Page getOperationPage(Page page, String keyword); + + OperationLogVO toOperationVO(OperationLog operationLog); } diff --git a/src/main/java/cn/cxdproject/coder/service/ReportService.java b/src/main/java/cn/cxdproject/coder/service/ReportService.java index 8b93098..ac81cc6 100644 --- a/src/main/java/cn/cxdproject/coder/service/ReportService.java +++ b/src/main/java/cn/cxdproject/coder/service/ReportService.java @@ -1,7 +1,8 @@ package cn.cxdproject.coder.service; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.vo.ReportVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,11 +15,11 @@ public interface ReportService extends IService { ReportVO createReport(Long userId, CreateReportDTO createDTO); - ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO); void deleteReport(Long userId, Long reportId); ReportVO getReportById(Long reportId,Long userId); Page getMyReportPage(Long userId, Page page); - ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO); Page getReportPageByAdmin(Page page, String keyword); ReportVO getReportByIdByAdmin(Long reportId); ReportVO toReportVO(Report report); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java index 46a35bf..89ed4a1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java @@ -1,7 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateArticleDTO; @@ -59,6 +61,10 @@ public ArticleServiceImpl( @Override @CircuitBreaker(name = "articleGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_GET, + value = "Get article by ID: #{#articleId}" + ) public ArticleVO getArticleById(Long articleId) { Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { @@ -68,7 +74,7 @@ public ArticleVO getArticleById(Long articleId) { if (article == null || Boolean.TRUE.equals(article.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); + cache.put(CaffeineConstants.ARTICLE + articleId, article); return toArticleVO(article); } } @@ -77,6 +83,10 @@ public ArticleVO getArticleById(Long articleId) { @Override @CircuitBreaker(name = "articleGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get page " + ) public List getArticlePage(Long lastId, int size, String keyword) { List ids = articleMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -96,7 +106,10 @@ public List getArticlePage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_CREATE, + value = "Create article " + ) public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { // 获取当前管理员用户 User currentUser = AuthContext.getCurrentUser(); @@ -124,26 +137,40 @@ public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_UPDATE, + value = "update article ID: #{#articleId}" + ) public ArticleVO updateArticleByAdmin(Long articleId, UpdateArticleDTO updateDTO) { - Article article = this.getById(articleId); - if (article == null || Boolean.TRUE.equals(article.getDeleted())) { + // 1. 先校验文章是否存在且未删除（必须做，用于抛出 NotFoundException） + Article existing = this.getById(articleId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) article.setTitle(updateDTO.getTitle()); - if (updateDTO.getIssueUnit() != null) article.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getContent() != null) article.setContent(updateDTO.getContent()); - if (updateDTO.getThumbImage() != null) article.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新（只更新非空字段） + int updated = articleMapper.updateArticle(articleId,updateDTO); + // 3. 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); - this.updateById(article); - return toArticleVO(article); + // 4. 重新加载最新数据 + Article updatedArticle = this.getById(articleId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.ARTICLE + articleId, updatedArticle); + + // 6. 返回 VO + return toArticleVO(updatedArticle); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_DELETE, + value = "Delete article ID: #{#articleId}" + ) public void deleteArticleByAdmin(Long articleId) { boolean updated = articleMapper.update(null, Wrappers.lambdaUpdate() @@ -183,22 +210,26 @@ public ArticleVO toArticleVO(Article article) { @Override public ArticleVO getByIdFallback(Long articleId,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); - if (store != null) { - return toArticleVO((Article) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.ARTICLE+articleId); + + Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { - Article article = JsonUtils.fromJson((String) store, Article.class); - return toArticleVO(article); + return toArticleVO((Article) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.ARTICLE); @@ -221,7 +252,12 @@ public List getPageFallback(Long lastId, int size, String keyword, Th } @Override - public Page getArticlePagAdmine(Page page, String keyword) { + @Loggable( + type = LogType.ARTICLE_ADMIN_GET_PAGE, + value = "Admin get article page" + ) + public Page getArticlePagAdmin(Page page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean
selectLatest10(); + int updateArticle( + @Param("articleId") Long articleId, + @Param("dto") UpdateArticleDTO updateArticleDTO + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java b/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java index 4c8aac7..b9b82b5 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/DramaMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateDramaDTO; import cn.cxdproject.coder.model.entity.Article; import cn.cxdproject.coder.model.entity.Banner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -27,7 +28,11 @@ List getAdminPage( ); - List selectLatest10(); + int updateDrama( + @Param("dramaId") Long dramaId, + @Param("dto") UpdateDramaDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java b/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java index e441d48..cbf8bdc 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/HotelMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateHotelDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Hotel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -21,4 +22,8 @@ List getAdminPage( ); List selectLatest10(); + + int updateHotel(@Param("id") Long id, + @Param("dto") UpdateHotelDTO dto + ); } diff --git a/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java b/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java index e05b5f9..847e248 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/LocationMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateLocationDTO; import cn.cxdproject.coder.model.entity.Article; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Drama; @@ -27,8 +28,10 @@ List getAdminPage( @Param("size") long size ); - - - List selectLatest10(); + + int updateLocation( + @Param("id") Long id, + @Param("dto") UpdateLocationDTO dto + ); } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java b/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java index 9afbe9e..59a9331 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/OperationLogMapper.java @@ -1,8 +1,12 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.entity.Banner; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.cxdproject.coder.model.entity.OperationLog; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * OperationLog Mapper 接口 @@ -11,4 +15,10 @@ @Mapper public interface OperationLogMapper extends BaseMapper { + List getPage( + @Param("keyword") String keyword, + @Param("offset") long offset, + @Param("size") long size + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java b/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java index 8c28e6a..274a579 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/PolicyMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdatePolicyDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Location; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -25,7 +26,11 @@ List getAdminPage( @Param("size") long size ); - List selectLatest10(); + int updatePolicy( + @Param("id") Long id, + @Param("dto") UpdatePolicyDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java b/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java index 5a239d0..7995a2b 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/ReportMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.cxdproject.coder.model.entity.Report; import org.apache.ibatis.annotations.Mapper; @@ -26,5 +27,15 @@ List selectPageByAdmin( @Param("size") long size ); + int updateReportByUser( + @Param("id") Long id, + @Param("dto") UpdateReportUserDTO dto + ); + + int updateReportByAdmin( + @Param("id") Long id, + @Param("status") String status + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java b/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java index c0de075..5e31730 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/ShootMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateShootDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Drama; import cn.cxdproject.coder.model.entity.Location; @@ -27,7 +28,11 @@ List getAdminPage( @Param("size") long size ); - List selectLatest10(); + int updateShoot( + @Param("id") Long id, + @Param("dto") UpdateShootDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java b/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java index a4fca5c..d0ad1a4 100644 --- a/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java +++ b/src/main/java/cn/cxdproject/coder/mapper/TourMapper.java @@ -1,5 +1,6 @@ package cn.cxdproject.coder.mapper; +import cn.cxdproject.coder.model.dto.UpdateTourDTO; import cn.cxdproject.coder.model.entity.Banner; import cn.cxdproject.coder.model.entity.Shoot; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -28,4 +29,9 @@ List getAdminPage( List selectLatest10(); + int updateTour( + @Param("id") Long id, + @Param("dto") UpdateTourDTO dto + ); + } \ No newline at end of file diff --git a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java new file mode 100644 index 0000000..e4ec377 --- /dev/null +++ b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportAdminDTO.java @@ -0,0 +1,8 @@ +package cn.cxdproject.coder.model.dto; + +import lombok.Data; + +@Data +public class UpdateReportAdminDTO { + private String status; +} diff --git a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java similarity index 93% rename from src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java rename to src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java index 4c5b443..629060e 100644 --- a/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportDTO.java +++ b/src/main/java/cn/cxdproject/coder/model/dto/UpdateReportUserDTO.java @@ -11,7 +11,7 @@ * @author heathcetide */ @Data -public class UpdateReportDTO { +public class UpdateReportUserDTO { private String name; private String type; @@ -27,7 +27,6 @@ public class UpdateReportDTO { private String contact; private String phoneNumber; private String crewPosition; - private String status; private String shootPermit; private String thumbShootPermit; private String approvalFile; diff --git a/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java b/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java new file mode 100644 index 0000000..f145663 --- /dev/null +++ b/src/main/java/cn/cxdproject/coder/model/vo/OperationLogVO.java @@ -0,0 +1,60 @@ +package cn.cxdproject.coder.model.vo; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OperationLogVO { + + private Long id; + + /** + * 操作类型（如：LOGIN、DOC_EDIT） + */ + private String type; + + /** + * 操作描述 + */ + private String description; + + /** + * 执行用户ID + */ + private Long userId; + + /** + * 操作人标识（用户名或IP） + */ + private String operator; + + /** + * 是否成功 + */ + private Boolean success; + + /** + * 输入参数快照 + */ + private String params; + + /** + * 输出结果快照 + */ + private String result; + + /** + * 操作时间 + */ + private LocalDateTime timestamp; + +} diff --git a/src/main/java/cn/cxdproject/coder/service/ArticleService.java b/src/main/java/cn/cxdproject/coder/service/ArticleService.java index c7dbc71..9ab0784 100644 --- a/src/main/java/cn/cxdproject/coder/service/ArticleService.java +++ b/src/main/java/cn/cxdproject/coder/service/ArticleService.java @@ -70,5 +70,5 @@ public interface ArticleService extends IService { List getPageFallback(Long lastId, int size, String keyword, Throwable e); - Page getArticlePagAdmine(Page page, String keyword); + Page getArticlePagAdmin(Page page, String keyword); } diff --git a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java index b602817..227a2c7 100644 --- a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java +++ b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java @@ -1,5 +1,9 @@ package cn.cxdproject.coder.service; +import cn.cxdproject.coder.model.entity.Location; +import cn.cxdproject.coder.model.vo.LocationVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.cxdproject.coder.model.entity.OperationLog; @@ -9,4 +13,11 @@ */ public interface OperationLogService extends IService { + OperationLogVO getOperationById(Long id); + + void deleteArticle(Long id); + + Page getOperationPage(Page page, String keyword); + + OperationLogVO toOperationVO(OperationLog operationLog); } diff --git a/src/main/java/cn/cxdproject/coder/service/ReportService.java b/src/main/java/cn/cxdproject/coder/service/ReportService.java index 8b93098..ac81cc6 100644 --- a/src/main/java/cn/cxdproject/coder/service/ReportService.java +++ b/src/main/java/cn/cxdproject/coder/service/ReportService.java @@ -1,7 +1,8 @@ package cn.cxdproject.coder.service; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.vo.ReportVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,11 +15,11 @@ public interface ReportService extends IService { ReportVO createReport(Long userId, CreateReportDTO createDTO); - ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO); void deleteReport(Long userId, Long reportId); ReportVO getReportById(Long reportId,Long userId); Page getMyReportPage(Long userId, Page page); - ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO); Page getReportPageByAdmin(Page page, String keyword); ReportVO getReportByIdByAdmin(Long reportId); ReportVO toReportVO(Report report); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java index 46a35bf..89ed4a1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java @@ -1,7 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateArticleDTO; @@ -59,6 +61,10 @@ public ArticleServiceImpl( @Override @CircuitBreaker(name = "articleGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_GET, + value = "Get article by ID: #{#articleId}" + ) public ArticleVO getArticleById(Long articleId) { Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { @@ -68,7 +74,7 @@ public ArticleVO getArticleById(Long articleId) { if (article == null || Boolean.TRUE.equals(article.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); + cache.put(CaffeineConstants.ARTICLE + articleId, article); return toArticleVO(article); } } @@ -77,6 +83,10 @@ public ArticleVO getArticleById(Long articleId) { @Override @CircuitBreaker(name = "articleGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get page " + ) public List getArticlePage(Long lastId, int size, String keyword) { List ids = articleMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -96,7 +106,10 @@ public List getArticlePage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_CREATE, + value = "Create article " + ) public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { // 获取当前管理员用户 User currentUser = AuthContext.getCurrentUser(); @@ -124,26 +137,40 @@ public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_UPDATE, + value = "update article ID: #{#articleId}" + ) public ArticleVO updateArticleByAdmin(Long articleId, UpdateArticleDTO updateDTO) { - Article article = this.getById(articleId); - if (article == null || Boolean.TRUE.equals(article.getDeleted())) { + // 1. 先校验文章是否存在且未删除（必须做，用于抛出 NotFoundException） + Article existing = this.getById(articleId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) article.setTitle(updateDTO.getTitle()); - if (updateDTO.getIssueUnit() != null) article.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getContent() != null) article.setContent(updateDTO.getContent()); - if (updateDTO.getThumbImage() != null) article.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新（只更新非空字段） + int updated = articleMapper.updateArticle(articleId,updateDTO); + // 3. 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); - this.updateById(article); - return toArticleVO(article); + // 4. 重新加载最新数据 + Article updatedArticle = this.getById(articleId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.ARTICLE + articleId, updatedArticle); + + // 6. 返回 VO + return toArticleVO(updatedArticle); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_DELETE, + value = "Delete article ID: #{#articleId}" + ) public void deleteArticleByAdmin(Long articleId) { boolean updated = articleMapper.update(null, Wrappers.lambdaUpdate() @@ -183,22 +210,26 @@ public ArticleVO toArticleVO(Article article) { @Override public ArticleVO getByIdFallback(Long articleId,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); - if (store != null) { - return toArticleVO((Article) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.ARTICLE+articleId); + + Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { - Article article = JsonUtils.fromJson((String) store, Article.class); - return toArticleVO(article); + return toArticleVO((Article) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.ARTICLE); @@ -221,7 +252,12 @@ public List getPageFallback(Long lastId, int size, String keyword, Th } @Override - public Page getArticlePagAdmine(Page page, String keyword) { + @Loggable( + type = LogType.ARTICLE_ADMIN_GET_PAGE, + value = "Admin get article page" + ) + public Page getArticlePagAdmin(Page page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean
{ List getPageFallback(Long lastId, int size, String keyword, Throwable e); - Page getArticlePagAdmine(Page page, String keyword); + Page getArticlePagAdmin(Page page, String keyword); } diff --git a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java index b602817..227a2c7 100644 --- a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java +++ b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java @@ -1,5 +1,9 @@ package cn.cxdproject.coder.service; +import cn.cxdproject.coder.model.entity.Location; +import cn.cxdproject.coder.model.vo.LocationVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.cxdproject.coder.model.entity.OperationLog; @@ -9,4 +13,11 @@ */ public interface OperationLogService extends IService { + OperationLogVO getOperationById(Long id); + + void deleteArticle(Long id); + + Page getOperationPage(Page page, String keyword); + + OperationLogVO toOperationVO(OperationLog operationLog); } diff --git a/src/main/java/cn/cxdproject/coder/service/ReportService.java b/src/main/java/cn/cxdproject/coder/service/ReportService.java index 8b93098..ac81cc6 100644 --- a/src/main/java/cn/cxdproject/coder/service/ReportService.java +++ b/src/main/java/cn/cxdproject/coder/service/ReportService.java @@ -1,7 +1,8 @@ package cn.cxdproject.coder.service; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.vo.ReportVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,11 +15,11 @@ public interface ReportService extends IService { ReportVO createReport(Long userId, CreateReportDTO createDTO); - ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO); void deleteReport(Long userId, Long reportId); ReportVO getReportById(Long reportId,Long userId); Page getMyReportPage(Long userId, Page page); - ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO); Page getReportPageByAdmin(Page page, String keyword); ReportVO getReportByIdByAdmin(Long reportId); ReportVO toReportVO(Report report); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java index 46a35bf..89ed4a1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java @@ -1,7 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateArticleDTO; @@ -59,6 +61,10 @@ public ArticleServiceImpl( @Override @CircuitBreaker(name = "articleGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_GET, + value = "Get article by ID: #{#articleId}" + ) public ArticleVO getArticleById(Long articleId) { Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { @@ -68,7 +74,7 @@ public ArticleVO getArticleById(Long articleId) { if (article == null || Boolean.TRUE.equals(article.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); + cache.put(CaffeineConstants.ARTICLE + articleId, article); return toArticleVO(article); } } @@ -77,6 +83,10 @@ public ArticleVO getArticleById(Long articleId) { @Override @CircuitBreaker(name = "articleGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get page " + ) public List getArticlePage(Long lastId, int size, String keyword) { List ids = articleMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -96,7 +106,10 @@ public List getArticlePage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_CREATE, + value = "Create article " + ) public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { // 获取当前管理员用户 User currentUser = AuthContext.getCurrentUser(); @@ -124,26 +137,40 @@ public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_UPDATE, + value = "update article ID: #{#articleId}" + ) public ArticleVO updateArticleByAdmin(Long articleId, UpdateArticleDTO updateDTO) { - Article article = this.getById(articleId); - if (article == null || Boolean.TRUE.equals(article.getDeleted())) { + // 1. 先校验文章是否存在且未删除（必须做，用于抛出 NotFoundException） + Article existing = this.getById(articleId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) article.setTitle(updateDTO.getTitle()); - if (updateDTO.getIssueUnit() != null) article.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getContent() != null) article.setContent(updateDTO.getContent()); - if (updateDTO.getThumbImage() != null) article.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新（只更新非空字段） + int updated = articleMapper.updateArticle(articleId,updateDTO); + // 3. 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); - this.updateById(article); - return toArticleVO(article); + // 4. 重新加载最新数据 + Article updatedArticle = this.getById(articleId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.ARTICLE + articleId, updatedArticle); + + // 6. 返回 VO + return toArticleVO(updatedArticle); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_DELETE, + value = "Delete article ID: #{#articleId}" + ) public void deleteArticleByAdmin(Long articleId) { boolean updated = articleMapper.update(null, Wrappers.lambdaUpdate() @@ -183,22 +210,26 @@ public ArticleVO toArticleVO(Article article) { @Override public ArticleVO getByIdFallback(Long articleId,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); - if (store != null) { - return toArticleVO((Article) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.ARTICLE+articleId); + + Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { - Article article = JsonUtils.fromJson((String) store, Article.class); - return toArticleVO(article); + return toArticleVO((Article) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.ARTICLE); @@ -221,7 +252,12 @@ public List getPageFallback(Long lastId, int size, String keyword, Th } @Override - public Page getArticlePagAdmine(Page page, String keyword) { + @Loggable( + type = LogType.ARTICLE_ADMIN_GET_PAGE, + value = "Admin get article page" + ) + public Page getArticlePagAdmin(Page page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean
page, String keyword); + Page getArticlePagAdmin(Page page, String keyword); } diff --git a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java index b602817..227a2c7 100644 --- a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java +++ b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java @@ -1,5 +1,9 @@ package cn.cxdproject.coder.service; +import cn.cxdproject.coder.model.entity.Location; +import cn.cxdproject.coder.model.vo.LocationVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.cxdproject.coder.model.entity.OperationLog; @@ -9,4 +13,11 @@ */ public interface OperationLogService extends IService { + OperationLogVO getOperationById(Long id); + + void deleteArticle(Long id); + + Page getOperationPage(Page page, String keyword); + + OperationLogVO toOperationVO(OperationLog operationLog); } diff --git a/src/main/java/cn/cxdproject/coder/service/ReportService.java b/src/main/java/cn/cxdproject/coder/service/ReportService.java index 8b93098..ac81cc6 100644 --- a/src/main/java/cn/cxdproject/coder/service/ReportService.java +++ b/src/main/java/cn/cxdproject/coder/service/ReportService.java @@ -1,7 +1,8 @@ package cn.cxdproject.coder.service; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.vo.ReportVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,11 +15,11 @@ public interface ReportService extends IService { ReportVO createReport(Long userId, CreateReportDTO createDTO); - ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO); void deleteReport(Long userId, Long reportId); ReportVO getReportById(Long reportId,Long userId); Page getMyReportPage(Long userId, Page page); - ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO); Page getReportPageByAdmin(Page page, String keyword); ReportVO getReportByIdByAdmin(Long reportId); ReportVO toReportVO(Report report); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java index 46a35bf..89ed4a1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java @@ -1,7 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateArticleDTO; @@ -59,6 +61,10 @@ public ArticleServiceImpl( @Override @CircuitBreaker(name = "articleGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_GET, + value = "Get article by ID: #{#articleId}" + ) public ArticleVO getArticleById(Long articleId) { Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { @@ -68,7 +74,7 @@ public ArticleVO getArticleById(Long articleId) { if (article == null || Boolean.TRUE.equals(article.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); + cache.put(CaffeineConstants.ARTICLE + articleId, article); return toArticleVO(article); } } @@ -77,6 +83,10 @@ public ArticleVO getArticleById(Long articleId) { @Override @CircuitBreaker(name = "articleGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get page " + ) public List getArticlePage(Long lastId, int size, String keyword) { List ids = articleMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -96,7 +106,10 @@ public List getArticlePage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_CREATE, + value = "Create article " + ) public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { // 获取当前管理员用户 User currentUser = AuthContext.getCurrentUser(); @@ -124,26 +137,40 @@ public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_UPDATE, + value = "update article ID: #{#articleId}" + ) public ArticleVO updateArticleByAdmin(Long articleId, UpdateArticleDTO updateDTO) { - Article article = this.getById(articleId); - if (article == null || Boolean.TRUE.equals(article.getDeleted())) { + // 1. 先校验文章是否存在且未删除（必须做，用于抛出 NotFoundException） + Article existing = this.getById(articleId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) article.setTitle(updateDTO.getTitle()); - if (updateDTO.getIssueUnit() != null) article.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getContent() != null) article.setContent(updateDTO.getContent()); - if (updateDTO.getThumbImage() != null) article.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新（只更新非空字段） + int updated = articleMapper.updateArticle(articleId,updateDTO); + // 3. 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); - this.updateById(article); - return toArticleVO(article); + // 4. 重新加载最新数据 + Article updatedArticle = this.getById(articleId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.ARTICLE + articleId, updatedArticle); + + // 6. 返回 VO + return toArticleVO(updatedArticle); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_DELETE, + value = "Delete article ID: #{#articleId}" + ) public void deleteArticleByAdmin(Long articleId) { boolean updated = articleMapper.update(null, Wrappers.lambdaUpdate() @@ -183,22 +210,26 @@ public ArticleVO toArticleVO(Article article) { @Override public ArticleVO getByIdFallback(Long articleId,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); - if (store != null) { - return toArticleVO((Article) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.ARTICLE+articleId); + + Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { - Article article = JsonUtils.fromJson((String) store, Article.class); - return toArticleVO(article); + return toArticleVO((Article) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.ARTICLE); @@ -221,7 +252,12 @@ public List getPageFallback(Long lastId, int size, String keyword, Th } @Override - public Page getArticlePagAdmine(Page page, String keyword) { + @Loggable( + type = LogType.ARTICLE_ADMIN_GET_PAGE, + value = "Admin get article page" + ) + public Page getArticlePagAdmin(Page page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean
page, String keyword); } diff --git a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java index b602817..227a2c7 100644 --- a/src/main/java/cn/cxdproject/coder/service/OperationLogService.java +++ b/src/main/java/cn/cxdproject/coder/service/OperationLogService.java @@ -1,5 +1,9 @@ package cn.cxdproject.coder.service; +import cn.cxdproject.coder.model.entity.Location; +import cn.cxdproject.coder.model.vo.LocationVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.cxdproject.coder.model.entity.OperationLog; @@ -9,4 +13,11 @@ */ public interface OperationLogService extends IService { + OperationLogVO getOperationById(Long id); + + void deleteArticle(Long id); + + Page getOperationPage(Page page, String keyword); + + OperationLogVO toOperationVO(OperationLog operationLog); } diff --git a/src/main/java/cn/cxdproject/coder/service/ReportService.java b/src/main/java/cn/cxdproject/coder/service/ReportService.java index 8b93098..ac81cc6 100644 --- a/src/main/java/cn/cxdproject/coder/service/ReportService.java +++ b/src/main/java/cn/cxdproject/coder/service/ReportService.java @@ -1,7 +1,8 @@ package cn.cxdproject.coder.service; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.vo.ReportVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,11 +15,11 @@ public interface ReportService extends IService { ReportVO createReport(Long userId, CreateReportDTO createDTO); - ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO); void deleteReport(Long userId, Long reportId); ReportVO getReportById(Long reportId,Long userId); Page getMyReportPage(Long userId, Page page); - ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO); + ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO); Page getReportPageByAdmin(Page page, String keyword); ReportVO getReportByIdByAdmin(Long reportId); ReportVO toReportVO(Report report); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java index 46a35bf..89ed4a1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ArticleServiceImpl.java @@ -1,7 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateArticleDTO; @@ -59,6 +61,10 @@ public ArticleServiceImpl( @Override @CircuitBreaker(name = "articleGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_GET, + value = "Get article by ID: #{#articleId}" + ) public ArticleVO getArticleById(Long articleId) { Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { @@ -68,7 +74,7 @@ public ArticleVO getArticleById(Long articleId) { if (article == null || Boolean.TRUE.equals(article.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); + cache.put(CaffeineConstants.ARTICLE + articleId, article); return toArticleVO(article); } } @@ -77,6 +83,10 @@ public ArticleVO getArticleById(Long articleId) { @Override @CircuitBreaker(name = "articleGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get page " + ) public List getArticlePage(Long lastId, int size, String keyword) { List ids = articleMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -96,7 +106,10 @@ public List getArticlePage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_CREATE, + value = "Create article " + ) public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { // 获取当前管理员用户 User currentUser = AuthContext.getCurrentUser(); @@ -124,26 +137,40 @@ public ArticleVO createArticleByAdmin(CreateArticleDTO createDTO) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_UPDATE, + value = "update article ID: #{#articleId}" + ) public ArticleVO updateArticleByAdmin(Long articleId, UpdateArticleDTO updateDTO) { - Article article = this.getById(articleId); - if (article == null || Boolean.TRUE.equals(article.getDeleted())) { + // 1. 先校验文章是否存在且未删除（必须做，用于抛出 NotFoundException） + Article existing = this.getById(articleId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) article.setTitle(updateDTO.getTitle()); - if (updateDTO.getIssueUnit() != null) article.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getContent() != null) article.setContent(updateDTO.getContent()); - if (updateDTO.getThumbImage() != null) article.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新（只更新非空字段） + int updated = articleMapper.updateArticle(articleId,updateDTO); + // 3. 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - cache.asMap().put(CaffeineConstants.ARTICLE + articleId, article); - this.updateById(article); - return toArticleVO(article); + // 4. 重新加载最新数据 + Article updatedArticle = this.getById(articleId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.ARTICLE + articleId, updatedArticle); + + // 6. 返回 VO + return toArticleVO(updatedArticle); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_DELETE, + value = "Delete article ID: #{#articleId}" + ) public void deleteArticleByAdmin(Long articleId) { boolean updated = articleMapper.update(null, Wrappers.lambdaUpdate() @@ -183,22 +210,26 @@ public ArticleVO toArticleVO(Article article) { @Override public ArticleVO getByIdFallback(Long articleId,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); - if (store != null) { - return toArticleVO((Article) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.ARTICLE+articleId); + + Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { - Article article = JsonUtils.fromJson((String) store, Article.class); - return toArticleVO(article); + return toArticleVO((Article) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.ARTICLE); @@ -221,7 +252,12 @@ public List getPageFallback(Long lastId, int size, String keyword, Th } @Override - public Page getArticlePagAdmine(Page page, String keyword) { + @Loggable( + type = LogType.ARTICLE_ADMIN_GET_PAGE, + value = "Admin get article page" + ) + public Page getArticlePagAdmin(Page page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean
lambdaUpdate() @@ -183,22 +210,26 @@ public ArticleVO toArticleVO(Article article) { @Override public ArticleVO getByIdFallback(Long articleId,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); - if (store != null) { - return toArticleVO((Article) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.ARTICLE+articleId); + + Object store = cache.getIfPresent(CaffeineConstants.ARTICLE + articleId); if (store != null) { - Article article = JsonUtils.fromJson((String) store, Article.class); - return toArticleVO(article); + return toArticleVO((Article) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.ARTICLE); @@ -221,7 +252,12 @@ public List getPageFallback(Long lastId, int size, String keyword, Th } @Override - public Page getArticlePagAdmine(Page page, String keyword) { + @Loggable( + type = LogType.ARTICLE_ADMIN_GET_PAGE, + value = "Admin get article page" + ) + public Page getArticlePagAdmin(Page page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean
page, String keyword) { + @Loggable( + type = LogType.ARTICLE_ADMIN_GET_PAGE, + value = "Admin get article page" + ) + public Page getArticlePagAdmin(Page page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean
page, String keyword) { + long current = page.getCurrent(); long size = page.getSize(); long offset = (current - 1) * size; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java index 2686934..6e84b3d 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/BannerServiceImpl.java @@ -85,7 +85,6 @@ public BannerVO createImage(CreateBannerDTO createDTO) { .status(true) .build(); - // 保存文章 this.save(banner); return toBannerVO(banner); } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java index 8abbcb0..831a701 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/DramaServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateDramaDTO; @@ -51,7 +53,10 @@ public DramaServiceImpl(DramaMapper dramaMapper, @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_CREATE, + value = "create drama" + ) public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -81,6 +86,10 @@ public DramaVO createDramaByAdmin(Long userId, CreateDramaDTO createDTO) { @Override @CircuitBreaker(name = "dramaGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_GET, + value = "Get drama by ID: #{#dramaId}" + ) public DramaVO getDramaById(Long dramaId) { Object store = cache.asMap().get(CaffeineConstants.DRAMA + dramaId); if (store != null) { @@ -90,7 +99,7 @@ public DramaVO getDramaById(Long dramaId) { if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, drama); + cache.put(CaffeineConstants.DRAMA + dramaId, drama); return toDramaVO(drama); } } @@ -98,6 +107,10 @@ public DramaVO getDramaById(Long dramaId) { @Override @CircuitBreaker(name = "dramaGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_USER_GET_PAGE, + value = "User get drama page" + ) public List getDramaPage(Long lastId, int size, String keyword) { List ids = dramaMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -118,32 +131,40 @@ public List getDramaPage(Long lastId, int size, String keyword) { } @Override + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update drama ID: #{#dramaId}" + ) public DramaVO updateDramaByAdmin(Long dramaId, UpdateDramaDTO updateDTO) { - Drama drama = this.getById(dramaId); - if (drama == null || Boolean.TRUE.equals(drama.getDeleted())) { + // 先校验文章是否存在且未被删除 + Drama existing = this.getById(dramaId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) drama.setName(updateDTO.getName()); - if (updateDTO.getFilingNum() != null) drama.setFilingNum(updateDTO.getFilingNum()); - if (updateDTO.getProdCompany() != null) drama.setProdCompany(updateDTO.getProdCompany()); - if (updateDTO.getCrewDescription() != null) drama.setCrewDescription(updateDTO.getCrewDescription()); - if (updateDTO.getDramaDescription() != null) drama.setDramaDescription(updateDTO.getDramaDescription()); - if (updateDTO.getCast() != null) drama.setCast(updateDTO.getCast()); - if (updateDTO.getShootLocation() != null) drama.setShootLocation(updateDTO.getShootLocation()); - if (updateDTO.getLocationId() != null) drama.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getService() != null) drama.setService(updateDTO.getService()); - if (updateDTO.getServiceId() != null) drama.setServiceId(updateDTO.getServiceId()); - if(updateDTO.getImage() != null) drama.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) drama.setThumbImage(updateDTO.getThumbImage()); - - drama.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.DRAMA + dramaId, dramaId); - this.updateById(drama); - return toDramaVO(drama); + // 执行动态更新（只更新非空字段） + int updated = dramaMapper.updateDrama(dramaId, updateDTO); + + // 如果更新影响行数为 0，说明条件不满足（比如已被删除），也可视为未找到 + if (updated == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 重新加载最新数据（保证数据一致性） + Drama updatedDrama = this.getById(dramaId); + + // 更新缓存 + cache.put(CaffeineConstants.DRAMA + dramaId, updatedDrama); + + // 返回 VO + return toDramaVO(updatedDrama); } @Override + @Loggable( + type = LogType.DRAMA_DELETE, + value = "delete drama ID: #{#dramaId}" + ) public void deleteDramaByAdmin(Long dramaId) { boolean updated = dramaMapper.update(null, Wrappers.lambdaUpdate() @@ -188,22 +209,26 @@ public DramaVO toDramaVO(Drama drama) { @Override public DramaVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.DRAMA + id); - if (store != null) { - return toDramaVO((Drama) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.DRAMA+id); + + Object store = cache.getIfPresent(CaffeineConstants.DRAMA + id); if (store != null) { - Drama drama = JsonUtils.fromJson((String) store, Drama.class); - return toDramaVO(drama); + return toDramaVO((Drama) store); } + return null; } @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.DRAMA); @@ -226,6 +251,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get drama page" + ) public Page getDramaPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java index 401cf5d..b7d8959 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/FileServiceImpl.java @@ -1,5 +1,7 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.common.storage.LocalStorageService; import cn.cxdproject.coder.common.storage.MinioStorageService; import cn.cxdproject.coder.model.vo.FileVO; @@ -20,6 +22,10 @@ public FileServiceImpl(MinioStorageService minioStorageService, LocalStorageServ @Override + @Loggable( + type = LogType.FILE_UPLOAD, + value = "upload file" + ) public FileVO imageUpload(MultipartFile file) { FileVO fileVO = minioStorageService.upload(file); return fileVO; diff --git a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java index 6139e15..fa57b37 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/HotelServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.HotelMapper; import cn.cxdproject.coder.mapper.LocationMapper; @@ -54,7 +57,10 @@ public HotelServiceImpl( @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_CREATE, + value = "Create hotel" + ) public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +86,10 @@ public HotelVO createHotelByAdmin(Long userId, CreateHotelDTO createDTO) { @Override @CircuitBreaker(name = "hotelGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_GET, + value = "Get hotel by ID: #{#hotelId}" + ) public HotelVO getHotelById(Long hotelId) { Object store = cache.asMap().get(CaffeineConstants.HOTEL + hotelId); if (store != null) { @@ -89,7 +99,7 @@ public HotelVO getHotelById(Long hotelId) { if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); + cache.put(CaffeineConstants.HOTEL + hotelId, hotel); return toHotelVO(hotel); } } @@ -97,6 +107,10 @@ public HotelVO getHotelById(Long hotelId) { @Override @CircuitBreaker(name = "hotelGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.ARTICLE_USER_GET_PAGE, + value = "User get hotel" + ) public List getHotelPage(Long lastId, int size, String keyword) { List ids = hotelMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,31 +131,41 @@ public List getHotelPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.DRAMA_UPDATE, + value = "Update hotel ID: #{#dramaId}" + ) public HotelVO updateHotelByAdmin(Long hotelId, UpdateHotelDTO updateDTO) { - Hotel hotel = this.getById(hotelId); - if (hotel == null || Boolean.TRUE.equals(hotel.getDeleted())) { + // 1. 校验是否存在且未删除 + Hotel existing = this.getById(hotelId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) hotel.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) hotel.setDescription(updateDTO.getDescription()); - if (updateDTO.getAddress() != null) hotel.setAddress(updateDTO.getAddress()); - if (updateDTO.getManagerName() != null) hotel.setManagerName(updateDTO.getManagerName()); - if (updateDTO.getManagerPhone() != null) hotel.setManagerPhone(updateDTO.getManagerPhone()); - if (updateDTO.getImage() != null) hotel.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) hotel.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) hotel.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) hotel.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.HOTEL + hotelId, hotel); - this.updateById(hotel); - return toHotelVO(hotel); + // 2. 执行动态更新 + int updatedRows = hotelMapper.updateHotel(hotelId, updateDTO); + + // 3. 若无记录被更新 + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证返回的是 DB 最新状态） + Hotel updatedHotel = this.getById(hotelId); + + // 5. 更新缓存（注意：存的是对象，不是 ID！） + cache.put(CaffeineConstants.HOTEL + hotelId, updatedHotel); + + // 6. 返回 VO + return toHotelVO(updatedHotel); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.HOTEL_DELETE, + value = "Delete hotel by ID: #{#hotelId}" + ) public void deleteHotelByAdmin(Long hotelId) { boolean updated = hotelMapper.update(null, Wrappers.lambdaUpdate() @@ -183,15 +207,14 @@ public HotelVO toHotelVO(Hotel hotel) { @Override public HotelVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.HOTEL + id); - if (store != null) { - return toHotelVO((Hotel) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.HOTEL+id); + + Object store = cache.getIfPresent(CaffeineConstants.HOTEL + id); if (store != null) { - Hotel hotel = JsonUtils.fromJson((String) store, Hotel.class); - return toHotelVO(hotel); + return toHotelVO((Hotel) store); } return null; } @@ -199,6 +222,10 @@ public HotelVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.HOTEL); @@ -222,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.DRAMA_ADMIN_GET_PAGE, + value = "Admin get hotel Page" + ) public Page getHotelPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java index 804d6be..1639be2 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/LocationServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateLocationDTO; @@ -53,7 +55,10 @@ public LocationServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_CREATE, + value = "Create location" + ) public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -85,6 +90,10 @@ public LocationVO createLocationByAdmin(Long userId, CreateLocationDTO createDTO @Override @CircuitBreaker(name = "locationGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_GET, + value = "Get location by ID: #{#locationId}" + ) public LocationVO getLocationById(Long locationId) { Object store = cache.asMap().get(CaffeineConstants.LOCATION + locationId); if (store != null) { @@ -94,7 +103,7 @@ public LocationVO getLocationById(Long locationId) { if (location == null || Boolean.TRUE.equals(location.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); + cache.put(CaffeineConstants.LOCATION + locationId, location); return toLocationVO(location); } } @@ -102,6 +111,10 @@ public LocationVO getLocationById(Long locationId) { @Override @CircuitBreaker(name = "locationGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_USER_GET_PAGE, + value = "User get location" + ) public List getLocationPage(Long lastId, int size, String keyword) { List ids = locationMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -122,35 +135,40 @@ public List getLocationPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_UPDATE, + value = "Update location ID: #{#locationId}" + ) public LocationVO updateLocationByAdmin(Long locationId, UpdateLocationDTO updateDTO) { - Location location = this.getById(locationId); - if (location == null || Boolean.TRUE.equals(location.getDeleted())) { + // 1. 校验是否存在且未删除 + Location existing = this.getById(locationId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) location.setName(updateDTO.getName()); - if (updateDTO.getType() != null) location.setType(updateDTO.getType()); - if (updateDTO.getStatus() != null) location.setStatus(updateDTO.getStatus()); - if (updateDTO.getLocationDescription() != null) location.setLocationDescription(updateDTO.getLocationDescription()); - if (updateDTO.getLocationPrincipalName() != null) location.setLocationPrincipalName(updateDTO.getLocationPrincipalName()); - if (updateDTO.getLocationPrincipalPhone() != null) location.setLocationPrincipalPhone(updateDTO.getLocationPrincipalPhone()); - if (updateDTO.getGovPrincipalName() != null) location.setGovPrincipalName(updateDTO.getGovPrincipalName()); - if (updateDTO.getGovPrincipalPhone() != null) location.setGovPrincipalPhone(updateDTO.getGovPrincipalPhone()); - if (updateDTO.getAddress() != null) location.setAddress(updateDTO.getAddress()); - if (updateDTO.getPrice() != null) location.setPrice(updateDTO.getPrice()); - if(updateDTO.getImage() != null) location.setImage(updateDTO.getImage()); - if(updateDTO.getThumbImage() != null) location.setThumbImage(updateDTO.getThumbImage()); - if(updateDTO.getLongitude() != null) location.setLongitude(updateDTO.getLongitude()); - if(updateDTO.getLatitude() != null) location.setLatitude(updateDTO.getLatitude()); - - cache.asMap().put(CaffeineConstants.LOCATION + locationId, location); - this.updateById(location); - return toLocationVO(location); + // 2. 执行动态更新 + int updatedRows = locationMapper.updateLocation(locationId, updateDTO); + + // 3. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证缓存和返回的是最新状态） + Location updatedLocation = this.getById(locationId); + + // 5. 更新缓存 + cache.put(CaffeineConstants.LOCATION + locationId, updatedLocation); + + // 6. 返回 VO + return toLocationVO(updatedLocation); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.LOCATION_DELETE, + value = "Delete location by ID: #{#locationId}" + ) public void deleteLocationByAdmin(Long locationId) { boolean updated = locationMapper.update(null, Wrappers.lambdaUpdate() @@ -198,15 +216,14 @@ public LocationVO toLocationVO(Location location) { @Override public LocationVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.LOCATION + id); - if (store != null) { - return toLocationVO((Location) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.LOCATION+id); + + Object store = cache.getIfPresent(CaffeineConstants.LOCATION + id); if (store != null) { - Location location = JsonUtils.fromJson((String) store, Location.class); - return toLocationVO(location); + return toLocationVO((Location) store); } return null; } @@ -214,6 +231,10 @@ public LocationVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.LOCATION); @@ -236,6 +257,10 @@ public List getPageFallback(Long lastId, int size, String keyword, T } @Override + @Loggable( + type = LogType.LOCATION_ADMIN_GET_PAGE, + value = "Admin get location Page" + ) public Page getLocationPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java index e43c95b..f254220 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/OperationLogServiceImpl.java @@ -1,11 +1,23 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.constants.ResponseConstants; +import cn.cxdproject.coder.exception.NotFoundException; +import cn.cxdproject.coder.model.entity.Banner; +import cn.cxdproject.coder.model.vo.BannerVO; +import cn.cxdproject.coder.model.vo.OperationLogVO; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.cxdproject.coder.model.entity.OperationLog; import cn.cxdproject.coder.mapper.OperationLogMapper; import cn.cxdproject.coder.service.OperationLogService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + +import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.NOT_FOUND; + /** * OperationLog 服务实现类 * @author Hibiscus-code-generate @@ -13,4 +25,73 @@ @Service public class OperationLogServiceImpl extends ServiceImpl implements OperationLogService { + private final OperationLogMapper operationLogMapper; + + public OperationLogServiceImpl(OperationLogMapper operationLogMapper) { + this.operationLogMapper = operationLogMapper; + } + + @Override + public OperationLogVO getOperationById(Long id) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + return toOperationVO(operationLog); + } + + @Override + public void deleteArticle(Long id) { + boolean updated = operationLogMapper.update(null, + Wrappers.lambdaUpdate() + .set(OperationLog::getDeleted, true) + .eq(OperationLog::getId, id) + .eq(OperationLog::getDeleted, false) + ) > 0; + + if (!updated) { + OperationLog operationLog = this.getById(id); + if (operationLog == null || Boolean.TRUE.equals(operationLog.getDeleted())) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + } + + } + + @Override + public Page getOperationPage(Page page, String keyword) { + long current = page.getCurrent(); + long size = page.getSize(); + long offset = (current - 1) * size; + + + List operationLogs = operationLogMapper.getPage(keyword, offset, size); + + List voList = operationLogs.stream() + .map(this::toOperationVO) + .collect(Collectors.toList()); + + return new Page() + .setCurrent(current) + .setSize(size) + .setRecords(voList); + } + + @Override + public OperationLogVO toOperationVO(OperationLog operationLog) { + if (log == null) { + return null; + } + return OperationLogVO.builder() + .id(operationLog.getId()) + .type(operationLog.getType()) + .description(operationLog.getDescription()) + .userId(operationLog.getUserId()) + .operator(operationLog.getOperator()) + .success(operationLog.getSuccess()) + .params(operationLog.getParams()) + .result(operationLog.getResult()) + .timestamp(operationLog.getTimestamp()) + .build(); + } } diff --git a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java index 7ebca52..a626ebd 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/PolicyServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.mapper.LocationMapper; import cn.cxdproject.coder.model.dto.CreatePolicyDTO; @@ -48,6 +51,10 @@ public PolicyServiceImpl(PolicyMapper policyMapper, Cache cache, } @Override + @Loggable( + type = LogType.POLICY_CREATE, + value = "Create policy" + ) public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -71,6 +78,10 @@ public PolicyVO createPolicyByAdmin(CreatePolicyDTO createDTO) { @Override @CircuitBreaker(name = "policyGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_GET, + value = "Get policy by ID: #{#policyId}" + ) public PolicyVO getPolicyById(Long policyId) { Object store = cache.asMap().get(CaffeineConstants.POLICY + policyId); if (store != null) { @@ -88,6 +99,10 @@ public PolicyVO getPolicyById(Long policyId) { @Override @CircuitBreaker(name = "policyGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_USER_GET_PAGE, + value = "User get policy" + ) public List getPolicyPage(Long lastId, int size, String keyword) { List ids = policyMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -107,28 +122,40 @@ public List getPolicyPage(Long lastId, int size, String keyword) { } @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_UPDATE, + value = "Update policy ID: #{#policyId}" + ) public PolicyVO updatePolicyByAdmin(Long policyId, UpdatePolicyDTO updateDTO) { - Policy policy = this.getById(policyId); - if (policy == null || Boolean.TRUE.equals(policy.getDeleted())) { + // 1. 校验是否存在且未被删除 + Policy existing = this.getById(policyId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getTitle() != null) policy.setTitle(updateDTO.getTitle()); - if (updateDTO.getType() != null) policy.setType(updateDTO.getType()); - if (updateDTO.getIssueUnit() != null) policy.setIssueUnit(updateDTO.getIssueUnit()); - if (updateDTO.getIssueTime() != null) policy.setIssueTime(updateDTO.getIssueTime()); - if (updateDTO.getContent() != null) policy.setContent(updateDTO.getContent()); - if (updateDTO.getImage() != null) policy.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) policy.setThumbImage(updateDTO.getThumbImage()); + // 2. 执行动态更新 + int updatedRows = policyMapper.updatePolicy(policyId, updateDTO); - cache.asMap().put(CaffeineConstants.POLICY + policyId, policy); - this.updateById(policy); - return toPolicyVO(policy); + // 3. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 4. 重新加载最新数据（保证一致性） + Policy updatedPolicy = this.getById(policyId); + + // 5. 更新缓存（注意：缓存的是对象，不是 ID） + cache.put(CaffeineConstants.POLICY + policyId, updatedPolicy); + + // 6. 返回 VO + return toPolicyVO(updatedPolicy); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.POLICY_DELETE, + value = "Delete policy by ID: #{#policyId}" + ) public void deletePolicyByAdmin(Long policyId) { boolean updated = policyMapper.update(null, Wrappers.lambdaUpdate() @@ -167,15 +194,14 @@ public PolicyVO toPolicyVO(Policy policy) { @Override public PolicyVO getByIdFallback(Long id, Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.POLICY + id); - if (store != null) { - return toPolicyVO((Policy) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.POLICY + id); + + Object store = cache.getIfPresent(CaffeineConstants.POLICY + id); if (store != null) { - Policy policy = JsonUtils.fromJson((String) store, Policy.class); - return toPolicyVO(policy); + return toPolicyVO((Policy) store); } return null; } @@ -183,6 +209,10 @@ public PolicyVO getByIdFallback(Long id, Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.POLICY); @@ -205,6 +235,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thr } @Override + @Loggable( + type = LogType.POLICY_ADMIN_GET_PAGE, + value = "Admin get policy Page" + ) public Page getPolicyPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java index 5bcd9a6..5b458b1 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ReportServiceImpl.java @@ -1,17 +1,19 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.CaffeineConstants; import cn.cxdproject.coder.common.constants.ResponseConstants; import cn.cxdproject.coder.common.context.AuthContext; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateReportDTO; -import cn.cxdproject.coder.model.dto.UpdateReportDTO; +import cn.cxdproject.coder.model.dto.UpdateReportAdminDTO; +import cn.cxdproject.coder.model.dto.UpdateReportUserDTO; import cn.cxdproject.coder.model.entity.Report; import cn.cxdproject.coder.model.entity.User; import cn.cxdproject.coder.model.vo.ReportVO; import cn.cxdproject.coder.mapper.ReportMapper; -import cn.cxdproject.coder.model.vo.ShootVO; import cn.cxdproject.coder.service.ReportService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -28,6 +30,7 @@ import static cn.cxdproject.coder.common.enums.ResponseCodeEnum.*; + /** * Report 服务实现类 * @author Hibiscus-code-generate @@ -46,6 +49,10 @@ public ReportServiceImpl( } @Override + @Loggable( + type = LogType.REPORT_USER_CREATE, + value = "User submit report application" + ) public ReportVO createReport(Long userId, CreateReportDTO createDTO) { Report report = Report.builder() @@ -78,43 +85,34 @@ public ReportVO createReport(Long userId, CreateReportDTO createDTO) { } @Override - public ReportVO updateReport(Long userId, Long reportId, UpdateReportDTO updateDTO) { + @Loggable( + type = LogType.REPORT_USER_UPDATE, + value = "User update report application ID: #{#reportId}" + ) + public ReportVO updateReport(Long userId, Long reportId, UpdateReportUserDTO updateDTO) { Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (!report.getUserId().equals(userId)) { throw new BusinessException(FORBIDDEN.code(), ResponseConstants.NO_PERMISSION); } - if (updateDTO.getName() != null) report.setName(updateDTO.getName()); - if (updateDTO.getType() != null) report.setType(updateDTO.getType()); - if (updateDTO.getGenre() != null) report.setGenre(updateDTO.getGenre()); - if (updateDTO.getEpisodes() != null) report.setEpisodes(updateDTO.getEpisodes()); - if (updateDTO.getInvestAmount() != null) report.setInvestAmount(updateDTO.getInvestAmount()); - if (updateDTO.getMainCreators() != null) report.setMainCreators(updateDTO.getMainCreators()); - if (updateDTO.getLeadProducer() != null) report.setLeadProducer(updateDTO.getLeadProducer()); - if (updateDTO.getProducerUnit() != null) report.setProducerUnit(updateDTO.getProducerUnit()); - if (updateDTO.getStartDate() != null) report.setStartDate(updateDTO.getStartDate()); - if (updateDTO.getEndDate() != null) report.setEndDate(updateDTO.getEndDate()); - if (updateDTO.getCrewScale() != null) report.setCrewScale(updateDTO.getCrewScale()); - if (updateDTO.getContact() != null) report.setContact(updateDTO.getContact()); - if (updateDTO.getPhoneNumber() != null) report.setPhoneNumber(updateDTO.getPhoneNumber()); - if (updateDTO.getCrewPosition() != null) report.setCrewPosition(updateDTO.getCrewPosition()); - if (updateDTO.getShootPermit() != null) report.setShootPermit(updateDTO.getShootPermit()); - if (updateDTO.getThumbShootPermit() != null) report.setThumbShootPermit(updateDTO.getThumbShootPermit()); - if (updateDTO.getApprovalFile() != null) report.setApprovalFile(updateDTO.getApprovalFile()); - if (updateDTO.getThumbApprovalFile() != null) report.setThumbApprovalFile(updateDTO.getThumbApprovalFile()); - if (updateDTO.getShootApply() != null) report.setShootApply(updateDTO.getShootApply()); - if (updateDTO.getThumbShootApply() != null) report.setThumbShootApply(updateDTO.getThumbShootApply()); - if (updateDTO.getStatus() != null) throw new BusinessException(FORBIDDEN.code(), "无权修改申请状态");; - - this.updateById(report); - return toReportVO(report); + int rows = reportMapper.updateReportByUser(reportId, updateDTO); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_USER_DELETE, + value = "User cancel report application ID: #{#reportId}" + ) public void deleteReport(Long userId, Long reportId) { boolean updated = reportMapper.update(null, Wrappers.lambdaUpdate() @@ -136,6 +134,10 @@ public void deleteReport(Long userId, Long reportId) { } @Override + @Loggable( + type = LogType.REPORT_USER_GET, + value = "User get own report application by ID: #{#reportId}" + ) public ReportVO getReportById(Long reportId,Long userId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); Report report; @@ -157,6 +159,10 @@ public ReportVO getReportById(Long reportId,Long userId) { @Override + @Loggable( + type = LogType.REPORT_USER_GET_PAGE, + value = "User get all own report applications" + ) public Page getMyReportPage(Long userId, Page page) { long current = page.getCurrent(); long size = page.getSize(); @@ -178,23 +184,36 @@ public Page getMyReportPage(Long userId, Page page) { @Override - public ReportVO updateReportByAdmin(Long reportId, UpdateReportDTO updateDTO) { - User currentUser = AuthContext.getCurrentUser(); + @Loggable( + type = LogType.REPORT_ADMIN_UPDATE, + value = "Admin process report application ID: #{#reportId}" + ) + public ReportVO updateReportByAdmin(Long reportId, UpdateReportAdminDTO updateDTO) { + if (updateDTO.getStatus() == null || updateDTO.getStatus().trim().isEmpty()) { + throw new BusinessException(MISSING_PARAMETER.code(),"审核状态不能为空"); + } + Report report = this.getById(reportId); if (report == null || Boolean.TRUE.equals(report.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getStatus() != null) report.setStatus(updateDTO.getStatus()); + int rows = reportMapper.updateReportByAdmin(reportId, updateDTO.getStatus()); + if (rows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } - report.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.REPORT + reportId, report); - this.updateById(report); - return toReportVO(report); + Report updated = this.getById(reportId); + cache.asMap().put(CaffeineConstants.REPORT + reportId, updated); + return toReportVO(updated); } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET_PAGE, + value = "Admin get paginated report applications" + ) public Page getReportPageByAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); @@ -221,6 +240,10 @@ public Page getReportPageByAdmin(Page page, String keyword) { } @Override + @Loggable( + type = LogType.REPORT_ADMIN_GET, + value = "Admin get report application by ID: #{#reportId}" + ) public ReportVO getReportByIdByAdmin(Long reportId) { Object store = cache.asMap().get(CaffeineConstants.REPORT + reportId); if (store != null) { diff --git a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java index fb5d203..f7ea56f 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/ShootServiceImpl.java @@ -1,6 +1,8 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateShootDTO; @@ -53,7 +55,10 @@ public ShootServiceImpl( } @Override - @Bulkhead(name = "add", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_CREATE, + value = "Create shoot" + ) public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -80,6 +85,10 @@ public ShootVO createShootByAdmin(Long userId, CreateShootDTO createDTO) { @Override @CircuitBreaker(name = "shootGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_GET, + value = "Get shoot by ID: #{#shootId}" + ) public ShootVO getShootById(Long shootId) { Object store = cache.asMap().get(CaffeineConstants.SHOOT + shootId); if (store != null) { @@ -89,7 +98,7 @@ public ShootVO getShootById(Long shootId) { if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); + cache.put(CaffeineConstants.SHOOT + shootId, shoot); return toShootVO(shoot); } } @@ -97,6 +106,10 @@ public ShootVO getShootById(Long shootId) { @Override @CircuitBreaker(name = "shootGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_USER_GET_PAGE, + value = "User get shoot" + ) public List getShootPage(Long lastId, int size, String keyword) { List ids = shootMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -117,30 +130,40 @@ public List getShootPage(Long lastId, int size, String keyword) { @Override @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_UPDATE, + value = "Update shoot ID: #{#shootId}" + ) public ShootVO updateShootByAdmin(Long shootId, UpdateShootDTO updateDTO) { - Shoot shoot = this.getById(shootId); - if (shoot == null || Boolean.TRUE.equals(shoot.getDeleted())) { + // 1. 校验是否存在且未被删除 + Shoot existing = this.getById(shootId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) shoot.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) shoot.setDescription(updateDTO.getDescription()); - if (updateDTO.getPrice() != null) shoot.setPrice(updateDTO.getPrice()); - if (updateDTO.getStatus() != null) shoot.setStatus(updateDTO.getStatus()); - if (updateDTO.getAddress() != null) shoot.setAddress(updateDTO.getAddress()); - if (updateDTO.getPhone() != null) shoot.setPhone(updateDTO.getPhone()); - if (updateDTO.getContactName() != null) shoot.setContactName(updateDTO.getContactName()); - if (updateDTO.getImage() != null) shoot.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) shoot.setThumbImage(updateDTO.getThumbImage()); - - shoot.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.SHOOT + shootId, shoot); - this.updateById(shoot); - return toShootVO(shoot); + // 3. 执行动态更新 + int updatedRows = shootMapper.updateShoot(shootId, updateDTO); + + // 4. 若无记录被更新（可能已被删除） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证缓存和返回的是最新状态） + Shoot updatedShoot = this.getById(shootId); + + // 6. 更新缓存 + cache.put(CaffeineConstants.SHOOT + shootId, updatedShoot); + + // 7. 返回 VO + return toShootVO(updatedShoot); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.SHOOT_DELETE, + value = "Delete shoot by ID: #{#shootId}" + ) public void deleteShootByAdmin(Long shootId) { boolean updated = shootMapper.update(null, Wrappers.lambdaUpdate() @@ -182,15 +205,14 @@ public ShootVO toShootVO(Shoot shoot) { @Override public ShootVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.SHOOT + id); - if (store != null) { - return toShootVO((Shoot) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.SHOOT+id); + + Object store = cache.getIfPresent(CaffeineConstants.SHOOT + id); if (store != null) { - Shoot shoot = JsonUtils.fromJson((String) store, Shoot.class); - return toShootVO(shoot); + return toShootVO((Shoot) store); } return null; } @@ -198,6 +220,10 @@ public ShootVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { // 从 Redis 获取缓存的全量文章（假设是 ArticleVO[] 的 JSON） String json = (String) redisUtils.get(TaskConstants.SHOOT); @@ -220,6 +246,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Thro } @Override + @Loggable( + type = LogType.SHOOT_ADMIN_GET_PAGE, + value = "Admin get shoot Page" + ) public Page getShootPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java index fceeb52..68f513b 100644 --- a/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java +++ b/src/main/java/cn/cxdproject/coder/service/impl/TourServiceImpl.java @@ -1,6 +1,9 @@ package cn.cxdproject.coder.service.impl; +import cn.cxdproject.coder.common.anno.Loggable; import cn.cxdproject.coder.common.constants.*; +import cn.cxdproject.coder.common.enums.LogType; +import cn.cxdproject.coder.exception.BusinessException; import cn.cxdproject.coder.exception.NotFoundException; import cn.cxdproject.coder.model.dto.CreateTourDTO; import cn.cxdproject.coder.model.dto.UpdateTourDTO; @@ -46,6 +49,10 @@ public TourServiceImpl(TourMapper tourMapper, Cache cache, Redis } @Override + @Loggable( + type = LogType.TOUR_CREATE, + value = "Create tour" + ) public TourVO createTourByAdmin(CreateTourDTO createDTO) { if (createDTO.getImage() == null) { createDTO.setImage(Constants.DEFAULT_COVER); @@ -76,6 +83,10 @@ public TourVO createTourByAdmin(CreateTourDTO createDTO) { @Override @CircuitBreaker(name = "tourGetById", fallbackMethod = "getByIdFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_GET, + value = "Get tour by ID: #{#tourId}" + ) public TourVO getTourById(Long tourId) { Object store = cache.asMap().get(CaffeineConstants.TOUR + tourId); if (store != null) { @@ -85,7 +96,7 @@ public TourVO getTourById(Long tourId) { if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); + cache.put(CaffeineConstants.TOUR + tourId, tour); return toTourVO(tour); } } @@ -93,6 +104,10 @@ public TourVO getTourById(Long tourId) { @Override @CircuitBreaker(name = "tourGetPage", fallbackMethod = "getPageFallback") @Bulkhead(name = "get", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_USER_GET_PAGE, + value = "User get tour" + ) public List getTourPage(Long lastId, int size, String keyword) { List ids = tourMapper.selectIds(lastId, size, keyword); if (ids.isEmpty()) { @@ -113,37 +128,40 @@ public List getTourPage(Long lastId, int size, String keyword) { @Override - @Bulkhead(name = "update", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_UPDATE, + value = "Update tour ID: #{#tourId}" + ) public TourVO updateTourByAdmin(Long tourId, UpdateTourDTO updateDTO) { - Tour tour = this.getById(tourId); - if (tour == null || Boolean.TRUE.equals(tour.getDeleted())) { + // 1. 校验是否存在且未被删除 + Tour existing = this.getById(tourId); + if (existing == null || Boolean.TRUE.equals(existing.getDeleted())) { throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); } - if (updateDTO.getName() != null) tour.setName(updateDTO.getName()); - if (updateDTO.getDescription() != null) tour.setDescription(updateDTO.getDescription()); - if (updateDTO.getTheme() != null) tour.setTheme(updateDTO.getTheme()); - if (updateDTO.getFeatures() != null) tour.setFeatures(updateDTO.getFeatures()); - if (updateDTO.getTransport() != null) tour.setTransport(updateDTO.getTransport()); - if (updateDTO.getHotel() != null) tour.setHotel(updateDTO.getHotel()); - if (updateDTO.getFood() != null) tour.setFood(updateDTO.getFood()); - if (updateDTO.getImage() != null) tour.setImage(updateDTO.getImage()); - if (updateDTO.getThumbImage() != null) tour.setThumbImage(updateDTO.getThumbImage()); - if (updateDTO.getLongitude() != null) tour.setLongitude(updateDTO.getLongitude()); - if (updateDTO.getLatitude() != null) tour.setLatitude(updateDTO.getLatitude()); - if (updateDTO.getLocationId() != null) tour.setLocationId(updateDTO.getLocationId()); - if (updateDTO.getDramaId() != null) tour.setDramaId(updateDTO.getDramaId()); - - - - tour.setUpdatedAt(LocalDateTime.now()); - cache.asMap().put(CaffeineConstants.TOUR + tourId, tour); - this.updateById(tour); - return toTourVO(tour); + // 3. 执行动态更新 + int updatedRows = tourMapper.updateTour(tourId, updateDTO); + + // 4. 若无记录被更新（可能已被删除或并发修改） + if (updatedRows == 0) { + throw new NotFoundException(NOT_FOUND.code(), ResponseConstants.NOT_FIND); + } + + // 5. 重新加载最新数据（保证一致性） + Tour updatedTour = this.getById(tourId); + + // 6. 更新缓存（注意：缓存的是对象，不是旧引用） + cache.put(CaffeineConstants.TOUR + tourId, updatedTour); + + // 7. 返回 VO + return toTourVO(updatedTour); } @Override - @Bulkhead(name = "delete", type = Bulkhead.Type.SEMAPHORE) + @Loggable( + type = LogType.TOUR_DELETE, + value = "Delete tour by ID: #{#tourId}" + ) public void deleteTourByAdmin(Long tourId) { boolean updated = tourMapper.update(null, Wrappers.lambdaUpdate() @@ -190,15 +208,14 @@ public TourVO toTourVO(Tour tour) { @Override public TourVO getByIdFallback(Long id,Throwable e) { - Object store; - store = cache.getIfPresent(CaffeineConstants.TOUR + id); - if (store != null) { - return toTourVO((Tour) store); + + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; } - store = redisUtils.get(RedisKeyConstants.TOUR+id); + + Object store = cache.getIfPresent(CaffeineConstants.TOUR + id); if (store != null) { - Tour tour = JsonUtils.fromJson((String) store, Tour.class); - return toTourVO(tour); + return toTourVO((Tour) store); } return null; } @@ -206,6 +223,10 @@ public TourVO getByIdFallback(Long id,Throwable e) { @Override public List getPageFallback(Long lastId, int size, String keyword, Throwable e) { + if (e instanceof NotFoundException || e instanceof BusinessException) { + throw (RuntimeException) e; + } + try { String json = (String) redisUtils.get(TaskConstants.TOUR); @@ -228,6 +249,10 @@ public List getPageFallback(Long lastId, int size, String keyword, Throw } @Override + @Loggable( + type = LogType.TOUR_ADMIN_GET_PAGE, + value = "Admin get tour Page" + ) public Page getTourPageAdmin(Page page, String keyword) { long current = page.getCurrent(); long size = page.getSize(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index dc3659c..3b9712f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -125,21 +125,6 @@ resilience4j: max-wait-duration: 100ms instances: - add: - base-config: default - max-concurrent-calls: 10 - max-wait-duration: 100ms # 写操作可以稍微等一下 - - delete: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - - update: - base-config: default - max-concurrent-calls: 20 - max-wait-duration: 50ms - get: base-config: default max-concurrent-calls: 50 diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml index 3a5951a..b6bcdca 100644 --- a/src/main/resources/mapper/ArticleMapper.xml +++ b/src/main/resources/mapper/ArticleMapper.xml @@ -77,4 +77,25 @@ LIMIT 10 + + + UPDATE fi_articles + + + title = #{dto.title}, + + + issue_unit = #{dto.issueUnit}, + + + content = #{dto.content}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{articleId} + AND deleted = false + + diff --git a/src/main/resources/mapper/DramaMapper.xml b/src/main/resources/mapper/DramaMapper.xml index 1d59006..8c08015 100644 --- a/src/main/resources/mapper/DramaMapper.xml +++ b/src/main/resources/mapper/DramaMapper.xml @@ -89,4 +89,48 @@ LIMIT 10 + + UPDATE fi_dramas + + + name = #{dto.name}, + + + filing_num = #{dto.filingNum}, + + + prod_company = #{dto.prodCompany}, + + + crew_description = #{dto.crewDescription}, + + + drama_description = #{dto.dramaDescription}, + + + cast = #{dto.cast}, + + + shoot_location = #{dto.shootLocation}, + + + service = #{dto.service}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + location_id = #{dto.locationId}, + + + service_id = #{dto.serviceId}, + + + WHERE id = #{dramaId} + AND deleted = false + + diff --git a/src/main/resources/mapper/HotelMapper.xml b/src/main/resources/mapper/HotelMapper.xml index c33dcc3..c21affa 100644 --- a/src/main/resources/mapper/HotelMapper.xml +++ b/src/main/resources/mapper/HotelMapper.xml @@ -81,4 +81,39 @@ LIMIT 10 + + UPDATE fi_hotel + + + name = #{dto.name}, + + + description = #{dto.description}, + + + address = #{dto.address}, + + + manager_name = #{dto.managerName}, + + + manager_phone = #{dto.managerPhone}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + \ No newline at end of file diff --git a/src/main/resources/mapper/LocationMapper.xml b/src/main/resources/mapper/LocationMapper.xml index dfda343..17bd0b3 100644 --- a/src/main/resources/mapper/LocationMapper.xml +++ b/src/main/resources/mapper/LocationMapper.xml @@ -59,6 +59,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') ) @@ -79,7 +80,11 @@ FROM fi_locations WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR location_description LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -94,4 +99,55 @@ LIMIT 10 + + + UPDATE fi_locations + + + name = #{dto.name}, + + + type = #{dto.type}, + + + status = #{dto.status}, + + + location_description = #{dto.locationDescription}, + + + location_principal_name = #{dto.locationPrincipalName}, + + + location_principal_phone = #{dto.locationPrincipalPhone}, + + + gov_principal_name = #{dto.govPrincipalName}, + + + gov_principal_phone = #{dto.govPrincipalPhone}, + + + address = #{dto.address}, + + + price = #{dto.price}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/OperationLogMapper.xml b/src/main/resources/mapper/OperationLogMapper.xml index a25d5df..8bebc05 100644 --- a/src/main/resources/mapper/OperationLogMapper.xml +++ b/src/main/resources/mapper/OperationLogMapper.xml @@ -34,4 +34,15 @@ `updated_at` + + SELECT * + FROM fi_operation_logs + WHERE deleted = 0 + + AND type LIKE CONCAT('%', #{keyword}, '%') + + ORDER BY timestamp DESC + LIMIT #{offset}, #{size} + + diff --git a/src/main/resources/mapper/PolicyMapper.xml b/src/main/resources/mapper/PolicyMapper.xml index b45c915..5f3956d 100644 --- a/src/main/resources/mapper/PolicyMapper.xml +++ b/src/main/resources/mapper/PolicyMapper.xml @@ -76,5 +76,34 @@ LIMIT 10 + + UPDATE fi_policy + + + title = #{dto.title}, + + + type = #{dto.type}, + + + issue_unit = #{dto.issueUnit}, + + + issue_time = #{dto.issueTime}, + + + content = #{dto.content}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ReportMapper.xml b/src/main/resources/mapper/ReportMapper.xml index 55bc8de..7f657b5 100644 --- a/src/main/resources/mapper/ReportMapper.xml +++ b/src/main/resources/mapper/ReportMapper.xml @@ -84,7 +84,10 @@ FROM fi_reports WHERE deleted = 0 - AND name LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR type LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -92,5 +95,81 @@ ORDER BY created_at DESC + + UPDATE fi_reports + + + name = #{dto.name}, + + + type = #{dto.type}, + + + genre = #{dto.genre}, + + + episodes = #{dto.episodes}, + + + invest_amount = #{dto.investAmount}, + + + main_creators = #{dto.mainCreators}, + + + lead_producer = #{dto.leadProducer}, + + + producer_unit = #{dto.producerUnit}, + + + start_date = #{dto.startDate}, + + + end_date = #{dto.endDate}, + + + crew_scale = #{dto.crewScale}, + + + contact = #{dto.contact}, + + + phone_number = #{dto.phoneNumber}, + + + crew_position = #{dto.crewPosition}, + + + shoot_permit = #{dto.shootPermit}, + + + thumb_shoot_permit = #{dto.thumbShootPermit}, + + + approval_file = #{dto.approvalFile}, + + + thumb_approval_file = #{dto.thumbApprovalFile}, + + + shoot_apply = #{dto.shootApply}, + + + thumb_shoot_apply = #{dto.thumbShootApply}, + + + WHERE id = #{id} + AND deleted = false + + + + UPDATE fi_reports + SET + status = #{status} + WHERE id = #{id} + AND deleted = false + + diff --git a/src/main/resources/mapper/ShootMapper.xml b/src/main/resources/mapper/ShootMapper.xml index 2749bf2..78466e2 100644 --- a/src/main/resources/mapper/ShootMapper.xml +++ b/src/main/resources/mapper/ShootMapper.xml @@ -83,4 +83,38 @@ LIMIT 10 + + UPDATE fi_shoots + + + name = #{dto.name}, + + + description = #{dto.description}, + + + price = #{dto.price}, + + + status = #{dto.status}, + + + address = #{dto.address}, + + + phone = #{dto.phone}, + + + contact_name = #{dto.contactName}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + WHERE id = #{id} + AND deleted = false + diff --git a/src/main/resources/mapper/TourMapper.xml b/src/main/resources/mapper/TourMapper.xml index b9598a6..77b0df3 100644 --- a/src/main/resources/mapper/TourMapper.xml +++ b/src/main/resources/mapper/TourMapper.xml @@ -54,6 +54,7 @@ AND ( name LIKE CONCAT('%', #{keyword}, '%') OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') ) @@ -74,7 +75,11 @@ FROM fi_tours WHERE deleted = 0 - AND title LIKE CONCAT('%', #{keyword}, '%') + AND ( + name LIKE CONCAT('%', #{keyword}, '%') + OR description LIKE CONCAT('%', #{keyword}, '%') + OR theme LIKE CONCAT('%', #{keyword}, '%') + ) ORDER BY created_at DESC LIMIT #{offset}, #{size} @@ -89,4 +94,51 @@ LIMIT 10 + + UPDATE fi_tour + + + name = #{dto.name}, + + + description = #{dto.description}, + + + theme = #{dto.theme}, + + + features = #{dto.features}, + + + transport = #{dto.transport}, + + + hotel = #{dto.hotel}, + + + food = #{dto.food}, + + + image = #{dto.image}, + + + thumb_image = #{dto.thumbImage}, + + + longitude = #{dto.longitude}, + + + latitude = #{dto.latitude}, + + + location_id = #{dto.locationId}, + + + drama_id = #{dto.dramaId}, + + + WHERE id = #{id} + AND deleted = false + + From c22fea6194a1a27ae27c9783101e8e60019f64e2 Mon Sep 17 00:00:00 2001 From: definition <2117350690@qq.com> Date: Sat, 6 Dec 2025 13:52:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=AE=8C=E5=96=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/common/aspect/ServiceLogAspect.java | 24 ++++++++++--------- .../cn/cxdproject/coder/config/WebConfig.java | 7 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java index 0f262fe..8b0232b 100644 --- a/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java +++ b/src/main/java/cn/cxdproject/coder/common/aspect/ServiceLogAspect.java @@ -74,15 +74,15 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setTimestamp(LocalDateTime.now()); logEntity.setDeleted(false); - // ===== 1. 操作类型 ===== + // 1. 操作类型 LogType logType = loggable.type(); logEntity.setType(logType.getCode()); - // ===== 2. 操作描述：仅用注解 value（支持 SpEL）或枚举默认描述，绝不拼接目标信息 ===== + // 2. 操作描述 String desc = resolveSpel(loggable.value(), method, joinPoint.getArgs()); logEntity.setDescription(StringUtils.hasText(desc) ? desc : logType.getDescription()); - // ===== 3. 操作人信息 ===== + // 3. 操作人信息 User currentUser = AuthContext.getCurrentUser(); if (currentUser == null){ @@ -110,14 +110,20 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { result = joinPoint.proceed(); logEntity.setSuccess(true); - // 避免记录大数据量结果（如分页列表、文件流等） - if (result != null && !isLargeResult(result)) { + // 避免记录大数据量结果 + if (result == null) { + logEntity.setResult("null"); + } else if (isLargeResult(result)) { + // 是大结果 + logEntity.setResult("数据量过大，暂不记录"); + } else { + // 小结果 logEntity.setResult(safeToJson(result)); } } catch (Exception ex) { logEntity.setSuccess(false); logEntity.setResult("{\"error\": \"" + escapeJson(ex.getMessage()) + "\"}"); - throw ex; // 重新抛出异常，不影响业务异常传播 + throw ex; } // ===== 6. 异步保存日志 ===== @@ -126,20 +132,16 @@ public Object around(ProceedingJoinPoint joinPoint) throws Throwable { return result; } - /** - * 解析 SpEL 表达式（如 "#{#user.nickname}"） - */ private String resolveSpel(String expression, Method method, Object[] args) { if (!StringUtils.hasText(expression) || !expression.contains("#{")) { return expression; } try { - // 使用 Spring 的 MethodBasedEvaluationContext —— 自动支持 #arg0, #p0, #paramName + // 使用 Spring 的 MethodBasedEvaluationContext EvaluationContext context = new MethodBasedEvaluationContext(null, method, args, new LocalVariableTableParameterNameDiscoverer()); - // 必须用 TemplateParserContext 才能解析 "xxx #{...} xxx" ExpressionParser parser = new SpelExpressionParser(); return parser.parseExpression(expression, new TemplateParserContext()) .getValue(context, String.class); diff --git a/src/main/java/cn/cxdproject/coder/config/WebConfig.java b/src/main/java/cn/cxdproject/coder/config/WebConfig.java index fcf36cd..811ec94 100644 --- a/src/main/java/cn/cxdproject/coder/config/WebConfig.java +++ b/src/main/java/cn/cxdproject/coder/config/WebConfig.java @@ -93,9 +93,10 @@ public void addInterceptors(InterceptorRegistry registry) { // 政策模块管理员接口 .addPathPatterns("/api/policy/admin/**") //banner模块接口 - . addPathPatterns("/api/banner/**"); - registry.addInterceptor(registrationInterceptor) - .addPathPatterns("/api/admin/register/email"); + .addPathPatterns("/api/banner/**") + //操作日志相关接口 + .addPathPatterns("/api/operationlog/admin/**"); + registry.addInterceptor(registrationInterceptor); } @Bean