日志列表 改用映射文件

common/fire-common/src/main/java/com/fire/common/constants/LogOperType.java

@@ -35,12 +35,12 @@ public class LogOperType {
     /**
      * 登录
      */
-    public static final String LOGIN_OPER = "登录";
+    public static final String LOGIN_OPER = "登录系统";
 
     /**
      * 注销
      */
-    public static final String LOGOUT_OPER = "注销";
+    public static final String LOGOUT_OPER = "退出系统";
 
     /**
      * 导出

common/fire-common/src/main/java/com/fire/common/constants/LogType.java

@@ -18,6 +18,11 @@ public class LogType {
      */
     public static final String SUPPLIER = "供应商";
 
+    /**
+     * 供应商或客户
+     */
+    public static final String SUPPLIER_CUSTOMER = "供应商或客户";
+
     /**
      * 客户模块
      */

modules/admin/src/main/java/com/fire/admin/annotation/FireOperationLog.java

@@ -11,9 +11,7 @@ import java.lang.annotation.*;
 @Documented
 public @interface FireOperationLog {
 
-    String operation() default "";
-
     String description() default "";
 
-    String [] type() default "";
+    String type() default "";
 }

modules/admin/src/main/java/com/fire/admin/aop/FireOperationLogAop.java

@@ -65,8 +65,8 @@ public class FireOperationLogAop {
                 // 判断是否有ApiOperation注解
                 boolean flag = method.isAnnotationPresent(ApiOperation.class);
                 if (flag) {
-                    ApiOperation annotation = method.getAnnotation(ApiOperation.class);
-                    desc = new StringBuilder(annotation.value());
+                    ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
+                    desc = new StringBuilder(apiOperation.value());
                 }
             }
             //将参数拼接进说明中
@@ -80,7 +80,7 @@ public class FireOperationLogAop {
                     rocketMQTemplate.send(UPDATE_TOPIC + ":" + LOG_TAG, MessageBuilder.withPayload(LOG_TAG).build());
                 }
                 LogInfo logInfo = LogInfo.builder().id(jedisCluster.incr(GLOBAL_ID_INCR.key())).createTime(new Date()).optUser(SecurityUtil.getUser().getUsername())
-                        .optInfo("").interfaceDesc(method.getAnnotation(FireOperationLog.class).description()).type(method.getAnnotation(FireOperationLog.class).operation()).build();
+                        .optInfo(Arrays.toString(joinPoint.getArgs())).interfaceDesc(method.getAnnotation(FireOperationLog.class).description()).type(method.getAnnotation(FireOperationLog.class).type()).build();
 
                 logInfoService.saveLogInfo(logInfo);
             } catch (Throwable throwable) {

modules/admin/src/main/java/com/fire/admin/mapper/LogInfoMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fire.admin.request.LogInfoPageParam;
 import com.fire.dto.LogInfo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author: admin
@@ -13,6 +14,6 @@ import com.fire.dto.LogInfo;
  */
 public interface LogInfoMapper extends BaseMapper<LogInfo> {
 
-    IPage<LogInfo> getLogInfoList(LogInfoPageParam logInfoPageParam);
+    IPage<LogInfo> getLogInfoList(@Param("param") LogInfoPageParam logInfoPageParam);
 
 }

modules/admin/src/main/java/com/fire/admin/request/LogInfoPageParam.java

@@ -23,10 +23,10 @@ public class LogInfoPageParam extends Page {
     private Date createTime;
 
     @ApiModelProperty("起始时间")
-    private Date startTime;
+    private String startTime;
 
     @ApiModelProperty("结束时间")
-    private Date endTime;
+    private String endTime;
 
     @ApiModelProperty("操作人")
     private String optUser;

modules/admin/src/main/java/com/fire/admin/rest/BankCardRest.java

@@ -9,7 +9,6 @@ package com.fire.admin.rest;
 
 import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.service.BankCardService;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.BankCard;
 import com.fire.dto.response.BaseResponse;
@@ -44,7 +43,7 @@ public class BankCardRest {
 
     @DeleteMapping("/delete/{bankId}")
     @ApiOperation(value = "删除银行卡", notes = "delete_bank_card.py")
-    @FireOperationLog(operation = LogOperType.DELETE_OPER, description = "删除银行卡", type = {LogType.SUPPLIER, LogType.CUSTOMER})
+    @FireOperationLog(description = "删除银行卡",type = LogType.SUPPLIER_CUSTOMER)
     public BaseResponse delete(@PathVariable("bankId") Long bankId) {
         bankCardService.deleteBankCardById(bankId);
         return new BaseResponse();

modules/admin/src/main/java/com/fire/admin/rest/ChannelGroupRest.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.request.ChannelGroupPageParam;
 import com.fire.admin.service.ChannelGroupService;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.ChannelGroup;
 import com.fire.dto.response.BaseResponse;
@@ -55,7 +54,7 @@ public class ChannelGroupRest {
 
     @PostMapping("/add")
     @ApiOperation(value = "添加通道组", notes = "add_channel_group.py")
-    @FireOperationLog(operation = LogOperType.ADD_OPER, description = "",type = LogType.SUPPLIER)
+    @FireOperationLog(description = "添加通道组",type = LogType.SUPPLIER)
     public BaseResponse saveChannelGroup(@RequestBody ChannelGroup channelGroup) {
         channelGroupService.addChannelGroup(channelGroup);
         return new BaseResponse();
@@ -63,7 +62,7 @@ public class ChannelGroupRest {
 
     @PutMapping("/update")
     @ApiOperation(value = "修改通道组", notes = "update_channel_group.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.UPDATE_OPER)
+    @FireOperationLog(description = "修改通道组",type = LogType.SUPPLIER)
     public BaseResponse updateChannelGroup(@RequestBody ChannelGroup channelGroup) {
         channelGroupService.updateChannelGroupById(channelGroup);
         return new BaseResponse();
@@ -71,7 +70,7 @@ public class ChannelGroupRest {
 
     @DeleteMapping("/delete/{channelGroupId}")
     @ApiOperation(value = "删除通道组", notes = "delete_channel_group.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.DELETE_OPER)
+    @FireOperationLog(description = "删除通道组",type = LogType.SUPPLIER)
     public BaseResponse removeChannelGroup(@PathVariable("channelGroupId") Long channelGroupId) {
         channelGroupService.delChanGrouAndDistGrouByChanGrouId(channelGroupId);
         return new BaseResponse();

modules/admin/src/main/java/com/fire/admin/rest/ChannelInfoRest.java

@@ -5,7 +5,6 @@ import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.request.ChannelPageParam;
 import com.fire.admin.request.ChannelSetInvalidParam;
 import com.fire.admin.service.ChannelInfoService;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.ChannelInfo;
 import com.fire.dto.ChannelSupplier;
@@ -76,7 +75,7 @@ public class ChannelInfoRest {
 
     @PostMapping("/add")
     @ApiOperation(value = "添加通道", notes = "add_channelInfo.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.ADD_OPER)
+    @FireOperationLog(description = "添加通道", type = LogType.SUPPLIER)
     public BaseResponse addChannelInfo(@RequestBody ChannelInfo channelInfo) {
         channelInfoService.insertChannelInfo(channelInfo);
         return new BaseResponse();
@@ -84,15 +83,15 @@ public class ChannelInfoRest {
 
     @PutMapping("/update")
     @ApiModelProperty(value = "修改通道", notes = "update_channelInfo.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.UPDATE_OPER)
+    @FireOperationLog(description = "修改通道", type = LogType.SUPPLIER)
     public BaseResponse updateChannelInfo(@RequestBody ChannelInfo channelInfo) {
         channelInfoService.updateChannelInfoById(channelInfo);
         return new BaseResponse();
     }
 
     @DeleteMapping("/delete/{channelId}")
-    @ApiOperation(value = "通道逻辑删除", notes = "delete_channelInfo.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.DELETE_OPER)
+    @ApiOperation(value = "删除通道", notes = "delete_channelInfo.py")
+    @FireOperationLog(description = "删除通道", type = LogType.SUPPLIER)
     public BaseResponse deleteChannelById(@PathVariable("channelId") Long channelId) {
         channelInfoService.deleteChannelAndChanProdAndChanMiddByChannelId(channelId);
         return new BaseResponse();
@@ -100,7 +99,7 @@ public class ChannelInfoRest {
 
     @PutMapping("/setIsValid")
     @ApiOperation(value = "通道置无效/有效", notes = "set_isvalid.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.SET_INVALID_OPER)
+    @FireOperationLog(description = "通道置无效/有效", type = LogType.SUPPLIER)
     public BaseResponse setInvalid(@RequestBody ChannelSetInvalidParam channelSetInvalidParam) {
         channelInfoService.setInvalid(channelSetInvalidParam.getChannelId(), channelSetInvalidParam.getIsValid());
         return new BaseResponse();

modules/admin/src/main/java/com/fire/admin/rest/ChannelProductInfoRest.java

@@ -2,7 +2,6 @@ package com.fire.admin.rest;
 
 import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.service.ChannelProductService;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.ChannelProductInfo;
 import com.fire.dto.response.BaseResponse;
@@ -41,7 +40,7 @@ public class ChannelProductInfoRest {
 
     @DeleteMapping("/delete/{channelProductId}")
     @ApiOperation(value = "删除通道产品", notes = "delete_channelProduct.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.DELETE_OPER)
+    @FireOperationLog(description = "删除通道产品", type = LogType.SUPPLIER)
     public BaseResponse deleteChannelProduct(@PathVariable("channelProductId") Long channelProductId) {
         channelProductService.deleteChannelProductByChanProdId(channelProductId);
         return new BaseResponse();

modules/admin/src/main/java/com/fire/admin/rest/ChannelSupplierRest.java

@@ -5,7 +5,6 @@ import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.request.SupplierPageParam;
 import com.fire.admin.request.SupplierSetInvalidParam;
 import com.fire.admin.service.SupplierService;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.ChannelSupplier;
 import com.fire.dto.response.BaseResponse;
@@ -44,8 +43,8 @@ public class ChannelSupplierRest {
     }
 
     @PostMapping("/add")
-    @ApiOperation(value = "新增供应商", notes = "supplier_add.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.ADD_OPER)
+    @ApiOperation(value = "添加供应商", notes = "supplier_add.py")
+    @FireOperationLog(description = "添加供应商",type = LogType.SUPPLIER)
     public BaseResponse addSupplier(@RequestBody ChannelSupplier channelSupplier) {
         supplierService.saveSupplier(channelSupplier);
         return new BaseResponse();
@@ -53,7 +52,7 @@ public class ChannelSupplierRest {
 
     @PostMapping("/update")
     @ApiOperation(value = "修改供应商", notes = "supplier_update.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.UPDATE_OPER)
+    @FireOperationLog(description = "修改供应商",type = LogType.SUPPLIER)
     public BaseResponse updateSupplierBySupplierId(@RequestBody ChannelSupplier channelSupplier) {
         supplierService.updateSupplierById(channelSupplier);
         return new BaseResponse();
@@ -61,7 +60,7 @@ public class ChannelSupplierRest {
 
     @DeleteMapping("/delete/{supplierId}")
     @ApiOperation(value = "删除供应商", notes = "supplier_delete.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.DELETE_OPER)
+    @FireOperationLog(description = "删除供应商",type = LogType.SUPPLIER)
     public BaseResponse deleteSupplierBySupplierId(@PathVariable("supplierId") Long supplierId) {
         supplierService.deleteSupplierAndChannelBySupplierId(supplierId);
         return new BaseResponse();
@@ -69,7 +68,7 @@ public class ChannelSupplierRest {
 
     @PutMapping("/setIsValid")
     @ApiOperation(value = "供应商置无效/有效", notes = "set_invalid.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.SET_INVALID_OPER)
+    @FireOperationLog(description = "供应商置无效/有效",type = LogType.SUPPLIER)
     public BaseResponse setInvalid(@RequestBody SupplierSetInvalidParam supplierSetInvalidParam) {
         supplierService.setInvalid(supplierSetInvalidParam.getSupplierId(), supplierSetInvalidParam.getIsValid());
         return new BaseResponse();

modules/admin/src/main/java/com/fire/admin/rest/DistGroupChannelRest.java

@@ -2,7 +2,6 @@ package com.fire.admin.rest;
 
 import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.service.DistGroupChannelService;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.response.BaseResponse;
 import io.swagger.annotations.Api;
@@ -31,7 +30,7 @@ public class DistGroupChannelRest {
 
     @DeleteMapping("/delete/{id}")
     @ApiOperation(value = "删除分发组下通道", notes = "delete_channel_info.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.DELETE_OPER)
+    @FireOperationLog(description = "删除分发组下通道", type = LogType.SUPPLIER)
     public BaseResponse deleteChannelById(@PathVariable("id") Long id) {
         distGroupChannelService.removeChannelById(id);
         return new BaseResponse();

modules/admin/src/main/java/com/fire/admin/rest/DistributeGroupRest.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.service.DistributeGroupService;
 import com.fire.admin.util.EnumUtils;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.DistributeGroup;
 import com.fire.dto.response.BaseResponse;
@@ -53,7 +52,7 @@ public class DistributeGroupRest {
 
     @DeleteMapping("/delete/{distributeGroupId}")
     @ApiOperation(value = "删除分发组", notes = "delete_distributeGroup.py")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.DELETE_OPER)
+    @FireOperationLog(description = "删除分发组", type = LogType.SUPPLIER)
     public BaseResponse deleteDistributeGroup(@PathVariable("distributeGroupId") Long distributeGroupId) {
         distributeGroupService.removeDistGroupAndChannelByDistGroupId(distributeGroupId);
         return new BaseResponse();

modules/admin/src/main/java/com/fire/admin/rest/SupplierAdditionalPaymentRest.java

@@ -3,7 +3,6 @@ package com.fire.admin.rest;
 import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.dto.AdditionalPaymentDto;
 import com.fire.admin.service.AdditionalPaymentService;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.response.BaseResponse;
 import com.fire.dto.response.BaseRestResponse;
@@ -32,7 +31,7 @@ public class SupplierAdditionalPaymentRest {
 
     @ApiOperation("供应商加款")
     @PostMapping("/add")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.ADDITIONAL_PAYMENT_OPER)
+    @FireOperationLog(description = "供应商加款", type = LogType.SUPPLIER)
     public BaseResponse makeAdditionalPayment(@RequestBody AdditionalPaymentDto additionalPaymentDto) {
         additionalPaymentService.insertAdditionalPaymen(additionalPaymentDto);
         return new BaseResponse();
@@ -47,16 +46,15 @@ public class SupplierAdditionalPaymentRest {
 
     @ApiOperation("更改加款记录，只能更改凭证,其余的都不能修改")
     @PostMapping("/update")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.UPDATE_OPER)
+    @FireOperationLog(description = "修改供应商加款记录", type = LogType.SUPPLIER)
     public BaseResponse makeUpdateAdditionalPayment(@RequestBody AdditionalPaymentDto additionalPaymentDto) {
         additionalPaymentService.updAdditionPayment(additionalPaymentDto);
         return new BaseResponse();
     }
 
-
-    @ApiOperation("供应商加款撤销")
     @PostMapping("/cancel")
-    @FireOperationLog(operation = LogType.SUPPLIER, description = LogOperType.ADDITIONAL_PAYMENT_CANCEL_OPER)
+    @ApiOperation("供应商加款撤销")
+    @FireOperationLog(description = "供应商撤销加款", type = LogType.SUPPLIER)
     public BaseRestResponse additionalPayment(@RequestBody AdditionalPaymentDto additionalPaymentDto) {
         return new BaseRestResponse(additionalPaymentService.cancelAdditionalPayment(additionalPaymentDto));
     }

modules/admin/src/main/java/com/fire/admin/rest/VirtualNumRest.java

@@ -3,7 +3,6 @@ package com.fire.admin.rest;
 import com.fire.admin.annotation.FireOperationLog;
 import com.fire.admin.request.VirtualNumPageParam;
 import com.fire.admin.service.VirtualNumService;
-import com.fire.common.constants.LogOperType;
 import com.fire.common.constants.LogType;
 import com.fire.dto.VirtualNum;
 import com.fire.dto.response.BaseResponse;
@@ -37,7 +36,7 @@ public class VirtualNumRest {
 
     @PostMapping("/add")
     @ApiOperation(value = "添加虚拟号段", notes = "add_virtualNum.py")
-    @FireOperationLog(operation = LogType.ORDER, description = LogOperType.ADD_OPER)
+    @FireOperationLog(description = "添加虚拟号段", type = LogType.ORDER)
     public BaseResponse addVirtualNum(@RequestBody VirtualNum virtualNum) {
         virtualNumService.addVirtualNum(virtualNum);
         return new BaseResponse();
@@ -45,7 +44,7 @@ public class VirtualNumRest {
 
     @DeleteMapping("/delete")
     @ApiOperation(value = "删除虚拟号段", notes = "delete_virtualNum.py")
-    @FireOperationLog(operation = LogType.ORDER, description = LogOperType.DELETE_OPER)
+    @FireOperationLog(description = "删除虚拟号段", type = LogType.ORDER)
     public BaseResponse deleteVirtualNum(@RequestBody List<String> virtualNums) {
         virtualNumService.removeVirtualNums(virtualNums);
         return new BaseResponse();

modules/admin/src/main/resources/mapper/LogInfoMapper.xml

@@ -12,8 +12,12 @@
     </resultMap>
 
     <sql id="common_field">
-        id
-        ,create_time,opt_user,opt_info,interface_desc,type
+        id,
+        create_time,
+        opt_user,
+        opt_info,
+        interface_desc,
+        type
     </sql>
 
     <select id="getLogInfoList" resultMap="logInfoResultMap">
@@ -21,14 +25,14 @@
         <include refid="common_field"/>
         FROM log_info
         <where>
-            <if test="createTime != null and createTime.trim() != ''">
-                BETWEEN create_time = #{startTime} AND create_time = #{endTime}
+            <if test="param.startTime != null and param.startTime != '' and param.endTime != null and param.endTime != '' ">
+                create_time &gt;= #{param.startTime} AND create_time &lt;= #{param.endTime}
             </if>
-            <if test="optUser != null and optUser.trim() != ''">
-                AND opt_user LIKE CONCAT('%' #{optUser},'%')
+            <if test="param.optUser != null and param.optUser.trim() != ''">
+                AND opt_user LIKE CONCAT('%' #{param.optUser},'%')
             </if>
-            <if test="type != null and type.trim() != ''">
-                AND type = #{type}
+            <if test="param.type != null and param.type != ''">
+                AND type = #{param.type}
             </if>
         </where>
         ORDER BY create_time DESC