feat : log-biz 操作日志中添加服务名称

log/log-biz/src/main/java/cn/fateverse/log/controller/OperationLogController.java

@@ -2,12 +2,9 @@ package cn.fateverse.log.controller;
 
 import cn.fateverse.common.core.result.Result;
 import cn.fateverse.common.core.result.page.TableDataInfo;
-import cn.fateverse.common.security.annotation.Anonymity;
 import cn.fateverse.log.query.OperationLogQuery;
 import cn.fateverse.log.service.OperationService;
 import cn.fateverse.log.vo.OperationLogVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -19,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
  * @author Clay
  * @date 2022/11/1
  */
-@Api(tags = "操作日志管理")
 @Slf4j
 @RestController
 @RequestMapping("/log")
@@ -31,13 +27,7 @@ public class OperationLogController {
         this.operationService = operationService;
     }
 
-    /**
-     * @param operationLogQuery
-     * @return
-     */
     @GetMapping("/list")
-    @Anonymity
-    @ApiOperation("查询日志信息")
     @PreAuthorize("@ss.hasPermission('admin:log:list')")
     public Result<TableDataInfo<OperationLogVo>> SearchLog(OperationLogQuery operationLogQuery) {
         TableDataInfo<OperationLogVo> dataTable = operationService.search(operationLogQuery);
@@ -45,7 +35,6 @@ public class OperationLogController {
     }
 
     @GetMapping("/{operId}")
-    @ApiOperation("查询日志信息")
     @PreAuthorize("@ss.hasPermission('admin:log:list')")
     public Result<OperationLogVo> SearchLog(@PathVariable Long operId) {
         OperationLogVo operationLogVo = operationService.select(operId);
@@ -53,7 +42,6 @@ public class OperationLogController {
     }
 
     @DeleteMapping("/{operIds}")
-    @ApiOperation("操作日志删除")
     @PreAuthorize("@ss.hasPermission('admin:log:del')")
     public Result<Integer> OperationInfoRemove(@PathVariable Long[] operIds) {
         if (operIds.length == 0) {

log/log-biz/src/main/resources/mapper/OperationMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="cn.fateverse.log.entity.OperationLog" id="OperationLogResult">
         <id property="operId" column="oper_id"/>
         <result property="title" column="title"/>
+        <result property="applicationName" column="application_name"/>
         <result property="businessType" column="business_type"/>
         <result property="method" column="method"/>
         <result property="requestMethod" column="request_method"/>
@@ -24,15 +25,35 @@
         <result property="consumeTime" column="consume_time"/>
     </resultMap>
 
+    <sql id="selectSql">
+        select oper_id,
+               title,
+               application_name,
+               business_type,
+               method,
+               request_method,
+               operator_type,
+               oper_name,
+               dept_name,
+               oper_url,
+               oper_ip,
+               oper_location,
+               state,
+               oper_time,
+               consume_time
+        from sys_operation_log
+    </sql>
+
 
     <insert id="batchSave">
         insert into sys_operation_log
-        (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip,
+        (oper_id, title, application_name, business_type, method, request_method, operator_type, oper_name, dept_name,
+        oper_url, oper_ip,
         oper_location, oper_param, json_result, state, error_msg, error_stack_trace, oper_time, consume_time)
         values
         <foreach collection="list" item="log" separator=",">
-            (#{log.operId}, #{log.title}, #{log.businessType}, #{log.method}, #{log.requestMethod}, #{log.operatorType},
-            #{log.operName},
+            (#{log.operId}, #{log.title}, #{log.applicationName}, #{log.businessType}, #{log.method},
+            #{log.requestMethod}, #{log.operatorType},#{log.operName},
             #{log.deptName}, #{log.operUrl}, #{log.operIp}, #{log.operLocation}, #{log.operParam}, #{log.jsonResult},
             #{log.state}, #{log.errorMsg},
             #{log.errorStackTrace}, #{log.operTime}, #{log.consumeTime})
@@ -41,15 +62,16 @@
 
     <select id="searchSubQuery" resultMap="OperationLogResult"
             parameterType="cn.fateverse.log.query.OperationLogQuery">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url,
-        oper_ip, oper_location, state, oper_time, consume_time
-        from sys_operation_log
+        <include refid="selectSql"/>
         <where>
             oper_id >= (select oper_id from sys_operation_log
             <where>
                 <if test="operation.title !=null and operation.title !=''">
                     and title like concat('%',#{operation.title},'%')
                 </if>
+                <if test="operation.applicationName !=null and operation.applicationName !=''">
+                    and application_name like concat('%',#{operation.applicationName},'%')
+                </if>
                 <if test="operation.operName !=null and operation.operName !=''">
                     and oper_name like concat('%',#{operation.operName},'%')
                 </if>
@@ -71,6 +93,9 @@
             <if test="operation.title !=null and operation.title !=''">
                 and title like concat('%',#{operation.title},'%')
             </if>
+            <if test="operation.applicationName !=null and operation.applicationName !=''">
+                and application_name like concat('%',#{operation.applicationName},'%')
+            </if>
             <if test="operation.operName !=null and operation.operName !=''">
                 and oper_name like concat('%',#{operation.operName},'%')
             </if>
@@ -93,13 +118,14 @@
 
     <select id="search" resultMap="OperationLogResult"
             parameterType="cn.fateverse.log.query.OperationLogQuery">
-        select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url,
-        oper_ip, oper_location, state, oper_time, consume_time
-        from sys_operation_log
+        <include refid="selectSql"/>
         <where>
             <if test="operation.title !=null and operation.title !=''">
                 and title like concat('%',#{operation.title},'%')
             </if>
+            <if test="operation.applicationName !=null and operation.applicationName !=''">
+                and application_name like concat('%',#{operation.applicationName},'%')
+            </if>
             <if test="operation.operName !=null and operation.operName !=''">
                 and oper_name like concat('%',#{operation.operName},'%')
             </if>
@@ -125,6 +151,9 @@
             <if test="operation.title !=null and operation.title !=''">
                 and title like concat('%',#{operation.title},'%')
             </if>
+            <if test="operation.applicationName !=null and operation.applicationName !=''">
+                and application_name like concat('%',#{operation.applicationName},'%')
+            </if>
             <if test="operation.operName !=null and operation.operName !=''">
                 and oper_name like concat('%',#{operation.operName},'%')
             </if>
@@ -153,6 +182,7 @@
     <select id="selectById" resultMap="OperationLogResult">
         select oper_id,
                title,
+               application_name,
                business_type,
                method,
                request_method,