admin增加菜单操作日志

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BusinessType.java

@@ -8,52 +8,120 @@ package com.liquidnet.client.admin.common.enums;
 public enum BusinessType
 {
     /**
-     * 其它
+     * 其它 0
      */
     OTHER,
 
     /**
-     * 新增
+     * 新增 1
      */
     INSERT,
 
     /**
-     * 修改
+     * 修改 2
      */
     UPDATE,
 
     /**
-     * 删除
+     * 删除 3
      */
     DELETE,
 
     /**
-     * 授权
+     * 授权 4
      */
     GRANT,
 
     /**
-     * 导出
+     * 导出 5
      */
     EXPORT,
 
     /**
-     * 导入
+     * 导入 6
      */
     IMPORT,
 
     /**
-     * 强退
+     * 强退 7
      */
     FORCE,
 
     /**
-     * 生成代码
+     * 生成代码 8
      */
     GENCODE,
     
     /**
-     * 清空
+     * 清空 9
      */
     CLEAN,
+
+    /**
+     * 列表查询 10
+     */
+    LIST,
+
+    /**
+     * 详情 11
+     */
+    DETAIL,
+
+    /**
+     * 会员信息-生成兑换码 12
+     */
+    MEMBER_GEN_CODE,
+
+    /**
+     *  取消 13
+     */
+    CANCEL,
+
+    /**
+     *  审核 14
+     */
+    AUDIT,
+
+    /**
+     *  二审 15
+     */
+   AUDIT2,
+
+    /**
+     *  申请 16
+     */
+    APPLY,
+
+    /**
+     *  重新申请 17
+     */
+    REAPPLY,
+
+    /**
+     *  主动完成退款 18
+     */
+    COMPLETE_REFUND,
+
+    /**
+     *  快递-下单 19
+     */
+    PLACE_ORDER,
+
+    /**
+     *  快递-打印 20
+     */
+    PRINT,
+    /**
+     *  下载图片 21
+     */
+    DOWNLOAD_IMAGE,
+    /**
+     *  批量下载图片 22
+     */
+    BATCH_DOWNLOAD_IMAGE,
+
+    /**
+     *  快递-打印 23
+     */
+    BATCH_PRINT,
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.client.admin.common.annotation.Log;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberAdminService;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeAdminService;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminService;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
 import com.liquidnet.service.adam.dto.AdamMemberParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
@@ -13,8 +14,6 @@ import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -23,8 +22,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,6 +41,7 @@ public class AdamMemberAdminController {
     @Autowired
     RedisUtil redisUtil;
 
+    @Log(title = "会员信息", businessType = BusinessType.LIST)
     @RequiresPermissions("adam:member:list")
     @ApiOperation(value = "会员卡列表")
     @PostMapping("list")
@@ -60,6 +58,7 @@ public class AdamMemberAdminController {
         return ResponseDto.success(vos);
     }
 
+    @Log(title = "会员信息", businessType = BusinessType.INSERT)
     @RequiresPermissions("adam:member:add")
     @ApiOperation(value = "添加会员卡")
     @PostMapping("add")
@@ -68,6 +67,7 @@ public class AdamMemberAdminController {
         return ResponseDto.success();
     }
 
+    @Log(title = "会员信息", businessType = BusinessType.DETAIL)
     @RequiresPermissions("adam:member:info")
     @ApiOperation(value = "会员卡详情")
     @PostMapping("info")
@@ -77,6 +77,7 @@ public class AdamMemberAdminController {
         ));
     }
 
+    @Log(title = "会员信息", businessType = BusinessType.UPDATE)
     @RequiresPermissions("adam:member:edit")
     @ApiOperation(value = "会员卡编辑")
     @PostMapping("edit")
@@ -85,6 +86,7 @@ public class AdamMemberAdminController {
         return ResponseDto.success();
     }
 
+    @Log(title = "会员信息", businessType = BusinessType.MEMBER_GEN_CODE)
     @RequiresPermissions("adam:member:gen_code")
     @ApiOperation(value = "生成兑换码")
     @PostMapping("gen_code")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberOrderController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberOrderAdminService;
 import com.liquidnet.service.adam.dto.MemberOrderDto;
 import com.liquidnet.service.adam.dto.param.admin.MemberOrderListReq;
@@ -42,6 +44,8 @@ public class AdamMemberOrderController extends BaseController
     /**
      * 查询【请填写功能名称】列表
      */
