Selaa lähdekoodia

fix: 日志管理,删除请求方式调整

chenjianhua 7 kuukautta sitten
vanhempi
commit
9dc17b53e6

+ 5 - 0
service-base/src/main/java/com/simuwang/base/pojo/dos/LoggingDO.java

@@ -1,11 +1,13 @@
 package com.simuwang.base.pojo.dos;
 
 import com.simuwang.base.common.conts.Constants;
+import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.pojo.vo.LoggingVO;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author wangzaijun
@@ -27,6 +29,8 @@ public class LoggingDO{
     private Boolean hasException;
     private String exception;
     private String userName;
+    private Date createTime;
+
 
     public LoggingVO toVO() {
         LoggingVO vo = new LoggingVO();
@@ -38,6 +42,7 @@ public class LoggingDO{
         vo.setRemoteAddr(this.remoteAddr);
         vo.setUserName(this.userName);
         vo.setExecuteTime(this.executeTime);
+        vo.setCreateTime(DateUtils.format(this.createTime,DateUtils.YYYY_MM_DD_HH_MM_SS));
         return vo;
     }
 }

+ 4 - 0
service-base/src/main/java/com/simuwang/base/pojo/vo/LoggingVO.java

@@ -42,4 +42,8 @@ public class LoggingVO {
      */
     private String userName;
 
+    /**
+     * 创建时间
+     */
+    private String createTime;
 }

+ 5 - 2
service-base/src/main/resources/mapper/system/SysLogMapper.xml

@@ -10,7 +10,8 @@
         <result column="remote_addr" property="remoteAddr"/>
         <result column="execute_time" property="executeTime"/>
         <result column="params" property="params"/>
-        <result column="userName" property="userName"/>
+        <result column="user_name" property="userName"/>
+        <result column="createtime" property="createTime"/>
     </resultMap>
     <update id="deleteLog">
         update PPW_EMAIL.sys_log set isvalid=0,sysdate=sysdate() where isvalid=1 and id in
@@ -19,7 +20,7 @@
         </foreach>
     </update>
     <select id="searchLogList" resultMap="BaseResultMap">
-          select distinct log.id,log.title,log.type,log.request_uri,log.method,log.remote_addr,log.execute_time,log.params,log.params,u.user_name
+          select distinct log.id,log.title,log.type,log.request_uri,log.method,log.remote_addr,log.execute_time,log.params,log.params,log.createtime,u.user_name
           from PPW_EMAIL.sys_log log
           left join PPW_EMAIL.sys_user u
           on log.creatorid=u.user_id and u.isvalid=1
@@ -31,6 +32,8 @@
                 and u.user_name like concat ('%',#{userName},'%')
             </if>
         </where>
+        order by log.createtime desc
+        limit #{offset},#{pageSize}
     </select>
     <select id="countLogList" resultType="java.lang.Long">
         select count(distinct log.id)

+ 2 - 5
service-manage/src/main/java/com/simuwang/manage/api/log/LogController.java

@@ -7,10 +7,7 @@ import com.simuwang.base.pojo.vo.LoggingVO;
 import com.simuwang.logging.LoggingService;
 import com.simuwang.logging.SystemLog;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 日志管理
@@ -45,7 +42,7 @@ public class LogController {
      * @return
      */
     @SystemLog(value = "删除日志")
-    @GetMapping("/delete-log")
+    @PostMapping("/delete-log")
     public boolean deleteLog(@RequestBody IdListVO idListVO){
         loggingService.deleteLog(idListVO);
         return true;

+ 1 - 0
service-manage/src/main/java/com/simuwang/manage/service/impl/system/SysLogServiceImpl.java

@@ -18,6 +18,7 @@ import com.simuwang.base.pojo.vo.LoggingVO;
 import com.simuwang.base.pojo.vo.sys.SysLogVO;
 import com.simuwang.logging.Logging;
 import com.simuwang.manage.service.system.SysLogService;
+import com.simuwang.shiro.utils.UserUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;