From a344f86b170588ffbfa838ff343df802f907f22c Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期二, 25 十月 2022 09:53:25 +0800 Subject: [PATCH] 代码重构 --- ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java | 3 ++- ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml | 7 ++++--- ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java | 3 --- ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java index 3f79c85..973780c 100644 --- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java +++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java @@ -33,7 +33,6 @@ @GetMapping("/query") @ApiOperation(value = "鏌ヨ") - @LogSave(operationType = "鏃ュ織绠$悊", contain = "鏌ヨ鏃ュ織淇℃伅") public CommonResult searchLog(LogQueryParams logQueryParams) { return CommonResult.success(iAdminLoginLogService.pageList(logQueryParams)); } diff --git a/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java b/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java index bf7351b..d1e8161 100644 --- a/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java +++ b/ycl-common/src/main/java/com/ycl/entity/user/vo/UmsAdminLogVO.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDateTime; import java.util.Date; @Data @@ -20,7 +21,7 @@ private String adminId; @ExcelProperty(index = 0, value = "鏃ュ織鏃堕棿", format = "YYYY-mm-dd HH:mm:ss") - private Date createTime; + private LocalDateTime createTime; @ExcelProperty(index = 4, value = "IP鍦板潃") private String ip; diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java index d6da87b..40457eb 100644 --- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java +++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminLoginLogMapper.java @@ -6,13 +6,10 @@ import com.ycl.entity.user.UmsAdminLoginLog; import com.ycl.entity.user.vo.UmsAdminLogVO; -import java.util.List; - /** * <p> * 鍚庡彴鐢ㄦ埛鐧诲綍鏃ュ織琛� Mapper 鎺ュ彛 * </p> - * */ public interface UmsAdminLoginLogMapper extends BaseMapper<UmsAdminLoginLog> { Page<UmsAdminLogVO> selectByCondition(Page<UmsAdminLogVO> umsAdminLogVOPage, LogQueryParams logQueryParams); diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml index c26d0af..1f5a1fd 100644 --- a/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml +++ b/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml @@ -13,7 +13,8 @@ </resultMap> <select id="selectByCondition" parameterType="com.ycl.dto.log.LogQueryParams" resultType="com.ycl.entity.user.vo.UmsAdminLogVO"> - SELECT t1.*,t2.username as adminId FROM ums_admin_login_log t1 left join ums_admin t2 on t1.admin_id=t2.id + SELECT t1.*,t2.username as adminId FROM ums_admin_login_log t1 + left join ums_admin t2 on t1.admin_id=t2.id <where> <if test="logQueryParams.content!='' and logQueryParams.content!=null"> contain LIKE CONCAT('%',#{logQueryParams.content},'%') @@ -24,10 +25,10 @@ <if test="logQueryParams.portEquipment!='' and logQueryParams.portEquipment!=null"> and user_agent=#{logQueryParams.portEquipment} </if> - <if test="logQueryParams.id!=null"> + <if test="logQueryParams.id != null"> and admin_id=#{logQueryParams.id} </if> - <if test="logQueryParams.startTime!='' and logQueryParams.endTime!=''"> + <if test="logQueryParams.startTime != '' and logQueryParams.endTime !='' and logQueryParams.startTime !=null and logQueryParams.endTime!=null "> and create_time BETWEEN #{logQueryParams.startTime} AND #{logQueryParams.endTime} </if> </where> -- Gitblit v1.8.0