Browse Source

添加操作日志

yzc 11 months ago
parent
commit
ededd044c0
45 changed files with 260 additions and 56 deletions
  1. 5 4
      hx-account/src/main/java/com/fjhx/account/controller/account/AccountManagementController.java
  2. 10 8
      hx-account/src/main/java/com/fjhx/account/controller/account/AccountPaymentController.java
  3. 6 0
      hx-account/src/main/java/com/fjhx/account/controller/account/AccountRunningWaterController.java
  4. 5 0
      hx-account/src/main/java/com/fjhx/account/controller/account/AccountSubjectsController.java
  5. 5 0
      hx-account/src/main/java/com/fjhx/account/controller/payee/PayeeInfoController.java
  6. 5 0
      hx-account/src/main/java/com/fjhx/account/controller/payment/PaymentTypeController.java
  7. 5 0
      hx-common/src/main/java/com/fjhx/common/controller/art/ArtCopyrightController.java
  8. 9 4
      hx-common/src/main/java/com/fjhx/common/controller/coding/CodingRuleController.java
  9. 5 0
      hx-common/src/main/java/com/fjhx/common/controller/contract/ContractTemplateController.java
  10. 5 0
      hx-common/src/main/java/com/fjhx/common/controller/contractor/ContractorController.java
  11. 5 0
      hx-common/src/main/java/com/fjhx/common/controller/corporation/CorporationController.java
  12. 5 0
      hx-common/src/main/java/com/fjhx/common/controller/logistics/LogisticsCompanyInfoController.java
  13. 5 0
      hx-common/src/main/java/com/fjhx/common/controller/patent/PatentController.java
  14. 5 0
      hx-common/src/main/java/com/fjhx/common/controller/trademark/TrademarkController.java
  15. 5 0
      hx-customer/src/main/java/com/fjhx/customer/controller/customer/CustomerController.java
  16. 5 0
      hx-customer/src/main/java/com/fjhx/customer/controller/customer/CustomerLvController.java
  17. 12 4
      hx-customer/src/main/java/com/fjhx/customer/controller/customer/CustomerUserController.java
  18. 3 0
      hx-form/src/main/java/com/fjhx/form/service/FinanceReportService.java
  19. 3 0
      hx-form/src/main/java/com/fjhx/form/service/ReportService.java
  20. 5 0
      hx-iot/src/main/java/com/fjhx/iot/controller/tda/TdaDeviceController.java
  21. 7 0
      hx-item/src/main/java/com/fjhx/item/controller/product/ProductInfoController.java
  22. 5 0
      hx-jushuitan/src/main/java/com/fjhx/jushuitan/controller/jushuitan/JushuitanConfigController.java
  23. 5 0
      hx-jushuitan/src/main/java/com/fjhx/jushuitan/controller/shop/ShopInfoController.java
  24. 5 0
      hx-mes/src/main/java/com/fjhx/mes/controller/mold/MoldInfoController.java
  25. 4 0
      hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderController.java
  26. 12 7
      hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionProcessesController.java
  27. 3 0
      hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionSchedulingController.java
  28. 5 0
      hx-mes/src/main/java/com/fjhx/mes/controller/technology/TechnologyController.java
  29. 5 0
      hx-oa/src/main/java/com/fjhx/oa/controller/education/EducationConfigController.java
  30. 5 0
      hx-oa/src/main/java/com/fjhx/oa/controller/epiboly/EpibolyBillController.java
  31. 5 0
      hx-oa/src/main/java/com/fjhx/oa/controller/seal/SealConfigController.java
  32. 10 7
      hx-purchase/src/main/java/com/fjhx/purchase/controller/invoice/InvoiceController.java
  33. 5 0
      hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimController.java
  34. 3 0
      hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractOutboundInfoController.java
  35. 3 0
      hx-sale/src/main/java/com/fjhx/sale/controller/dept/DeptPerfController.java
  36. 9 5
      hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsController.java
  37. 3 0
      hx-sale/src/main/java/com/fjhx/sale/controller/ext/ExtQuotationProductController.java
  38. 12 5
      hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackController.java
  39. 10 4
      hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackDetailController.java
  40. 6 0
      hx-supply/src/main/java/com/fjhx/supply/controller/supplier/SupplierInfoController.java
  41. 3 0
      hx-supply/src/main/java/com/fjhx/supply/controller/supplier/SupplierPriceController.java
  42. 3 2
      hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockCheckController.java
  43. 3 0
      hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockController.java
  44. 4 0
      hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockWaitController.java
  45. 12 6
      hx-wms/src/main/java/com/fjhx/wms/controller/warehouse/WarehouseController.java

+ 5 - 4
hx-account/src/main/java/com/fjhx/account/controller/account/AccountManagementController.java

@@ -1,15 +1,13 @@
 package com.fjhx.account.controller.account;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.dto.AccountManagementDto;
 import com.fjhx.account.entity.account.dto.AccountManagementSelectDto;
-import com.fjhx.account.entity.account.po.AccountManagement;
-import com.fjhx.account.entity.account.po.AccountRemainder;
 import com.fjhx.account.entity.account.vo.AccountManagementVo;
 import com.fjhx.account.service.account.AccountManagementService;
