日志操作

jy-business/src/main/java/com/jy/business/capital/controller/CapitalAccountController.java

@@ -5,7 +5,9 @@ import com.jy.business.capital.model.dto.CapitalAccountDto;
 import com.jy.business.capital.model.dto.CapitalAccountSelectDto;
 import com.jy.business.capital.model.vo.CapitalAccountVo;
 import com.jy.business.capital.service.CapitalAccountService;
+import com.jy.framework.model.annotation.RecordAudit;
 import com.jy.framework.model.base.BaseSelectDto;
+import com.jy.framework.model.enums.BusinessType;
 import com.jy.framework.model.validation.AddGroup;
 import com.jy.framework.model.validation.BatchDeleteGroup;
 import com.jy.framework.model.validation.DetailGroup;
@@ -18,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 资金账户 前端控制器
@@ -52,6 +56,10 @@ public class CapitalAccountController {
     /**
      * 资金账户新增
      */
+    @RecordAudit(
+            moduleName = "资金账户-新增",
+            businessType = BusinessType.INSERT
+    )
     @PostMapping("/add")
     public void add(@Validated(AddGroup.class) @RequestBody CapitalAccountDto dto) {
         capitalAccountService.add(dto);
@@ -60,6 +68,11 @@ public class CapitalAccountController {
     /**
      * 资金账户编辑
      */
+    @RecordAudit(
+            moduleName = "资金账户-修改",
+            businessType = BusinessType.UPDATE,
+            getOldDataFunName = "getDetail"
+    )
     @PostMapping("/edit")
     public void edit(@Validated(EditGroup.class) @RequestBody CapitalAccountDto dto) {
         capitalAccountService.edit(dto);
@@ -68,9 +81,21 @@ public class CapitalAccountController {
     /**
      * 资金账户删除
      */
+    @RecordAudit(
+            moduleName = "资金账户-删除",
+            businessType = BusinessType.DELETE,
+            getOldDataFunName = "getDetailList"
+    )
     @PostMapping("/delete")
     public void delete(@Validated(BatchDeleteGroup.class) @RequestBody BaseSelectDto dto) {
         capitalAccountService.delete(dto.getIdList());
     }
 
+    public CapitalAccountVo getDetail(CapitalAccountDto dto) {
+        return capitalAccountService.getDetail(dto.getId());
+    }
+
+    public List<CapitalAccountVo> getDetailList(BaseSelectDto dto) {
+        return dto.getIdList().stream().map(id -> capitalAccountService.getDetail(id)).toList();
+    }
 }

jy-business/src/main/java/com/jy/business/capital/controller/CapitalTransactionsController.java

@@ -7,7 +7,9 @@ import com.jy.business.capital.model.dto.CapitalTransactionsSelectDto;
 import com.jy.business.capital.model.vo.CapitalTransactionsExportVo;
 import com.jy.business.capital.model.vo.CapitalTransactionsVo;
 import com.jy.business.capital.service.CapitalTransactionsService;
+import com.jy.framework.model.annotation.RecordAudit;
 import com.jy.framework.model.base.BaseSelectDto;
+import com.jy.framework.model.enums.BusinessType;
 import com.jy.framework.model.validation.AddGroup;
 import com.jy.framework.model.validation.BatchDeleteGroup;
 import com.jy.framework.model.validation.DetailGroup;
@@ -74,6 +76,10 @@ public class CapitalTransactionsController {
     /**
      * 资金流水新增
      */
+    @RecordAudit(
+            moduleName = "资金流水-新增",
+            businessType = BusinessType.INSERT
+    )
     @PostMapping("/add")
     public void add(@Validated(AddGroup.class) @RequestBody CapitalTransactionsDto dto) {
         capitalTransactionsService.add(dto);
@@ -82,6 +88,11 @@ public class CapitalTransactionsController {
     /**
      * 资金流水编辑
      */
+    @RecordAudit(
+            moduleName = "资金流水-修改",
+            businessType = BusinessType.UPDATE,
+            getOldDataFunName = "getDetail"
+    )
     @PostMapping("/edit")
     public void edit(@Validated(EditGroup.class) @RequestBody CapitalTransactionsDto dto) {
         capitalTransactionsService.edit(dto);
@@ -90,9 +101,21 @@ public class CapitalTransactionsController {
     /**
      * 资金流水删除
      */
+    @RecordAudit(
+            moduleName = "资金流水-删除",
+            businessType = BusinessType.DELETE,
+            getOldDataFunName = "getDetailList"
+    )
     @PostMapping("/delete")
     public void delete(@Validated(BatchDeleteGroup.class) @RequestBody BaseSelectDto dto) {
         capitalTransactionsService.delete(dto.getIdList());
     }
 
+    public CapitalTransactionsVo getDetail(CapitalTransactionsDto dto) {
+        return capitalTransactionsService.getDetail(dto.getId());
+    }
+
+    public List<CapitalTransactionsVo> getDetailList(BaseSelectDto dto) {
+        return dto.getIdList().stream().map(id -> capitalTransactionsService.getDetail(id)).toList();
+    }
 }

jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalAccountDto.java

@@ -1,6 +1,7 @@
 package com.jy.business.capital.model.dto;
 
 import com.jy.business.capital.model.entity.CapitalAccount;
+import com.jy.framework.model.annotation.LogTag;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,4 +15,9 @@ import lombok.Setter;
 @Setter
 public class CapitalAccountDto extends CapitalAccount {
 
+    /**
+     * 公司名称
+     */
+    @LogTag(alias = "公司名称")
+    private String corporationName;
 }

jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalTransactionsDto.java

@@ -1,6 +1,7 @@
 package com.jy.business.capital.model.dto;
 
 import com.jy.business.capital.model.entity.CapitalTransactions;
+import com.jy.framework.model.annotation.LogTag;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -29,4 +30,15 @@ public class CapitalTransactionsDto extends CapitalTransactions {
      */
     private Integer hasContract;
 
+    /**
+     * 账户别名
+     */
+    @LogTag(alias = "账户别名")
+    private String accountAlias;
+
+    /**
+     * 店铺名称
+     */
+    @LogTag(alias = "店铺名称")
+    private String corporationShopName;
 }

jy-business/src/main/java/com/jy/business/capital/model/entity/CapitalAccount.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jy.framework.model.annotation.LogTag;
 import com.jy.framework.model.base.BaseIdPo;
 import com.jy.framework.model.validation.AddGroup;
 import com.jy.framework.model.validation.EditGroup;
@@ -37,42 +38,50 @@ public class CapitalAccount extends BaseIdPo {
     /**
      * 账户别名
      */
+    @LogTag(alias = "账户别名")
     @NotBlank(groups = {AddGroup.class, EditGroup.class})
     private String accountAlias;
 
     /**
      * 开户银行
      */
+    @LogTag(alias = "开户银行")
     private String depositBank;
 
     /**
      * 账户名
      */
+    @LogTag(alias = "账户名")
     private String accountName;
 
     /**
      * 账号
      */
+    @LogTag(alias = "账号")
     private String account;
 
     /**
      * 联行号
      */
+    @LogTag(alias = "联行号")
     private String correspondentNumber;
 
     /**
      * 账户余额
      */
+    @LogTag(alias = "账户余额")
     private BigDecimal amount;
 
     /**
      * 账户余额
      */
+    @LogTag(alias = "账户余额")
     private BigDecimal initialAmount;
 
     /**
      * 备注
      */
+    @LogTag(alias = "备注")
     private String remark;
 
     /**

jy-business/src/main/java/com/jy/business/capital/model/entity/CapitalTransactions.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jy.framework.model.annotation.LogTag;
 import com.jy.framework.model.base.BaseIdPo;
+import com.jy.framework.model.enums.LogTagExtendedType;
 import com.jy.framework.model.validation.AddGroup;
 import com.jy.framework.model.validation.EditGroup;
 import jakarta.validation.constraints.NotNull;
@@ -41,45 +43,53 @@ public class CapitalTransactions extends BaseIdPo {
     /**
      * 交易时间
      */
+    @LogTag(alias = "交易时间", extendedType = LogTagExtendedType.DATE)
     @NotNull(groups = {AddGroup.class, EditGroup.class})
     private Date tradingTime;
 
     /**
      * 交易类型 1收入 0支出
      */
+    @LogTag(alias = "交易类型", extendedType = LogTagExtendedType.CONVERT, readConverterExp = "1=收入,0=支出")
     @NotNull(groups = {AddGroup.class, EditGroup.class})
     private Integer type;
 
     /**
      * 交易金额
      */
+    @LogTag(alias = "交易金额")
     @NotNull(groups = {AddGroup.class, EditGroup.class})
     private BigDecimal amount;
 
     /**
      * 对方类型
      */
+    @LogTag(alias = "对方类型", extendedType = LogTagExtendedType.DICT, dictCode = "target_type")
     @NotNull(groups = {AddGroup.class, EditGroup.class})
     private Integer targetType;
 
     /**
      * 对方账户名
      */
+    @LogTag(alias = "对方账户名")
     private String targetAccountName;
 
     /**
      * 对方开户银行
      */
+    @LogTag(alias = "对方开户银行")
     private String targetDepositBank;
 
     /**
      * 对方账号
      */
+    @LogTag(alias = "对方账号")
     private String targetAccount;
 
     /**
      * 备注
      */
+    @LogTag(alias = "备注")
     private String remark;
 
     /**

jy-business/src/main/java/com/jy/business/corporation/controller/CorporationShopController.java

@@ -5,7 +5,9 @@ import com.jy.business.corporation.model.dto.CorporationShopDto;
 import com.jy.business.corporation.model.dto.CorporationShopSelectDto;
 import com.jy.business.corporation.model.vo.CorporationShopVo;
 import com.jy.business.corporation.service.CorporationShopService;
+import com.jy.framework.model.annotation.RecordAudit;
 import com.jy.framework.model.base.BaseSelectDto;
+import com.jy.framework.model.enums.BusinessType;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 商铺信息 前端控制器
@@ -47,6 +51,10 @@ public class CorporationShopController {
     /**
      * 商铺信息新增
      */
+    @RecordAudit(
+            moduleName = "商铺信息-新增",
+            businessType = BusinessType.INSERT
+    )
     @PostMapping("/add")
     public void add(@RequestBody CorporationShopDto dto) {
         corporationShopService.add(dto);
@@ -55,6 +63,11 @@ public class CorporationShopController {
     /**
      * 商铺信息编辑
      */
+    @RecordAudit(
+            moduleName = "商铺信息-修改",
+            businessType = BusinessType.UPDATE,
+            getOldDataFunName = "getDetail"
+    )
     @PostMapping("/edit")
     public void edit(@RequestBody CorporationShopDto dto) {
         corporationShopService.edit(dto);
@@ -63,9 +76,21 @@ public class CorporationShopController {
     /**
      * 商铺信息删除
      */
+    @RecordAudit(
+            moduleName = "商铺信息-删除",
+            businessType = BusinessType.DELETE,
+            getOldDataFunName = "getDetailList"
+    )
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         corporationShopService.delete(dto.getIdList());
     }
 
+    public CorporationShopVo getDetail(CorporationShopDto dto) {
+        return corporationShopService.getDetail(dto.getId());
+    }
+
+    public List<CorporationShopVo> getDetailList(BaseSelectDto dto) {
+        return dto.getIdList().stream().map(id -> corporationShopService.getDetail(id)).toList();
+    }
 }

jy-business/src/main/java/com/jy/business/corporation/model/dto/CorporationShopDto.java

@@ -1,6 +1,7 @@
 package com.jy.business.corporation.model.dto;
 
 import com.jy.business.corporation.model.entity.CorporationShop;
+import com.jy.framework.model.annotation.LogTag;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,4 +15,9 @@ import lombok.Setter;
 @Setter
 public class CorporationShopDto extends CorporationShop {
 
+    /**
+     * 公司名称
+     */
+    @LogTag(alias = "公司名称")
+    private String corporationName;
 }

jy-business/src/main/java/com/jy/business/payment/controller/PaymentRequestsController.java

@@ -76,6 +76,10 @@ public class PaymentRequestsController {
     /**
      * 请款新增
      */
+    @RecordAudit(
+            moduleName = "请款-新增",
+            businessType = BusinessType.INSERT
+    )
     @PostMapping("/add")
     public void add(@RequestBody PaymentRequestsDto dto) {
         paymentRequestsService.add(dto);

jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsDto.java

@@ -25,4 +25,27 @@ public class PaymentRequestsDto extends PaymentRequests {
     @LogTag(alias = "请款明细", extendedType = LogTagExtendedType.COLLECTION)
     private List<PaymentRequestsDetail> paymentRequestsDetailList;
 
+    /**
+     * 归属公司
+     */
+    @LogTag(alias = "归属公司")
+    private String corporationName;
+
+    /**
+     * 归属部门
+     */
+    @LogTag(alias = "归属部门")
+    private String deptName;
+
+    /**
+     * 店铺名称
+     */
+    @LogTag(alias = "店铺名称")
+    private String corporationShopName;
+
+    /**
+     * 付款账户
+     */
+    @LogTag(alias = "付款账户")
+    private String capitalAccountName;
 }

jy-business/src/main/java/com/jy/business/payment/model/entity/PaymentRequestsDetail.java

@@ -34,6 +34,7 @@ public class PaymentRequestsDetail extends BaseIdPo {
     /**
      * 合同id
      */
+    @LogTag(alias = "关联合同", extendedType = LogTagExtendedType.COMPLEX)
     private Long contractId;
 
     /**

jy-framework/src/main/java/com/jy/framework/model/annotation/RecordAudit.java

@@ -13,7 +13,7 @@ import java.lang.annotation.Target;
 @Documented
 public @interface RecordAudit {
 
-    String moduleFlag();
+    String moduleFlag() default "";
 
     /**
      * 方法名称