From a68ee2ee85e9690d5f3f0ab5bef33559ab91f408 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Fri, 16 May 2025 16:05:36 +0800 Subject: [PATCH] dev --- .../common/config/RecordCommonLogAspect.java | 3 ++- .../common/CommonLogController.java | 26 +++++++++++++++++++ .../server/entity/common/CommonLog.java | 2 ++ .../entity/common/dto/CommonLogQuery.java | 9 +++++++ .../service/common/CommonLogService.java | 14 ++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java create mode 100644 src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java diff --git a/src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java b/src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java index b09fba7..f21bece 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java +++ b/src/main/java/com/syjiaer/clinic/server/common/config/RecordCommonLogAspect.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.After; +import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +33,7 @@ public class RecordCommonLogAspect { } - @After("pointcut()") + @AfterReturning("pointcut()") public void after(JoinPoint joinPoint) { // 获取被切入的方法 MethodSignature signature = (MethodSignature) joinPoint.getSignature(); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java new file mode 100644 index 0000000..259efa3 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java @@ -0,0 +1,26 @@ +package com.syjiaer.clinic.server.controller.common; + +import com.syjiaer.clinic.server.common.vo.Page; +import com.syjiaer.clinic.server.common.vo.Result; +import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.common.CommonLog; +import com.syjiaer.clinic.server.entity.common.dto.CommonLogQuery; +import com.syjiaer.clinic.server.service.common.CommonLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/common/log") +public class CommonLogController extends BaseController { + @Autowired + private CommonLogService commonLogService; + + + @RequestMapping("page") + public Result> page() { + CommonLogQuery query = parmsUtil.getObject("query", CommonLogQuery.class); + return success(commonLogService.pageList(query)); + } + +} diff --git a/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java b/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java index 8a22475..30ff4cf 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/common/CommonLog.java @@ -3,6 +3,7 @@ package com.syjiaer.clinic.server.entity.common; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; @@ -40,6 +41,7 @@ public class CommonLog implements Serializable { private String message; @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createDatetime; @ApiModelProperty("管理员名称") diff --git a/src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java new file mode 100644 index 0000000..d30d218 --- /dev/null +++ b/src/main/java/com/syjiaer/clinic/server/entity/common/dto/CommonLogQuery.java @@ -0,0 +1,9 @@ +package com.syjiaer.clinic.server.entity.common.dto; + +import lombok.Data; + +@Data +public class CommonLogQuery { + private Integer pageNum; + private Integer pageSize; +} diff --git a/src/main/java/com/syjiaer/clinic/server/service/common/CommonLogService.java b/src/main/java/com/syjiaer/clinic/server/service/common/CommonLogService.java index e838b10..fa79d52 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/common/CommonLogService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/common/CommonLogService.java @@ -1,8 +1,11 @@ package com.syjiaer.clinic.server.service.common; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.syjiaer.clinic.server.common.exception.MessageException; +import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.common.CommonLog; +import com.syjiaer.clinic.server.entity.common.dto.CommonLogQuery; import com.syjiaer.clinic.server.entity.manager.ManagerUser; import com.syjiaer.clinic.server.mapper.common.CommonLogMapper; import com.syjiaer.clinic.server.service.BaseService; @@ -36,4 +39,15 @@ public class CommonLogService extends BaseService { commonLog.setParams(JSONObject.toJSONString(map)); commonLogMapper.insert(commonLog); } + + /** + * 分页查询 + * @param query + * @return + */ + public Page pageList(CommonLogQuery query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + return pageHelper(query.getPageNum(), query.getPageSize(), + queryWrapper, commonLogMapper, "id", false); + } }