-import com.fjhx.common.constant.SourceConstant;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -55,6 +53,7 @@ public class AccountManagementController {
     /**
      * 账户-管理表新增
      */
+    @Log(title = "企业账户", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody AccountManagementDto accountManagementDto) {
         accountManagementService.add(accountManagementDto);
@@ -63,6 +62,7 @@ public class AccountManagementController {
     /**
      * 账户-管理表编辑
      */
+    @Log(title = "企业账户", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody AccountManagementDto accountManagementDto) {
         accountManagementService.edit(accountManagementDto);
@@ -71,6 +71,7 @@ public class AccountManagementController {
     /**
      * 账户-管理表删除
      */
+    @Log(title = "企业账户", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         accountManagementService.delete(dto.getId());

+ 10 - 8
hx-account/src/main/java/com/fjhx/account/controller/account/AccountPaymentController.java

@@ -1,17 +1,18 @@
 package com.fjhx.account.controller.account;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountPaymentVo;
-import com.fjhx.account.entity.account.dto.AccountPaymentSelectDto;
 import com.fjhx.account.entity.account.dto.AccountPaymentDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.vo.AccountPaymentVo;
 import com.fjhx.account.service.account.AccountPaymentService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -49,6 +50,7 @@ public class AccountPaymentController {
     /**
      * 打款功能
      */
+    @Log(title = "打款", businessType = BusinessType.UPDATE)
     @PostMapping("/add")
     public void add(@RequestBody AccountPaymentDto accountPaymentDto) {
         accountPaymentService.add(accountPaymentDto);

+ 6 - 0
hx-account/src/main/java/com/fjhx/account/controller/account/AccountRunningWaterController.java

@@ -6,7 +6,9 @@ import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -62,6 +64,7 @@ public class AccountRunningWaterController {
     /**
      * 账户资金流水表新增
      */
+    @Log(title = "资金流水", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody AccountRunningWaterDto accountRunningWaterDto) {
         accountRunningWaterService.add(accountRunningWaterDto);
@@ -70,6 +73,7 @@ public class AccountRunningWaterController {
     /**
      * 账户资金流水表编辑
      */
+    @Log(title = "资金流水", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody AccountRunningWater accountRunningWaterDto) {
         accountRunningWaterService.edit(accountRunningWaterDto);
@@ -78,6 +82,7 @@ public class AccountRunningWaterController {
     /**
      * 账户资金流水表删除
      */
+    @Log(title = "资金流水", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         accountRunningWaterService.delete(dto.getId());
@@ -126,6 +131,7 @@ public class AccountRunningWaterController {
     /**
      * 汇算(流水金额装人民币金额重新计算)
      */
+    @Log(title = "资金流水-汇算", businessType = BusinessType.UPDATE)
     @PostMapping("/settleAccounts")
     public void settleAccounts(@RequestBody AccountRunningWater dto) {
         accountRunningWaterService.settleAccounts(dto);

+ 5 - 0
hx-account/src/main/java/com/fjhx/account/controller/account/AccountSubjectsController.java

@@ -5,7 +5,9 @@ import com.fjhx.account.entity.account.dto.AccountSubjectsDto;
 import com.fjhx.account.entity.account.dto.AccountSubjectsSelectDto;
 import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
 import com.fjhx.account.service.account.AccountSubjectsService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -56,6 +58,7 @@ public class AccountSubjectsController {
     /**
      * 记账科目新增
      */
+    @Log(title = "记账科目", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody AccountSubjectsDto accountSubjectsDto) {
         accountSubjectsService.add(accountSubjectsDto);
@@ -64,6 +67,7 @@ public class AccountSubjectsController {
     /**
      * 记账科目编辑
      */
+    @Log(title = "记账科目", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody AccountSubjectsDto accountSubjectsDto) {
         accountSubjectsService.edit(accountSubjectsDto);
@@ -72,6 +76,7 @@ public class AccountSubjectsController {
     /**
      * 记账科目删除
      */
+    @Log(title = "记账科目", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         accountSubjectsService.delete(dto.getId());

+ 5 - 0
hx-account/src/main/java/com/fjhx/account/controller/payee/PayeeInfoController.java

@@ -5,7 +5,9 @@ import com.fjhx.account.entity.payee.dto.PayeeInfoDto;
 import com.fjhx.account.entity.payee.dto.PayeeInfoSelectDto;
 import com.fjhx.account.entity.payee.vo.PayeeInfoVo;
 import com.fjhx.account.service.payee.PayeeInfoService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class PayeeInfoController {
     /**
      * 收款单位新增
      */
+    @Log(title = "收款单位", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody PayeeInfoDto payeeInfoDto) {
         payeeInfoService.add(payeeInfoDto);
@@ -55,6 +58,7 @@ public class PayeeInfoController {
     /**
      * 收款单位编辑
      */
+    @Log(title = "收款单位", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody PayeeInfoDto payeeInfoDto) {
         payeeInfoService.edit(payeeInfoDto);
@@ -63,6 +67,7 @@ public class PayeeInfoController {
     /**
      * 收款单位删除
      */
+    @Log(title = "收款单位", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         payeeInfoService.delete(dto.getId());

+ 5 - 0
hx-account/src/main/java/com/fjhx/account/controller/payment/PaymentTypeController.java

@@ -5,7 +5,9 @@ import com.fjhx.account.entity.payment.dto.PaymentTypeDto;
 import com.fjhx.account.entity.payment.dto.PaymentTypeSelectDto;
 import com.fjhx.account.entity.payment.vo.PaymentTypeVo;
 import com.fjhx.account.service.payment.PaymentTypeService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class PaymentTypeController {
     /**
      * 收付款类型新增
      */
+    @Log(title = "收付款类型", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody PaymentTypeDto paymentTypeDto) {
         paymentTypeService.add(paymentTypeDto);
@@ -55,6 +58,7 @@ public class PaymentTypeController {
     /**
      * 收付款类型编辑
      */
+    @Log(title = "收付款类型", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody PaymentTypeDto paymentTypeDto) {
         paymentTypeService.edit(paymentTypeDto);
@@ -63,6 +67,7 @@ public class PaymentTypeController {
     /**
      * 收付款类型删除
      */
+    @Log(title = "收付款类型", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         paymentTypeService.delete(dto.getId());

+ 5 - 0
hx-common/src/main/java/com/fjhx/common/controller/art/ArtCopyrightController.java

@@ -5,7 +5,9 @@ import com.fjhx.common.entity.art.dto.ArtCopyrightDto;
 import com.fjhx.common.entity.art.dto.ArtCopyrightSelectDto;
 import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
 import com.fjhx.common.service.art.ArtCopyrightService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class ArtCopyrightController {
     /**
      * 美术版权新增
      */
+    @Log(title = "美术版权", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody ArtCopyrightDto artCopyrightDto) {
         artCopyrightService.add(artCopyrightDto);
@@ -55,6 +58,7 @@ public class ArtCopyrightController {
     /**
      * 美术版权编辑
      */
+    @Log(title = "美术版权", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody ArtCopyrightDto artCopyrightDto) {
         artCopyrightService.edit(artCopyrightDto);
@@ -63,6 +67,7 @@ public class ArtCopyrightController {
     /**
      * 美术版权删除
      */
+    @Log(title = "美术版权", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         artCopyrightService.delete(dto.getId());

+ 9 - 4
hx-common/src/main/java/com/fjhx/common/controller/coding/CodingRuleController.java

@@ -1,13 +1,17 @@
 package com.fjhx.common.controller.coding;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.coding.vo.CodingRulePageVo;
-import com.fjhx.common.entity.coding.dto.CodingRuleSelectDto;
 import com.fjhx.common.entity.coding.dto.CodingRuleDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.common.entity.coding.dto.CodingRuleSelectDto;
+import com.fjhx.common.entity.coding.vo.CodingRulePageVo;
 import com.fjhx.common.service.coding.CodingRuleService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -36,6 +40,7 @@ public class CodingRuleController {
     /**
      * 编码规则编辑
      */
+    @Log(title = "编码规则", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody CodingRuleDto codingRuleDto) {
         codingRuleService.edit(codingRuleDto);

+ 5 - 0
hx-common/src/main/java/com/fjhx/common/controller/contract/ContractTemplateController.java

@@ -5,7 +5,9 @@ import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
 import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
 import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
 import com.fjhx.common.service.contract.ContractTemplateService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,6 +50,7 @@ public class ContractTemplateController {
     /**
      * 合同模板新增
      */
+    @Log(title = "合同模板", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody ContractTemplateDto contractTemplateDto) {
         contractTemplateService.add(contractTemplateDto);
@@ -56,6 +59,7 @@ public class ContractTemplateController {
     /**
      * 合同模板编辑
      */
+    @Log(title = "合同模板", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody ContractTemplateDto contractTemplateDto) {
         contractTemplateService.edit(contractTemplateDto);
@@ -64,6 +68,7 @@ public class ContractTemplateController {
     /**
      * 合同模板删除
      */
+    @Log(title = "合同模板", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         contractTemplateService.delete(dto.getId());

+ 5 - 0
hx-common/src/main/java/com/fjhx/common/controller/contractor/ContractorController.java

@@ -5,7 +5,9 @@ import com.fjhx.common.entity.contractor.dto.ContractorDto;
 import com.fjhx.common.entity.contractor.dto.ContractorSelectDto;
 import com.fjhx.common.entity.contractor.vo.ContractorVo;
 import com.fjhx.common.service.contractor.ContractorService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class ContractorController {
     /**
      * 承包商新增
      */
+    @Log(title = "承包商", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody ContractorDto contractorDto) {
         contractorService.add(contractorDto);
@@ -55,6 +58,7 @@ public class ContractorController {
     /**
      * 承包商编辑
      */
+    @Log(title = "承包商", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody ContractorDto contractorDto) {
         contractorService.edit(contractorDto);
@@ -63,6 +67,7 @@ public class ContractorController {
     /**
      * 承包商删除
      */
+    @Log(title = "承包商", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         contractorService.delete(dto.getId());

+ 5 - 0
hx-common/src/main/java/com/fjhx/common/controller/corporation/CorporationController.java

@@ -5,7 +5,9 @@ import com.fjhx.common.entity.corporation.dto.CorporationDto;
 import com.fjhx.common.entity.corporation.dto.CorporationSelectDto;
 import com.fjhx.common.entity.corporation.vo.CorporationVo;
 import com.fjhx.common.service.corporation.CorporationService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class CorporationController {
     /**
      * 多公司配置新增
      */
+    @Log(title = "企业信息管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody CorporationDto corporationDto) {
         corporationService.add(corporationDto);
@@ -55,6 +58,7 @@ public class CorporationController {
     /**
      * 多公司配置编辑
      */
+    @Log(title = "企业信息管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody CorporationDto corporationDto) {
         corporationService.edit(corporationDto);
@@ -63,6 +67,7 @@ public class CorporationController {
     /**
      * 多公司配置删除
      */
+    @Log(title = "企业信息管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         corporationService.delete(dto.getId());

+ 5 - 0
hx-common/src/main/java/com/fjhx/common/controller/logistics/LogisticsCompanyInfoController.java

@@ -5,7 +5,9 @@ import com.fjhx.common.entity.logistics.dto.LogisticsCompanyInfoDto;
 import com.fjhx.common.entity.logistics.dto.LogisticsCompanyInfoSelectDto;
 import com.fjhx.common.entity.logistics.vo.LogisticsCompanyInfoVo;
 import com.fjhx.common.service.logistics.LogisticsCompanyInfoService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -56,6 +58,7 @@ public class LogisticsCompanyInfoController {
     /**
      * 物流公司信息新增
      */
+    @Log(title = "快递公司", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody LogisticsCompanyInfoDto logisticsCompanyInfoDto) {
         logisticsCompanyInfoService.add(logisticsCompanyInfoDto);
@@ -64,6 +67,7 @@ public class LogisticsCompanyInfoController {
     /**
      * 物流公司信息编辑
      */
+    @Log(title = "快递公司", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody LogisticsCompanyInfoDto logisticsCompanyInfoDto) {
         logisticsCompanyInfoService.edit(logisticsCompanyInfoDto);
@@ -72,6 +76,7 @@ public class LogisticsCompanyInfoController {
     /**
      * 物流公司信息删除
      */
+    @Log(title = "快递公司", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         logisticsCompanyInfoService.delete(dto.getId());

+ 5 - 0
hx-common/src/main/java/com/fjhx/common/controller/patent/PatentController.java

@@ -5,7 +5,9 @@ import com.fjhx.common.entity.patent.dto.PatentDto;
 import com.fjhx.common.entity.patent.dto.PatentSelectDto;
 import com.fjhx.common.entity.patent.vo.PatentVo;
 import com.fjhx.common.service.patent.PatentService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class PatentController {
     /**
      * 专利新增
      */
+    @Log(title = "专利管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody PatentDto patentDto) {
         patentService.add(patentDto);
@@ -55,6 +58,7 @@ public class PatentController {
     /**
      * 专利编辑
      */
+    @Log(title = "专利管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody PatentDto patentDto) {
         patentService.edit(patentDto);
@@ -63,6 +67,7 @@ public class PatentController {
     /**
      * 专利删除
      */
+    @Log(title = "专利管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         patentService.delete(dto.getId());

+ 5 - 0
hx-common/src/main/java/com/fjhx/common/controller/trademark/TrademarkController.java

@@ -5,7 +5,9 @@ import com.fjhx.common.entity.trademark.dto.TrademarkDto;
 import com.fjhx.common.entity.trademark.dto.TrademarkSelectDto;
 import com.fjhx.common.entity.trademark.vo.TrademarkVo;
 import com.fjhx.common.service.trademark.TrademarkService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class TrademarkController {
     /**
      * 商标新增
      */
+    @Log(title = "商标管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody TrademarkDto trademarkDto) {
         trademarkService.add(trademarkDto);
@@ -55,6 +58,7 @@ public class TrademarkController {
     /**
      * 商标编辑
      */
+    @Log(title = "商标管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody TrademarkDto trademarkDto) {
         trademarkService.edit(trademarkDto);
@@ -63,6 +67,7 @@ public class TrademarkController {
     /**
      * 商标删除
      */
+    @Log(title = "商标管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         trademarkService.delete(dto.getId());

+ 5 - 0
hx-customer/src/main/java/com/fjhx/customer/controller/customer/CustomerController.java

@@ -5,7 +5,9 @@ import com.fjhx.customer.entity.customer.dto.CustomerDto;
 import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.customer.entity.customer.vo.CustomerVo;
 import com.fjhx.customer.service.customer.CustomerService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -68,6 +70,7 @@ public class CustomerController {
     /**
      * 客户表新增
      */
+    @Log(title = "客户管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody CustomerDto customerDto) {
         customerService.add(customerDto);
@@ -76,6 +79,7 @@ public class CustomerController {
     /**
      * 客户表编辑
      */
+    @Log(title = "客户管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody CustomerDto customerDto) {
         customerService.edit(customerDto);
@@ -84,6 +88,7 @@ public class CustomerController {
     /**
      * 客户表删除
      */
+    @Log(title = "客户管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         customerService.delete(dto.getId());

+ 5 - 0
hx-customer/src/main/java/com/fjhx/customer/controller/customer/CustomerLvController.java

@@ -5,7 +5,9 @@ import com.fjhx.customer.entity.customer.dto.CustomerLvDto;
 import com.fjhx.customer.entity.customer.dto.CustomerLvSelectDto;
 import com.fjhx.customer.entity.customer.vo.CustomerLvVo;
 import com.fjhx.customer.service.customer.CustomerLvService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class CustomerLvController {
     /**
      * 客户等级新增
      */
+    @Log(title = "客户等级管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody CustomerLvDto customerLvDto) {
         customerLvService.add(customerLvDto);
@@ -55,6 +58,7 @@ public class CustomerLvController {
     /**
      * 客户等级编辑
      */
+    @Log(title = "客户等级管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody CustomerLvDto customerLvDto) {
         customerLvService.edit(customerLvDto);
@@ -63,6 +67,7 @@ public class CustomerLvController {
     /**
      * 客户等级删除
      */
+    @Log(title = "客户等级管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         customerLvService.delete(dto.getId());

+ 12 - 4
hx-customer/src/main/java/com/fjhx/customer/controller/customer/CustomerUserController.java

@@ -1,13 +1,18 @@
 package com.fjhx.customer.controller.customer;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.customer.entity.customer.vo.CustomerUserVo;
-import com.fjhx.customer.entity.customer.dto.CustomerUserSelectDto;
 import com.fjhx.customer.entity.customer.dto.CustomerUserDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.customer.entity.customer.dto.CustomerUserSelectDto;
+import com.fjhx.customer.entity.customer.vo.CustomerUserVo;
 import com.fjhx.customer.service.customer.CustomerUserService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+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;
 
@@ -53,6 +58,7 @@ public class CustomerUserController {
     /**
      * 客户用户表新增
      */
+    @Log(title = "客户联系人管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody CustomerUserDto customerUserDto) {
         customerUserService.add(customerUserDto);
@@ -61,6 +67,7 @@ public class CustomerUserController {
     /**
      * 客户用户表编辑
      */
+    @Log(title = "客户联系人管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody CustomerUserDto customerUserDto) {
         customerUserService.edit(customerUserDto);
@@ -69,6 +76,7 @@ public class CustomerUserController {
     /**
      * 客户用户表删除
      */
+    @Log(title = "客户联系人管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         customerUserService.delete(dto.getId());

+ 3 - 0
hx-form/src/main/java/com/fjhx/form/service/FinanceReportService.java

@@ -5,6 +5,8 @@ import com.fjhx.form.entity.RemitDetailSelectDto;
 import com.fjhx.form.entity.RemitDetailVo;
 import com.fjhx.form.entity.SubjectBalanceBo;
 import com.fjhx.form.entity.SubjectBalanceSelectDto;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -17,5 +19,6 @@ public interface FinanceReportService {
      */
     Page<RemitDetailVo> getRemitDetailPage(RemitDetailSelectDto dto);
 
+    @Log(title = "汇款明细", businessType = BusinessType.EXPORT)
     void remitDetailExcelExport(RemitDetailSelectDto dto, HttpServletResponse httpServletResponse);
 }

+ 3 - 0
hx-form/src/main/java/com/fjhx/form/service/ReportService.java

@@ -3,6 +3,8 @@ package com.fjhx.form.service;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.form.entity.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -36,6 +38,7 @@ public interface ReportService {
     /**
      * 订单汇总Excel导出
      */
+    @Log(title = "订单汇总", businessType = BusinessType.EXPORT)
     void orderSummaryExcelExport(OrderSummarySelectDto dto, HttpServletResponse httpServletResponse);
 
     /**

+ 5 - 0
hx-iot/src/main/java/com/fjhx/iot/controller/tda/TdaDeviceController.java

@@ -6,8 +6,10 @@ import com.fjhx.iot.entity.tda.dto.TdaDeviceDto;
 import com.fjhx.iot.entity.tda.dto.TdaDeviceSelectDto;
 import com.fjhx.iot.entity.tda.vo.TdaDeviceVo;
 import com.fjhx.iot.service.tda.TdaDeviceService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -71,6 +73,7 @@ public class TdaDeviceController {
     /**
      * 设备管理新增
      */
+    @Log(title = "设备管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody TdaDeviceDto tdaDeviceDto) {
         tdaDeviceService.add(tdaDeviceDto);
@@ -79,6 +82,7 @@ public class TdaDeviceController {
     /**
      * 设备管理新增
      */
+    @Log(title = "设备管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody TdaDeviceDto tdaDeviceDto) {
         tdaDeviceService.edit(tdaDeviceDto);
@@ -87,6 +91,7 @@ public class TdaDeviceController {
     /**
      * 设备管理删除
      */
+    @Log(title = "设备管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         tdaDeviceService.delete(dto.getId());

+ 7 - 0
hx-item/src/main/java/com/fjhx/item/controller/product/ProductInfoController.java

@@ -5,7 +5,9 @@ import com.fjhx.item.entity.product.dto.ProductInfoDto;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,6 +59,7 @@ public class ProductInfoController {
     /**
      * 产品库新增
      */
+    @Log(title = "产品物料库", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody ProductInfoDto productInfoDto) {
         productInfoService.add(productInfoDto);
@@ -76,6 +79,7 @@ public class ProductInfoController {
     /**
      * 产品库编辑
      */
+    @Log(title = "产品物料库", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody ProductInfoDto productInfoDto) {
         productInfoService.edit(productInfoDto);
@@ -84,6 +88,7 @@ public class ProductInfoController {
     /**
      * 产品库删除
      */
+    @Log(title = "产品物料库", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         productInfoService.delete(dto.getId());
@@ -140,6 +145,7 @@ public class ProductInfoController {
     /**
      * 导出Excel
      */
+    @Log(title = "产品物料库", businessType = BusinessType.EXPORT)
     @PostMapping("/exportExcel")
     public void excelExport(HttpServletResponse httpServletResponse, @RequestBody ProductInfoSelectDto dto) {
         productInfoService.excelExport(httpServletResponse, dto);
@@ -148,6 +154,7 @@ public class ProductInfoController {
     /**
      * 导出Excel物料
      */
+    @Log(title = "产品物料库", businessType = BusinessType.EXPORT)
     @PostMapping("/materialExcelExport")
     public void materialExcelExport(HttpServletResponse httpServletResponse, @RequestBody ProductInfoSelectDto dto) {
         productInfoService.materialExcelExport(httpServletResponse, dto);

+ 5 - 0
hx-jushuitan/src/main/java/com/fjhx/jushuitan/controller/jushuitan/JushuitanConfigController.java

@@ -5,7 +5,9 @@ import com.fjhx.jushuitan.entity.jushuitan.dto.JushuitanConfigDto;
 import com.fjhx.jushuitan.entity.jushuitan.dto.JushuitanConfigSelectDto;
 import com.fjhx.jushuitan.entity.jushuitan.vo.JushuitanConfigVo;
 import com.fjhx.jushuitan.service.jushuitan.JushuitanConfigService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class JushuitanConfigController {
     /**
      * 聚水潭配置新增
      */
+    @Log(title = "聚水潭AppSecret管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody JushuitanConfigDto jushuitanConfigDto) {
         jushuitanConfigService.add(jushuitanConfigDto);
@@ -55,6 +58,7 @@ public class JushuitanConfigController {
     /**
      * 聚水潭配置编辑
      */
+    @Log(title = "聚水潭AppSecret管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody JushuitanConfigDto jushuitanConfigDto) {
         jushuitanConfigService.edit(jushuitanConfigDto);
@@ -63,6 +67,7 @@ public class JushuitanConfigController {
     /**
      * 聚水潭配置删除
      */
+    @Log(title = "聚水潭AppSecret管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         jushuitanConfigService.delete(dto.getId());

+ 5 - 0
hx-jushuitan/src/main/java/com/fjhx/jushuitan/controller/shop/ShopInfoController.java

@@ -5,7 +5,9 @@ import com.fjhx.jushuitan.entity.shop.dto.ShopInfoDto;
 import com.fjhx.jushuitan.entity.shop.dto.ShopInfoSelectDto;
 import com.fjhx.jushuitan.entity.shop.vo.ShopInfoVo;
 import com.fjhx.jushuitan.service.shop.ShopInfoService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class ShopInfoController {
     /**
      * 店铺管理新增
      */
+    @Log(title = "店铺管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody ShopInfoDto shopInfoDto) {
         shopInfoService.add(shopInfoDto);
@@ -55,6 +58,7 @@ public class ShopInfoController {
     /**
      * 店铺管理编辑
      */
+    @Log(title = "店铺管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody ShopInfoDto shopInfoDto) {
         shopInfoService.edit(shopInfoDto);
@@ -63,6 +67,7 @@ public class ShopInfoController {
     /**
      * 店铺管理删除
      */
+    @Log(title = "店铺管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         shopInfoService.delete(dto.getId());

+ 5 - 0
hx-mes/src/main/java/com/fjhx/mes/controller/mold/MoldInfoController.java

@@ -5,7 +5,9 @@ import com.fjhx.mes.entity.mold.dto.MoldInfoDto;
 import com.fjhx.mes.entity.mold.dto.MoldInfoSelectDto;
 import com.fjhx.mes.entity.mold.vo.MoldInfoVo;
 import com.fjhx.mes.service.mold.MoldInfoService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class MoldInfoController {
     /**
      * 模具信息新增
      */
+    @Log(title = "模具管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody MoldInfoDto moldInfoDto) {
         moldInfoService.add(moldInfoDto);
@@ -55,6 +58,7 @@ public class MoldInfoController {
     /**
      * 模具信息编辑
      */
+    @Log(title = "模具管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody MoldInfoDto moldInfoDto) {
         moldInfoService.edit(moldInfoDto);
@@ -63,6 +67,7 @@ public class MoldInfoController {
     /**
      * 模具信息删除
      */
+    @Log(title = "模具管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         moldInfoService.delete(dto.getId());

+ 4 - 0
hx-mes/src/main/java/com/fjhx/mes/controller/production/ProduceOrderController.java

@@ -7,7 +7,9 @@ import com.fjhx.mes.entity.production.dto.ProductionOrderDto;
 import com.fjhx.mes.entity.production.vo.ProductionOrderVo;
 import com.fjhx.mes.service.production.ProduceOrderService;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -43,6 +45,7 @@ public class ProduceOrderController {
     /**
      * 创建生产订单(投产)
      */
+    @Log(title = "销售订单-下发生产", businessType = BusinessType.INSERT)
     @PostMapping("/createOrder")
     public void createOrder(@RequestBody ProductionOrderDto produceOrderDto) {
         produceOrderService.createOrder(produceOrderDto);
@@ -69,6 +72,7 @@ public class ProduceOrderController {
     /**
      * 交期确认
      */
+    @Log(title = "生产订单-交期确认", businessType = BusinessType.UPDATE)
     @PostMapping("/deliveryConfirm")
     public void deliveryConfirm(@RequestBody ProductionOrderDto dto) {
         produceOrderService.deliveryConfirm(dto);

+ 12 - 7
hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionProcessesController.java

@@ -1,16 +1,18 @@
 package com.fjhx.mes.controller.production;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.mes.entity.production.vo.ProductionProcessesVo;
-import com.fjhx.mes.entity.production.dto.ProductionProcessesSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionProcessesDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.mes.entity.production.dto.ProductionProcessesSelectDto;
+import com.fjhx.mes.entity.production.vo.ProductionProcessesVo;
 import com.fjhx.mes.service.production.ProductionProcessesService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -48,6 +50,7 @@ public class ProductionProcessesController {
     /**
      * 工序新增
      */
+    @Log(title = "工序管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody ProductionProcessesDto productionProcessesDto) {
         productionProcessesService.add(productionProcessesDto);
@@ -56,6 +59,7 @@ public class ProductionProcessesController {
     /**
      * 工序编辑
      */
+    @Log(title = "工序管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody ProductionProcessesDto productionProcessesDto) {
         productionProcessesService.edit(productionProcessesDto);
@@ -64,6 +68,7 @@ public class ProductionProcessesController {
     /**
      * 工序删除
      */
+    @Log(title = "工序管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         productionProcessesService.delete(dto.getId());

+ 3 - 0
hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionSchedulingController.java

@@ -7,7 +7,9 @@ import com.fjhx.mes.entity.production.po.ProductionScheduling;
 import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
 import com.fjhx.mes.entity.production.vo.ProductionSchedulingVo;
 import com.fjhx.mes.service.production.ProductionSchedulingService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -48,6 +50,7 @@ public class ProductionSchedulingController {
     /**
      * 生产排程新增
      */
+    @Log(title = "生产排程", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody List<ProductionScheduling> dtoList) {
         productionSchedulingService.add(dtoList);

+ 5 - 0
hx-mes/src/main/java/com/fjhx/mes/controller/technology/TechnologyController.java

@@ -5,7 +5,9 @@ import com.fjhx.mes.entity.technology.dto.TechnologyDto;
 import com.fjhx.mes.entity.technology.dto.TechnologySelectDto;
 import com.fjhx.mes.entity.technology.vo.TechnologyVo;
 import com.fjhx.mes.service.technology.TechnologyService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class TechnologyController {
     /**
      * 工艺新增
      */
+    @Log(title = "工艺产线", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody TechnologyDto technologyDto) {
         technologyService.add(technologyDto);
@@ -55,6 +58,7 @@ public class TechnologyController {
     /**
      * 工艺编辑
      */
+    @Log(title = "工艺产线", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody TechnologyDto technologyDto) {
         technologyService.edit(technologyDto);
@@ -71,6 +75,7 @@ public class TechnologyController {
     /**
      * 工艺删除
      */
+    @Log(title = "工艺产线", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         technologyService.delete(dto.getId());

+ 5 - 0
hx-oa/src/main/java/com/fjhx/oa/controller/education/EducationConfigController.java

@@ -5,7 +5,9 @@ import com.fjhx.oa.entity.education.dto.EducationConfigDto;
 import com.fjhx.oa.entity.education.dto.EducationConfigSelectDto;
 import com.fjhx.oa.entity.education.vo.EducationConfigVo;
 import com.fjhx.oa.service.education.EducationConfigService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class EducationConfigController {
     /**
      * 学历补贴配置新增
      */
+    @Log(title = "学历补贴配置", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody EducationConfigDto educationConfigDto) {
         educationConfigService.add(educationConfigDto);
@@ -55,6 +58,7 @@ public class EducationConfigController {
     /**
      * 学历补贴配置编辑
      */
+    @Log(title = "学历补贴配置", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody EducationConfigDto educationConfigDto) {
         educationConfigService.edit(educationConfigDto);
@@ -63,6 +67,7 @@ public class EducationConfigController {
     /**
      * 学历补贴配置删除
      */
+    @Log(title = "学历补贴配置", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         educationConfigService.delete(dto.getId());

+ 5 - 0
hx-oa/src/main/java/com/fjhx/oa/controller/epiboly/EpibolyBillController.java

@@ -5,7 +5,9 @@ import com.fjhx.oa.entity.epiboly.dto.EpibolyBillDto;
 import com.fjhx.oa.entity.epiboly.dto.EpibolyBillSelectDto;
 import com.fjhx.oa.entity.epiboly.vo.EpibolyBillVo;
 import com.fjhx.oa.service.epiboly.EpibolyBillService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class EpibolyBillController {
     /**
      * 外包加工账单新增
      */
+    @Log(title = "外包加工账单", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody EpibolyBillDto epibolyBillDto) {
         epibolyBillService.addOrEdit(epibolyBillDto);
@@ -55,6 +58,7 @@ public class EpibolyBillController {
     /**
      * 外包加工账单编辑
      */
+    @Log(title = "外包加工账单", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody EpibolyBillDto epibolyBillDto) {
         epibolyBillService.addOrEdit(epibolyBillDto);
@@ -63,6 +67,7 @@ public class EpibolyBillController {
     /**
      * 外包加工账单删除
      */
+    @Log(title = "外包加工账单", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         epibolyBillService.delete(dto.getId());

+ 5 - 0
hx-oa/src/main/java/com/fjhx/oa/controller/seal/SealConfigController.java

@@ -5,7 +5,9 @@ import com.fjhx.oa.entity.seal.dto.SealConfigDto;
 import com.fjhx.oa.entity.seal.dto.SealConfigSelectDto;
 import com.fjhx.oa.entity.seal.vo.SealConfigVo;
 import com.fjhx.oa.service.seal.SealConfigService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class SealConfigController {
     /**
      * 印章管理新增
      */
+    @Log(title = "印章管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody SealConfigDto sealConfigDto) {
         sealConfigService.add(sealConfigDto);
@@ -55,6 +58,7 @@ public class SealConfigController {
     /**
      * 印章管理编辑
      */
+    @Log(title = "印章管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody SealConfigDto sealConfigDto) {
         sealConfigService.edit(sealConfigDto);
@@ -63,6 +67,7 @@ public class SealConfigController {
     /**
      * 印章管理删除
      */
+    @Log(title = "印章管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         sealConfigService.delete(dto.getId());

+ 10 - 7
hx-purchase/src/main/java/com/fjhx/purchase/controller/invoice/InvoiceController.java

@@ -1,16 +1,18 @@
 package com.fjhx.purchase.controller.invoice;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.purchase.entity.invoice.po.Invoice;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.purchase.entity.invoice.vo.InvoiceVo;
 import com.fjhx.purchase.entity.invoice.dto.InvoiceSelectDto;
-import com.fjhx.purchase.entity.invoice.dto.InvoiceDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.purchase.entity.invoice.po.Invoice;
+import com.fjhx.purchase.entity.invoice.vo.InvoiceVo;
 import com.fjhx.purchase.service.invoice.InvoiceService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -49,6 +51,7 @@ public class InvoiceController {
      * 发票管理新增
      */
     @PostMapping("/add")
+    @Log(title = "发票管理", businessType = BusinessType.INSERT)
     public void add(@RequestBody Invoice invoice) {
         invoiceService.add(invoice);
     }

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimController.java

@@ -7,7 +7,9 @@ import com.fjhx.common.entity.claim.po.Claim;
 import com.fjhx.common.entity.claim.vo.ClaimContractVo;
 import com.fjhx.common.entity.claim.vo.ClaimVo;
 import com.fjhx.sale.service.claim.ClaimService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -66,6 +68,7 @@ public class ClaimController {
     /**
      * 到账认领删除
      */
+    @Log(title = "回款登记", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         claimService.delete(dto.getId());
@@ -99,6 +102,7 @@ public class ClaimController {
     /**
      * 回款登记
      */
+    @Log(title = "回款登记", businessType = BusinessType.INSERT)
     @PostMapping("/addClaimInfo")
     public void addClaimInfo(@RequestBody ClaimDto dto) {
         claimService.addClaimInfo(dto);
@@ -123,6 +127,7 @@ public class ClaimController {
     /**
      * 回款确认
      */
+    @Log(title = "回款确认", businessType = BusinessType.UPDATE)
     @PostMapping("/claimConfirm")
     void claimConfirm(@RequestBody ClaimDto dto) {
         claimService.claimConfirm(dto);

+ 3 - 0
hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractOutboundInfoController.java

@@ -5,6 +5,8 @@ import com.fjhx.sale.entity.contract.dto.ContractOutboundInfoDto;
 import com.fjhx.sale.entity.contract.dto.ContractOutboundInfoSelectDto;
 import com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo;
 import com.fjhx.sale.service.contract.ContractOutboundInfoService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,6 +33,7 @@ public class ContractOutboundInfoController {
         return contractOutboundInfoService.getPage(dto);
     }
 
+    @Log(title = "装车登记", businessType = BusinessType.UPDATE)
     @PostMapping("/loadTruck")
     public void loadTruck(@RequestBody ContractOutboundInfoDto dto) {
         contractOutboundInfoService.loadTruck(dto);

+ 3 - 0
hx-sale/src/main/java/com/fjhx/sale/controller/dept/DeptPerfController.java

@@ -5,6 +5,8 @@ import com.fjhx.sale.entity.dept.dto.DeptPerfDto;
 import com.fjhx.sale.entity.dept.dto.DeptPerfSelectDto;
 import com.fjhx.sale.entity.dept.vo.DeptPerfVo;
 import com.fjhx.sale.service.dept.DeptPerfService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +41,7 @@ public class DeptPerfController {
     /**
      * 部门绩效编辑
      */
+    @Log(title = "部门销售目标配置", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody DeptPerfDto deptPerfDto) {
         deptPerfService.edit(deptPerfDto);

+ 9 - 5
hx-sale/src/main/java/com/fjhx/sale/controller/documents/DocumentsController.java

@@ -1,14 +1,16 @@
 package com.fjhx.sale.controller.documents;
 
-import com.fjhx.sale.entity.documents.po.DocumentsPdf;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.documents.vo.DocumentsVo;
-import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
 import com.fjhx.sale.entity.documents.dto.DocumentsDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
+import com.fjhx.sale.entity.documents.po.DocumentsPdf;
+import com.fjhx.sale.entity.documents.vo.DocumentsVo;
 import com.fjhx.sale.service.documents.DocumentsService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -47,6 +49,7 @@ public class DocumentsController {
     /**
      * 单证表新增
      */
+    @Log(title = "单证管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody DocumentsDto documentsDto) {
         documentsService.add(documentsDto);
@@ -55,6 +58,7 @@ public class DocumentsController {
     /**
      * 单证表删除
      */
+    @Log(title = "单证管理", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         documentsService.delete(dto.getId());

+ 3 - 0
hx-sale/src/main/java/com/fjhx/sale/controller/ext/ExtQuotationProductController.java

@@ -5,6 +5,8 @@ import com.fjhx.item.entity.product.dto.ProductInfoDto;
 import com.fjhx.sale.entity.ext.dto.ExtQuotationProductSelectDto;
 import com.fjhx.sale.entity.ext.vo.ExtQuotationProductVo;
 import com.fjhx.sale.service.ext.ExtQuotationProductService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -44,6 +46,7 @@ public class ExtQuotationProductController {
     /**
      * 创建产品
      */
+    @Log(title = "待建产品", businessType = BusinessType.INSERT)
     @PostMapping("/createProduct")
     public void createProduct(@RequestBody ProductInfoDto dto) {
         extQuotationProductService.createProduct(dto);

+ 12 - 5
hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackController.java

@@ -1,14 +1,19 @@
 package com.fjhx.sale.controller.pack;
 
-import com.fjhx.sale.entity.pack.po.Pack;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.pack.vo.PackVo;
-import com.fjhx.sale.entity.pack.dto.PackSelectDto;
 import com.fjhx.sale.entity.pack.dto.PackDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackSelectDto;
+import com.fjhx.sale.entity.pack.po.Pack;
+import com.fjhx.sale.entity.pack.vo.PackVo;
 import com.fjhx.sale.service.pack.PackService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Map;
 
@@ -47,6 +52,7 @@ public class PackController {
     /**
      * 装箱出货表新增
      */
+    @Log(title = "装箱出货", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody Pack pack) {
         packService.add(pack);
@@ -63,6 +69,7 @@ public class PackController {
     /**
      * 装箱出货表删除
      */
+    @Log(title = "转箱出货", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         packService.delete(dto.getId());

+ 10 - 4
hx-sale/src/main/java/com/fjhx/sale/controller/pack/PackDetailController.java

@@ -1,13 +1,18 @@
 package com.fjhx.sale.controller.pack;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.pack.vo.PackDetailVo;
-import com.fjhx.sale.entity.pack.dto.PackDetailSelectDto;
 import com.fjhx.sale.entity.pack.dto.PackDetailDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.sale.entity.pack.dto.PackDetailSelectDto;
+import com.fjhx.sale.entity.pack.vo.PackDetailVo;
 import com.fjhx.sale.service.pack.PackDetailService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -68,6 +73,7 @@ public class PackDetailController {
     /**
      * 出货
      */
+    @Log(title = "装箱出货-出货", businessType = BusinessType.INSERT)
     @PostMapping("/shipment")
     public void shipment(@RequestBody PackDetailDto dto) {
         packDetailService.shipment(dto.getIds(),dto.getContractId());

+ 6 - 0
hx-supply/src/main/java/com/fjhx/supply/controller/supplier/SupplierInfoController.java

@@ -5,7 +5,9 @@ import com.fjhx.supply.entity.supplier.dto.SupplierInfoDto;
 import com.fjhx.supply.entity.supplier.dto.SupplierInfoSelectDto;
 import com.fjhx.supply.entity.supplier.vo.SupplierInfoVo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -57,6 +59,7 @@ public class SupplierInfoController {
     /**
      * 供应商新增
      */
+    @Log(title = "供应商", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody SupplierInfoDto supplierInfoDto) {
         supplierInfoService.add(supplierInfoDto);
@@ -65,6 +68,7 @@ public class SupplierInfoController {
     /**
      * 供应商编辑
      */
+    @Log(title = "供应商", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody SupplierInfoDto supplierInfoDto) {
         supplierInfoService.edit(supplierInfoDto);
@@ -73,6 +77,7 @@ public class SupplierInfoController {
     /**
      * 供应商删除
      */
+    @Log(title = "供应商", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         supplierInfoService.delete(dto.getId());
@@ -86,6 +91,7 @@ public class SupplierInfoController {
         return supplierInfoService.supplierStatistics(dto);
     }
 
+    @Log(title = "供应商", businessType = BusinessType.EXPORT)
     @PostMapping("/excelExport")
     public void excelExport(HttpServletResponse httpServletResponse, @RequestBody SupplierInfoSelectDto dto) {
         supplierInfoService.excelExport(httpServletResponse, dto);

+ 3 - 0
hx-supply/src/main/java/com/fjhx/supply/controller/supplier/SupplierPriceController.java

@@ -7,7 +7,9 @@ import com.fjhx.supply.entity.supplier.po.SupplierPrice;
 import com.fjhx.supply.entity.supplier.vo.SupplierPriceAddVo;
 import com.fjhx.supply.entity.supplier.vo.SupplierPriceVo;
 import com.fjhx.supply.service.supplier.SupplierPriceService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -47,6 +49,7 @@ public class SupplierPriceController {
      *
      * @return
      */
+    @Log(title = "供应商价格", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public SupplierPriceAddVo add(@Validated @RequestBody SupplierPriceDto supplierPriceDto) {
         return supplierPriceService.add(supplierPriceDto);

+ 3 - 2
hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockCheckController.java

@@ -1,13 +1,13 @@
 package com.fjhx.wms.controller.stock;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.wms.entity.stock.dto.StockCheckDto;
 import com.fjhx.wms.entity.stock.dto.StockCheckSelectDto;
 import com.fjhx.wms.entity.stock.vo.StockCheckVo;
 import com.fjhx.wms.service.stock.StockCheckService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,6 +51,7 @@ public class StockCheckController {
     /**
      * 库存盘点新增
      */
+    @Log(title = "库存盘点", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@Validated @RequestBody StockCheckDto stockCheckDto) {
         stockCheckService.add(stockCheckDto);

+ 3 - 0
hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockController.java

@@ -7,7 +7,9 @@ import com.fjhx.wms.entity.stock.dto.StockSelectDto;
 import com.fjhx.wms.entity.stock.po.Stock;
 import com.fjhx.wms.entity.stock.vo.StockVo;
 import com.fjhx.wms.service.stock.StockService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -81,6 +83,7 @@ public class StockController {
         return stockService.stockWarningPage(dto);
     }
 
+    @Log(title = "库存查询", businessType = BusinessType.EXPORT)
     @PostMapping("/exportExcel")
     public void exportExcel(@RequestBody StockSelectDto dto, HttpServletResponse httpServletResponse) {
         stockService.exportExcel(dto, httpServletResponse);

+ 4 - 0
hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockWaitController.java

@@ -5,7 +5,9 @@ import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
 import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.service.stock.StockWaitService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -47,6 +49,7 @@ public class StockWaitController {
     /**
      * 待出入库新增
      */
+    @Log(title = "待出入库", businessType = BusinessType.UPDATE)
     @PostMapping("/add")
     public void add(@RequestBody StockWaitDto stockWaitDto) {
         stockWaitService.add(stockWaitDto);
@@ -55,6 +58,7 @@ public class StockWaitController {
     /**
      * 结束入库
      */
+    @Log(title = "待入库-结束入库", businessType = BusinessType.UPDATE)
     @PostMapping("/endStorage")
     public void endStorage(@RequestBody BaseSelectDto dto) {
         stockWaitService.endStorage(dto.getId());

+ 12 - 6
hx-wms/src/main/java/com/fjhx/wms/controller/warehouse/WarehouseController.java

@@ -1,15 +1,18 @@
 package com.fjhx.wms.controller.warehouse;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.wms.entity.warehouse.vo.WarehouseVo;
-import com.fjhx.wms.entity.warehouse.dto.WarehouseSelectDto;
 import com.fjhx.wms.entity.warehouse.dto.WarehouseDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.wms.entity.warehouse.dto.WarehouseSelectDto;
+import com.fjhx.wms.entity.warehouse.vo.WarehouseVo;
 import com.fjhx.wms.service.warehouse.WarehouseService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
@@ -47,6 +50,7 @@ public class WarehouseController {
     /**
      * 仓库新增
      */
+    @Log(title = "仓库维护", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public void add(@RequestBody WarehouseDto warehouseDto) {
         warehouseService.add(warehouseDto);
@@ -55,6 +59,7 @@ public class WarehouseController {
     /**
      * 仓库编辑
      */
+    @Log(title = "仓库维护", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public void edit(@RequestBody WarehouseDto warehouseDto) {
         warehouseService.edit(warehouseDto);
@@ -63,6 +68,7 @@ public class WarehouseController {
     /**
      * 仓库删除
      */
+    @Log(title = "仓库维护", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public void delete(@RequestBody BaseSelectDto dto) {
         warehouseService.delete(dto.getId());