+
+    @Log(title = "会员订单", businessType = BusinessType.LIST)
     @RequiresPermissions("adam:order:orderlist:list")
     @PostMapping("/orderList/list")
     @ResponseBody
@@ -55,6 +59,7 @@ public class AdamMemberOrderController extends BaseController
     /**
      * 订单详情
      */
+    @Log(title = "会员订单", businessType = BusinessType.DETAIL)
     @RequiresPermissions("adam:order:orderlist:detail")
     @GetMapping("/orderList/detail/{orderId}")
     public String orderDetail(@PathVariable("orderId") String orderId, ModelMap mmap) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberPriceAdminController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.client.admin.common.annotation.Log;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminService;
 import com.liquidnet.service.adam.dto.AdamMemberPriceParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
@@ -31,6 +33,7 @@ public class AdamMemberPriceAdminController {
     @Autowired
     IAdamMemberPriceAdminService adamMemberPriceService;
 
+    @Log(title = "会员价格", businessType = BusinessType.LIST)
     @RequiresPermissions("adam:mprice:list")
     @ApiOperation(value = "会员价格列表")
     @ApiImplicitParams({
@@ -48,6 +51,7 @@ public class AdamMemberPriceAdminController {
         return ResponseDto.success(vos);
     }
 
+    @Log(title = "会员价格", businessType = BusinessType.DETAIL)
     @RequiresPermissions("adam:mprice:info")
     @ApiOperation(value = "会员价格详情")
     @ApiImplicitParams({
@@ -65,6 +69,7 @@ public class AdamMemberPriceAdminController {
         return ResponseDto.success(AdamMemberPriceVo.getNew().copy(one));
     }
 
+    @Log(title = "会员价格", businessType = BusinessType.INSERT)
     @RequiresPermissions("adam:mprice:add")
     @ApiOperation(value = "添加会员价格")
     @PostMapping("add")
@@ -74,6 +79,7 @@ public class AdamMemberPriceAdminController {
         return ResponseDto.success(adamMemberPriceService.add(entity));
     }
 
+    @Log(title = "会员价格", businessType = BusinessType.UPDATE)
     @RequiresPermissions("adam:mprice:edit")
     @ApiOperation(value = "编辑会员价格")
     @PostMapping("edit")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamSwitchAdminController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
+import com.liquidnet.client.admin.common.annotation.Log;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.base.ResponseDto;
@@ -28,6 +30,7 @@ public class AdamSwitchAdminController {
     @Autowired
     RedisUtil redisUtil;
 
+    @Log(title = "ADAM配置", businessType = BusinessType.GRANT)
     @RequiresPermissions("adam:switch:buy:member")
     @ApiOperation(value = "开放/限制购买会员")
     @ApiImplicitParams({
@@ -39,6 +42,7 @@ public class AdamSwitchAdminController {
         return ResponseDto.success(redisUtil.get(AdamRedisConst.SWITCH_BUY_MEMBER));
     }
 
+    @Log(title = "ADAM配置", businessType = BusinessType.OTHER)
     @RequiresPermissions("adam:switch:max:memberno")
     @ApiOperation(value = "会员用户最大ID_NO")
     @ApiImplicitParams({

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserAdminController.java

@@ -41,6 +41,7 @@ public class AdamUserAdminController extends BaseController
     /**
      * 查询用户列表
      */
+    @Log(title = "会员用户", businessType = BusinessType.LIST)
     @RequiresPermissions("adam:user:list")
     @PostMapping("/list")
     @ResponseBody
@@ -55,7 +56,7 @@ public class AdamUserAdminController extends BaseController
      * 导出用户列表
      */
     @RequiresPermissions("adam:user:export")
-    @Log(title = "用户", businessType = BusinessType.EXPORT)
+    @Log(title = "会员用户", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
     public AjaxResult export(AdamUser adamUser)
@@ -78,7 +79,7 @@ public class AdamUserAdminController extends BaseController
      * 新增保存用户
      */
     @RequiresPermissions("adam:user:add")
-    @Log(title = "用户", businessType = BusinessType.INSERT)
+    @Log(title = "会员用户", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
     public AjaxResult addSave(AdamUser adamUser)
@@ -101,7 +102,7 @@ public class AdamUserAdminController extends BaseController
      * 修改保存用户
      */
     @RequiresPermissions("adam:user:edit")
-    @Log(title = "用户", businessType = BusinessType.UPDATE)
+    @Log(title = "会员用户", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
     public AjaxResult editSave(AdamUser adamUser)
@@ -113,7 +114,7 @@ public class AdamUserAdminController extends BaseController
      * 删除用户
      */
     @RequiresPermissions("adam:user:remove")
-    @Log(title = "用户", businessType = BusinessType.DELETE)
+    @Log(title = "会员用户", businessType = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
     public AjaxResult remove(String ids)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserMemberAdminController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 
+import com.liquidnet.client.admin.common.annotation.Log;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.base.ResponseDto;
@@ -29,6 +31,7 @@ public class AdamUserMemberAdminController {
     @Autowired
     RedisUtil redisUtil;
 
+    @Log(title = "会员用户", businessType = BusinessType.DETAIL)
     @RequiresPermissions("adam:umember:blk:lis")
     @ApiOperation(value = "会员黑名单UID")
     @PostMapping("blk/lis")
@@ -36,6 +39,8 @@ public class AdamUserMemberAdminController {
         return ResponseDto.success((List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID));
     }
 
+
+    @Log(title = "会员用户", businessType = BusinessType.INSERT)
     @RequiresPermissions("adam:umember:blk:add")
     @ApiOperation(value = "添加会员黑名单")
     @PostMapping("blk/add")
@@ -63,6 +68,7 @@ public class AdamUserMemberAdminController {
         return ResponseDto.success(invalidList);
     }
 
+    @Log(title = "会员用户", businessType = BusinessType.DELETE)
     @RequiresPermissions("adam:umember:blk:del")
     @ApiOperation(value = "删除会员黑名单")
     @PostMapping("blk/del")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BannersDisplayLocation;
 import com.liquidnet.client.admin.common.enums.BannersTargetType;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinBannersServiceImpl;
 import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.BannersParam;
@@ -64,6 +66,7 @@ public class KylinBannersAdminController extends BaseController {
         return prefix + "/create";
     }
 
+    @Log(title = "Banner列表", businessType = BusinessType.INSERT)
     @RequiresPermissions("kylin:banners:create")
     @PostMapping("create")
     @ResponseBody
@@ -98,6 +101,7 @@ public class KylinBannersAdminController extends BaseController {
         return prefix + "/update";
     }
 
+    @Log(title = "Banner列表", businessType = BusinessType.UPDATE)
     @RequiresPermissions("kylin:banners:update")
     @PostMapping("update")
     @ResponseBody
@@ -125,6 +129,7 @@ public class KylinBannersAdminController extends BaseController {
         return prefix + "/banners";
     }
 
+    @Log(title = "Banner列表", businessType = BusinessType.LIST)
     @RequiresPermissions("kylin:banners:list")
     @PostMapping("list")
     @ResponseBody
@@ -133,6 +138,7 @@ public class KylinBannersAdminController extends BaseController {
         return getDataTable(result.getList());
     }
 
+    @Log(title = "Banner列表", businessType = BusinessType.DELETE)
     @RequiresPermissions("kylin:banners:delete")
     @PostMapping("delete")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinMemberAuditController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
-import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
-import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
-import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
-import com.liquidnet.service.kylin.dao.PerformanceRecommendDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -60,6 +57,7 @@ public class KylinMemberAuditController extends BaseController {
     }
 
     //@RequiresPermissions("kylin:performances:member")
+    @Log(title = "会员待审核", businessType = BusinessType.UPDATE)
     @PostMapping("/save")
     @ResponseBody
     public AjaxResult save(@RequestParam("performancesId") String performancesId, @RequestParam("status")Integer status, @RequestParam("rejectTxt")String rejectTxt) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -2,9 +2,11 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import cn.hutool.core.text.UnicodeUtil;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
@@ -51,6 +53,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         return prefix + "/refund";
     }
 
+    @Log(title = "订单退款列表", businessType = BusinessType.DETAIL)
     @RequiresPermissions("kylin:refund:detail")
     @GetMapping(value = "/details/{orderRefundId}")
     public String detail(@PathVariable("orderRefundId") String orderRefundId, ModelMap mmap) {
@@ -60,6 +63,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         return prefix + "/details";
     }
 
+    @Log(title = "订单退款列表", businessType = BusinessType.LIST)
     @RequiresPermissions("kylin:refund:list")
     @PostMapping("/list")
     @ResponseBody
@@ -73,6 +77,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         return prefix + "/applyView";
     }
 
+    @Log(title = "订单退款列表", businessType = BusinessType.DETAIL)
     @PostMapping("applyOrder")
     @ResponseBody
     public RefundOrderDetailsVo applyOrder(RefundApplyParam refundApplyParam) {
@@ -80,6 +85,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         return orderInfo;
     }
 
+    @Log(title = "订单退款列表", businessType = BusinessType.INSERT)
     @RequiresPermissions("kylin:refund:apply")
     @PostMapping("apply")
     @ResponseBody
@@ -96,6 +102,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
+    @Log(title = "订单退款列表", businessType = BusinessType.CANCEL)
     @RequiresPermissions("kylin:refund:cancel")
     @PostMapping("cancel")
     @ResponseBody
@@ -113,6 +120,7 @@ public class KylinOrderRefundAdminController extends BaseController {
         }
     }
 
+    @Log(title = "订单退款列表", businessType = BusinessType.REAPPLY)
     @RequiresPermissions("kylin:refund:reapply")
     @PostMapping("reapply")
     @ResponseBody
@@ -131,6 +139,7 @@ public class KylinOrderRefundAdminController extends BaseController {
     }
 
     // 一审
+    @Log(title = "订单退款列表", businessType = BusinessType.AUDIT)
     @RequiresPermissions("kylin:refund:review")
     @PostMapping("review")
     @ResponseBody
@@ -157,6 +166,7 @@ public class KylinOrderRefundAdminController extends BaseController {
     }
 
     // 二审
+    @Log(title = "订单退款列表", businessType = BusinessType.AUDIT2)
     @RequiresPermissions("kylin:refund:execute")
     @PostMapping("execute")
     @ResponseBody
@@ -196,6 +206,7 @@ public class KylinOrderRefundAdminController extends BaseController {
     }
 
     // 主动完成退款 没有批量
+    @Log(title = "订单退款列表", businessType = BusinessType.COMPLETE_REFUND)
     @RequiresPermissions("kylin:refund:completed")
     @PostMapping("completed")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundBatchAdminController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinRefundPerformancesAdminServiceImpl;
 import com.liquidnet.service.base.ResponseDto;
@@ -11,9 +13,9 @@ import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesVo;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -50,6 +52,7 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
         return prefix + "/refundBatch";
     }
 
+    @Log(title = "演出退款管理", businessType = BusinessType.DETAIL)
     @RequiresPermissions("kylin:refundBatch:detail")
     @GetMapping(value = "/details/{refundBatchId}")
     public String detail(@PathVariable("refundBatchId") String refundBatchId, ModelMap mmap) {
@@ -59,6 +62,7 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
         return prefix + "/details";
     }
 
+    @Log(title = "演出退款管理", businessType = BusinessType.LIST)
     @RequiresPermissions("kylin:refundBatch:list")
     @PostMapping("/list")
     @ResponseBody
@@ -72,6 +76,8 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
         return prefix +  "/applyView";
     }
 
+
+    @Log(title = "演出退款管理", businessType = BusinessType.OTHER)
     @PostMapping("applyPerformance")
     @ResponseBody
     public KylinOrderRefundBatchesPerformanceVo applyPerformance(RefundBatchApplyParam refundBatchApplyParam) {
@@ -86,6 +92,7 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
         return kylinOrderRefundBatchesPerformanceVo;
     }
 
+    @Log(title = "演出退款管理", businessType = BusinessType.APPLY)
     @RequiresPermissions("kylin:refundBatch:apply")
     @PostMapping("apply")
     @ResponseBody
@@ -102,6 +109,7 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
         }
     }
 
+    @Log(title = "演出退款管理", businessType = BusinessType.REAPPLY)
     @RequiresPermissions("kylin:refundBatch:reapply")
     @PostMapping("reapply")
     @ResponseBody
@@ -121,6 +129,8 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
         }
     }
 
+
+    @Log(title = "演出退款管理", businessType = BusinessType.DELETE)
     @RequiresPermissions("kylin:refundBatch:cancel")
     @PostMapping("cancel")
     @ResponseBody
@@ -140,6 +150,7 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
         }
     }
 
+    @Log(title = "演出退款管理", businessType = BusinessType.AUDIT)
     @RequiresPermissions("kylin:refundBatch:review")
     @PostMapping("review")
     @ResponseBody
@@ -157,6 +168,8 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
         }
     }
 
+
+    @Log(title = "演出退款管理", businessType = BusinessType.AUDIT2)
     @RequiresPermissions("kylin:refundBatch:execute")
     @PostMapping("execute")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.dao.PerformanceSponsorDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
@@ -45,6 +47,7 @@ public class KylinOrderTicketsController extends BaseController
     /**
      * 查询订单列表
      */
+    @Log(title = "演出订单", businessType = BusinessType.LIST)
     @RequiresPermissions("kylin:order:orderlist:list")
     @PostMapping("/orderList/list")
     @ResponseBody
@@ -58,6 +61,7 @@ public class KylinOrderTicketsController extends BaseController
     /**
      * 订单详情
      */
+    @Log(title = "演出订单", businessType = BusinessType.DETAIL)
     @RequiresPermissions("kylin:order:orderlist:detail")
     @GetMapping("/orderList/detail/{orderId}")
     public String addPerformance(@PathVariable("orderId") String orderId, ModelMap mmap) {
@@ -69,6 +73,7 @@ public class KylinOrderTicketsController extends BaseController
     /**
      * 获取第三方列表
      */
+    @Log(title = "演出订单-三方", businessType = BusinessType.LIST)
     @GetMapping("/orderList/getSponsorList")
     @ResponseBody
     public AjaxResult getSponsorList() {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -2,12 +2,12 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceOrderStatisCountResp;
-import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinDamaiServiceImpl;
-import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
@@ -21,7 +21,6 @@ import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import com.liquidnet.service.kylin.service.other.DamaiService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -58,6 +57,7 @@ public class KylinPerformancesController extends BaseController {
      * 查询演出列表
      */
     //@RequiresPermissions("kylin:performances:view")
+    @Log(title = "演出列表", businessType = BusinessType.LIST)
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) {
@@ -70,6 +70,7 @@ public class KylinPerformancesController extends BaseController {
     }
 
     //@RequiresPermissions("kylin:performances:view")
+    @Log(title = "演出列表", businessType = BusinessType.DETAIL)
     @GetMapping(value = "/details/{performancesId}")
     public String performanceDetails(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         KylinPerformanceMisVo result = null;
@@ -78,6 +79,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/details";
     }
 
+    @Log(title = "演出列表", businessType = BusinessType.AUDIT)
     @PostMapping(value = "/audit")
     //@RequiresPermissions("kylin:performances:view")
     @ResponseBody
@@ -93,6 +95,7 @@ public class KylinPerformancesController extends BaseController {
         return toAjax(kylinPerformancesService.setIsShow(performancesId, isShow));
     }
 
+    @Log(title = "演出列表", businessType = BusinessType.DETAIL)
     //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/memberInfo/{performancesId}")
     public String memberInfo(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
@@ -101,6 +104,7 @@ public class KylinPerformancesController extends BaseController {
         return prefix + "/memberInfo";
     }
 
+    @Log(title = "演出列表", businessType = BusinessType.UPDATE)
     //@RequiresPermissions("kylin:performances:view")
     @PostMapping(value = "/memberInfo/submit")
     @ResponseBody
@@ -109,6 +113,7 @@ public class KylinPerformancesController extends BaseController {
         return toAjax(result);
     }
 
+    @Log(title = "演出列表-演出数据", businessType = BusinessType.LIST)
     //@RequiresPermissions("kylin:performances:view")
     @GetMapping(value = "/performanceStatic/{performancesId}")
     public String performanceStatic(@PathVariable("performancesId") String performancesId, ModelMap mmap) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesRecommendController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
-import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
-import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
 import com.liquidnet.service.kylin.dao.PerformanceRecommendDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
-import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
-import com.liquidnet.service.kylin.dto.param.PerformanceRecommendAdminParam;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -46,6 +42,7 @@ public class KylinPerformancesRecommendController extends BaseController {
      * 查询演出列表
      */
 //    @RequiresPermissions("kylin:performances:recommend:list")
+    @Log(title = "推荐演出", businessType = BusinessType.LIST)
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list() {
@@ -64,6 +61,7 @@ public class KylinPerformancesRecommendController extends BaseController {
     /**
      * 修改
      */
+    @Log(title = "推荐演出", businessType = BusinessType.UPDATE)
 //    @RequiresPermissions("kylin:performances:recommend:change")
     @PostMapping("/change")
     @ResponseBody
@@ -75,6 +73,7 @@ public class KylinPerformancesRecommendController extends BaseController {
     /**
      * 详情
      */
+    @Log(title = "推荐演出", businessType = BusinessType.DETAIL)
     @GetMapping("/edit/{performancesId}")
     public String edit(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
         PerformanceRecommendDao result = kylinPerformancesService.getRecommend(performancesId);
@@ -83,6 +82,7 @@ public class KylinPerformancesRecommendController extends BaseController {
     }
 
 //    @RequiresPermissions("kylin:performances:recommend:change")
+    @Log(title = "推荐演出", businessType = BusinessType.LIST)
     @GetMapping(value = "/performance/status")
     @ResponseBody
     public AjaxResult listByStatus(@RequestParam(value = "status") String status,@RequestParam(value = "title",required = false) String title) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRoadShowController.java

@@ -6,17 +6,12 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.enums.BusinessType;
-import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
-import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinRoadShowsAdminServiceImpl;
-import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
-import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import com.liquidnet.service.kylin.service.admin.IKylinRoadShowsAdminService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -48,6 +43,7 @@ public class KylinRoadShowController extends BaseController {
     }
 
 //    @RequiresPermissions("kylin:performances:roadShow:list")
+    @Log(title = "巡演管理", businessType = BusinessType.LIST)
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo listRoadShow(@RequestParam(value = "title", required = false) String title,
@@ -67,7 +63,7 @@ public class KylinRoadShowController extends BaseController {
     }
 
 //    @RequiresPermissions("kylin:performances:roadShow:add")
-    @Log(title = "巡演", businessType = BusinessType.INSERT)
+    @Log(title = "巡演管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
     public AjaxResult createRoadShow(CreateRoadShowParam createRoadShowParam) {
@@ -75,6 +71,7 @@ public class KylinRoadShowController extends BaseController {
     }
 
 //    @RequiresPermissions("kylin:performances:roadShow:details")
+    @Log(title = "巡演管理", businessType = BusinessType.DETAIL)
     @GetMapping(value = "/details/{roadShowId}")
     public String detailsRoadShow(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) {
         KylinRoadShowAdminVo result = kylinRoadShowsAdminService.detailsRoadShow(roadShowId);
@@ -83,7 +80,7 @@ public class KylinRoadShowController extends BaseController {
     }
 
 //    @RequiresPermissions("kylin:performances:roadShow:edit")
-    @Log(title = "巡演", businessType = BusinessType.UPDATE)
+    @Log(title = "巡演管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
     public AjaxResult updateRoadShow(CreateRoadShowParam createRoadShowParam) {
@@ -94,6 +91,7 @@ public class KylinRoadShowController extends BaseController {
     /**
      * 巡演详情
      */
+    @Log(title = "巡演管理", businessType = BusinessType.DETAIL)
     @GetMapping("/detailsList/{roadShowId}")
     public String addPerformance(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) {
         mmap.put("roadShowId", roadShowId);
@@ -101,6 +99,7 @@ public class KylinRoadShowController extends BaseController {
     }
 
 //    @RequiresPermissions("kylin:performances:roadShow:addPerformance")
+    @Log(title = "巡演管理", businessType = BusinessType.LIST)
     @GetMapping(value = "/performance/{roadShowId}")
     @ResponseBody
     public TableDataInfo listByRoadShowId(@PathVariable("roadShowId") String roadShowId) {
@@ -110,6 +109,7 @@ public class KylinRoadShowController extends BaseController {
 
 
 //    @RequiresPermissions("kylin:performances:roadShow:change:performance")
+    @Log(title = "巡演管理", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/roadShow/relation")
     @ResponseBody
     public AjaxResult changeRoadShowId(@RequestParam(value = "ids") String performancesId,@RequestParam(value = "roadShowId",required = false) String roadShowId) {
@@ -120,12 +120,14 @@ public class KylinRoadShowController extends BaseController {
     /**
      * 新增巡演演出
      */
+    @Log(title = "巡演演出", businessType = BusinessType.INSERT)
     @GetMapping("/addPerformances/{roadShowId}")
     public String addPerformances(@PathVariable("roadShowId") String roadShowId, ModelMap mmap) {
         mmap.put("roadShowId", roadShowId);
         return prefix + "/addPerformances";
     }
 
+    @Log(title = "巡演演出", businessType = BusinessType.LIST)
 //    @RequiresPermissions("kylin:performances:roadShow:change:performance")
     @GetMapping(value = "/performance/status")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformanceCalendarController.java

@@ -2,7 +2,9 @@ package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceCalendarReq;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceCalendarResp;
@@ -56,6 +58,7 @@ public class PerformanceCalendarController extends BaseController{
     /**
      * 查询演出列表
      */
+    @Log(title = "演出日历", businessType = BusinessType.LIST)
     @RequiresPermissions("kylin:performanceCalendar:list")
     @PostMapping("/list")
     public String list(PerformanceCalendarReq performanceCalendarReq, ModelMap mmap)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.PerformancesExpressServiceImpl;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceExpressPerformanceListAdminDao;
@@ -44,6 +46,8 @@ public class PerformancesExpressController extends BaseController {
         return prefix + "/performancesList";
     }
 
+
+    @Log(title = "快递管理-演出列表", businessType = BusinessType.LIST)
     @RequiresPermissions("kylin:performancesExpress:performancesList")
     @PostMapping("/performancesList")
     @ResponseBody
@@ -62,6 +66,7 @@ public class PerformancesExpressController extends BaseController {
         return prefix + "/performanceOrderList";
     }
 
+    @Log(title = "快递管理-演出订单列表", businessType = BusinessType.LIST)
     @RequiresPermissions("kylin:performancesExpress:performanceOrderList")
     @PostMapping("/performanceOrderList")
     @ResponseBody
@@ -73,6 +78,7 @@ public class PerformancesExpressController extends BaseController {
     /**
      * 下单
      */
+    @Log(title = "快递管理-演出订单列表", businessType = BusinessType.LIST)
     @RequiresPermissions("kylin:performancesExpress:placeOrder")
     @PostMapping("/placeOrder")
     @ResponseBody
@@ -92,6 +98,7 @@ public class PerformancesExpressController extends BaseController {
     /**
      * 取消
      */
+    @Log(title = "快递管理-演出订单列表", businessType = BusinessType.CANCEL)
     @RequiresPermissions("kylin:performancesExpress:cancelOrder")
     @PostMapping("/cancelOrder")
     @ResponseBody
@@ -202,6 +209,7 @@ public class PerformancesExpressController extends BaseController {
     /**
      * 批量下单
      */
+    @Log(title = "快递管理-演出列表", businessType = BusinessType.PLACE_ORDER)
     @RequiresPermissions("kylin:performancesExpress:batchPlaceOrder")
     @PostMapping("/batchPlaceOrder")
     @ResponseBody
@@ -217,6 +225,7 @@ public class PerformancesExpressController extends BaseController {
     /**
      * 批量取消
      */
+    @Log(title = "快递管理-演出列表", businessType = BusinessType.CANCEL)
     @RequiresPermissions("kylin:performancesExpress:batchCancelOrder")
     @PostMapping("/batchCancelOrder")
     @ResponseBody
@@ -232,6 +241,7 @@ public class PerformancesExpressController extends BaseController {
     /**
      * 批量下载图片
      */
+    @Log(title = "快递管理-演出列表", businessType = BusinessType.BATCH_DOWNLOAD_IMAGE)
     @RequiresPermissions("kylin:performancesExpress:batchGenerateImage")
     @PostMapping("/batchGenerateImage")
     @ResponseBody
@@ -251,6 +261,7 @@ public class PerformancesExpressController extends BaseController {
     /**
      * 下载图片
      */
+    @Log(title = "快递管理-演出列表", businessType = BusinessType.DOWNLOAD_IMAGE)
     @RequiresPermissions("kylin:performancesExpress:generateImage")
     @PostMapping("/generateImage")
     @ResponseBody
@@ -270,6 +281,7 @@ public class PerformancesExpressController extends BaseController {
     /**
      * 批量打印获取数据
      */
+    @Log(title = "快递管理-演出列表", businessType = BusinessType.BATCH_PRINT)
     @RequiresPermissions("kylin:performancesExpress:batchPrintExpress")
     @PostMapping("/batchPrintExpress")
     @ResponseBody
@@ -285,6 +297,7 @@ public class PerformancesExpressController extends BaseController {
     /**
      * 打印单条获取数据
      */
+    @Log(title = "快递管理-演出列表", businessType = BusinessType.PRINT)
     @RequiresPermissions("kylin:performancesExpress:printExpress")
     @PostMapping("/printExpress")
     @ResponseBody