guoyujia 5 月之前
父节点
当前提交
b377fdc1af
共有 41 个文件被更改,包括 324 次插入170 次删除
  1. 6 4
      src/main/java/cn/ezhizao/project/business/accessories/controller/BizAccessoriesController.java
  2. 7 5
      src/main/java/cn/ezhizao/project/business/auxiliaryProcess/controller/BizAuxiliaryProcessController.java
  3. 4 2
      src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierCategoryController.java
  4. 8 4
      src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierController.java
  5. 6 4
      src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierRejectController.java
  6. 6 4
      src/main/java/cn/ezhizao/project/business/company/controller/BizCompanyController.java
  7. 6 4
      src/main/java/cn/ezhizao/project/business/companyProductPackage/controller/BizCompanyProductPackageController.java
  8. 1 0
      src/main/java/cn/ezhizao/project/business/consult/controller/BizDayworkItemConsultController.java
  9. 6 4
      src/main/java/cn/ezhizao/project/business/consultResult/controller/BizConsultResultController.java
  10. 6 4
      src/main/java/cn/ezhizao/project/business/conversion/controller/BizProductDrawingConversionController.java
  11. 4 2
      src/main/java/cn/ezhizao/project/business/da/controller/DataAcquistionController.java
  12. 7 4
      src/main/java/cn/ezhizao/project/business/deptUser/controller/BizDeptProcessController.java
  13. 5 2
      src/main/java/cn/ezhizao/project/business/equipment/controller/BizEquipmentCategoryController.java
  14. 2 0
      src/main/java/cn/ezhizao/project/business/equipment/controller/BizEquipmentDetailController.java
  15. 6 4
      src/main/java/cn/ezhizao/project/business/innerTurnover/controller/BizInnerTurnoverController.java
  16. 6 4
      src/main/java/cn/ezhizao/project/business/inspectionChamber/controller/BizInspectionChamberController.java
  17. 6 4
      src/main/java/cn/ezhizao/project/business/outsourceBalanceAccount/controller/BizOutsourceBalanceAccountController.java
  18. 7 5
      src/main/java/cn/ezhizao/project/business/outsourceBalanceMonth/controller/BizOutsourceBalanceMonthController.java
  19. 7 4
      src/main/java/cn/ezhizao/project/business/personSeal/controller/BizPersonalSealController.java
  20. 5 2
      src/main/java/cn/ezhizao/project/business/process/controller/BizProcessController.java
  21. 7 4
      src/main/java/cn/ezhizao/project/business/processCompletion/controller/BizProcessCompletionController.java
  22. 6 4
      src/main/java/cn/ezhizao/project/business/processErrorStatistics/controller/BizProcessDocumentsErrorStatisticsController.java
  23. 5 0
      src/main/java/cn/ezhizao/project/business/product/controller/BizProductController.java
  24. 6 4
      src/main/java/cn/ezhizao/project/business/publicSeal/controller/BizPublicSealController.java
  25. 6 4
      src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupController.java
  26. 8 5
      src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupDetailController.java
  27. 32 5
      src/main/java/cn/ezhizao/project/business/supplier/controller/BizSupplierController.java
  28. 6 3
      src/main/java/cn/ezhizao/project/business/technologicalProcess/controller/BizTechnologicalProcessController.java
  29. 9 6
      src/main/java/cn/ezhizao/project/business/technologicalProcessDetail/controller/BizTechnologicalProcessDetailController.java
  30. 16 11
      src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java
  31. 6 4
      src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawingRecords/controller/BizTechnologicalProcessDetailDrawingRecordsController.java
  32. 6 4
      src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawingUser/controller/BizTechnologicalProcessDetailDrawingUserController.java
  33. 6 4
      src/main/java/cn/ezhizao/project/business/workshop/controller/BizWorkshopController.java
  34. 4 3
      src/main/java/cn/ezhizao/project/business/workshopTrunover/controller/BizWorkshopTurnoverController.java
  35. 14 7
      src/main/java/cn/ezhizao/project/system/controller/SysDeptController.java
  36. 8 4
      src/main/java/cn/ezhizao/project/system/controller/SysDictDataController.java
  37. 9 5
      src/main/java/cn/ezhizao/project/system/controller/SysDictTypeController.java
  38. 7 0
      src/main/java/cn/ezhizao/project/system/controller/SysLoginController.java
  39. 7 3
      src/main/java/cn/ezhizao/project/system/controller/SysMenuController.java
  40. 16 9
      src/main/java/cn/ezhizao/project/system/controller/SysRoleController.java
  41. 29 15
      src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

+ 6 - 4
src/main/java/cn/ezhizao/project/business/accessories/controller/BizAccessoriesController.java

@@ -38,6 +38,7 @@ public class BizAccessoriesController extends BaseController
     /**
     /**
      * 查询辅料管理列表
      * 查询辅料管理列表
      */
      */
+    @Log(title = "辅料管理查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -51,7 +52,7 @@ public class BizAccessoriesController extends BaseController
      * 导出辅料管理列表
      * 导出辅料管理列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:accessories:export')")
     @PreAuthorize("@ss.hasPermi('business:accessories:export')")
-    @Log(title = "辅料管理", businessType = BusinessType.EXPORT)
+    @Log(title = "辅料管理导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -64,6 +65,7 @@ public class BizAccessoriesController extends BaseController
     /**
     /**
      * 获取辅料管理详细信息
      * 获取辅料管理详细信息
      */
      */
+    @Log(title = "辅料管理查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -74,7 +76,7 @@ public class BizAccessoriesController extends BaseController
      * 新增辅料管理
      * 新增辅料管理
      */
      */
     @PreAuthorize("@ss.hasPermi('business:accessories:add')")
     @PreAuthorize("@ss.hasPermi('business:accessories:add')")
-    @Log(title = "辅料管理", businessType = BusinessType.INSERT)
+    @Log(title = "辅料管理新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -87,7 +89,7 @@ public class BizAccessoriesController extends BaseController
      * 修改辅料管理
      * 修改辅料管理
      */
      */
     @PreAuthorize("@ss.hasPermi('business:accessories:edit')")
     @PreAuthorize("@ss.hasPermi('business:accessories:edit')")
-    @Log(title = "辅料管理", businessType = BusinessType.UPDATE)
+    @Log(title = "辅料管理修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -107,7 +109,7 @@ public class BizAccessoriesController extends BaseController
      * 删除辅料管理
      * 删除辅料管理
      */
      */
     @PreAuthorize("@ss.hasPermi('business:accessories:remove')")
     @PreAuthorize("@ss.hasPermi('business:accessories:remove')")
-    @Log(title = "辅料管理", businessType = BusinessType.DELETE)
+    @Log(title = "辅料管理删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 7 - 5
src/main/java/cn/ezhizao/project/business/auxiliaryProcess/controller/BizAuxiliaryProcessController.java

@@ -38,6 +38,7 @@ public class BizAuxiliaryProcessController extends BaseController
     /**
     /**
      * 查询辅助工序列表
      * 查询辅助工序列表
      */
      */
+    @Log(title = "辅助工序查询", businessType = BusinessType.SELECT)
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:list')")
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:list')")
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
@@ -47,7 +48,7 @@ public class BizAuxiliaryProcessController extends BaseController
         List<BizAuxiliaryProcess> list = bizAuxiliaryProcessService.getList(bizAuxiliaryProcess);
         List<BizAuxiliaryProcess> list = bizAuxiliaryProcessService.getList(bizAuxiliaryProcess);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
-
+    @Log(title = "辅助工序查询所有", businessType = BusinessType.SELECT)
     @GetMapping("/all")
     @GetMapping("/all")
     public TableDataInfo allList(BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo allList(BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -60,7 +61,7 @@ public class BizAuxiliaryProcessController extends BaseController
      * 导出辅助工序列表
      * 导出辅助工序列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:export')")
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:export')")
-    @Log(title = "辅助工序", businessType = BusinessType.EXPORT)
+    @Log(title = "辅助工序导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -73,6 +74,7 @@ public class BizAuxiliaryProcessController extends BaseController
     /**
     /**
      * 获取辅助工序详细信息
      * 获取辅助工序详细信息
      */
      */
+    @Log(title = "辅助工序查询详细信息", businessType = BusinessType.SELECT)
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:query')")
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:query')")
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -84,7 +86,7 @@ public class BizAuxiliaryProcessController extends BaseController
      * 新增辅助工序
      * 新增辅助工序
      */
      */
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:add')")
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:add')")
-    @Log(title = "辅助工序", businessType = BusinessType.INSERT)
+    @Log(title = "辅助工序新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -96,7 +98,7 @@ public class BizAuxiliaryProcessController extends BaseController
      * 修改辅助工序
      * 修改辅助工序
      */
      */
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:edit')")
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:edit')")
-    @Log(title = "辅助工序", businessType = BusinessType.UPDATE)
+    @Log(title = "辅助工序修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizAuxiliaryProcess bizAuxiliaryProcess) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -108,7 +110,7 @@ public class BizAuxiliaryProcessController extends BaseController
      * 删除辅助工序
      * 删除辅助工序
      */
      */
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:remove')")
     @PreAuthorize("@ss.hasPermi('business:auxiliaryProcess:remove')")
-    @Log(title = "辅助工序", businessType = BusinessType.DELETE)
+    @Log(title = "辅助工序删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 4 - 2
src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierCategoryController.java

@@ -41,6 +41,7 @@ public class BizCarrierCategoryController extends BaseController {
      * 查询载具类别列表
      * 查询载具类别列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrier:list')")
     @PreAuthorize("@ss.hasPermi('business:carrier:list')")
+    @Log(title = "载具类别查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizCarrierCategory bizCarrierCategory) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(BizCarrierCategory bizCarrierCategory) throws NoSuchFieldException, IllegalAccessException {
         Integer zero = 0;
         Integer zero = 0;
@@ -62,6 +63,7 @@ public class BizCarrierCategoryController extends BaseController {
      * 获取载具类别详细信息
      * 获取载具类别详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrier:query')")
     @PreAuthorize("@ss.hasPermi('business:carrier:query')")
+    @Log(title = "载具类别查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/getInfo/{id}")
     @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -85,7 +87,7 @@ public class BizCarrierCategoryController extends BaseController {
      * 新增载具类别
      * 新增载具类别
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:carrier:save')")
 //    @PreAuthorize("@ss.hasPermi('business:carrier:save')")
-    @Log(title = "载具类别", businessType = BusinessType.INSERT)
+    @Log(title = "载具类别新增", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     @PostMapping(value = "/save")
     public AjaxResult save(@RequestBody BizCarrierCategory bizCarrierCategory) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult save(@RequestBody BizCarrierCategory bizCarrierCategory) throws NoSuchFieldException, IllegalAccessException {
         final String tenantId = request.getHeader("tenantId");
         final String tenantId = request.getHeader("tenantId");
@@ -97,7 +99,7 @@ public class BizCarrierCategoryController extends BaseController {
      * 删除载具类别
      * 删除载具类别
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrier:remove')")
     @PreAuthorize("@ss.hasPermi('business:carrier:remove')")
-    @Log(title = "载具类别", businessType = BusinessType.DELETE)
+    @Log(title = "载具类别删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
     @DeleteMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {
     public AjaxResult remove(@PathVariable List<Long> ids) {
         List<BizCarrier> categoryId = carrierService.query().in("category_id", ids).list();
         List<BizCarrier> categoryId = carrierService.query().in("category_id", ids).list();

+ 8 - 4
src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierController.java

@@ -82,6 +82,7 @@ public class BizCarrierController extends BaseController {
      * 查询载具列表
      * 查询载具列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrier:list')")
     @PreAuthorize("@ss.hasPermi('business:carrier:list')")
+    @Log(title = "载具查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizCarrier data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public TableDataInfo list(BizCarrier data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
         Integer zero = 0;
         Integer zero = 0;
@@ -107,6 +108,7 @@ public class BizCarrierController extends BaseController {
      * @throws JsonProcessingException
      * @throws JsonProcessingException
      */
      */
     @PostMapping("/saveCarrier")
     @PostMapping("/saveCarrier")
+    @Log(title = "载具新增", businessType = BusinessType.INSERT)
     public AjaxResult saveCarrier(@RequestBody BizCarrier bizCarrier) throws JsonProcessingException {
     public AjaxResult saveCarrier(@RequestBody BizCarrier bizCarrier) throws JsonProcessingException {
 
 
         if(bizCarrier.getStartCode()==null||bizCarrier.getEndCode()==null || bizCarrier.getStartCode().equals("") || bizCarrier.getEndCode().equals("")){
         if(bizCarrier.getStartCode()==null||bizCarrier.getEndCode()==null || bizCarrier.getStartCode().equals("") || bizCarrier.getEndCode().equals("")){
@@ -139,6 +141,7 @@ public class BizCarrierController extends BaseController {
      * 查询载具列表
      * 查询载具列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrier:list')")
     @PreAuthorize("@ss.hasPermi('business:carrier:list')")
+    @Log(title = "载具下载", businessType = BusinessType.EXPORT)
     @Transactional
     @Transactional
     @PostMapping("/download")
     @PostMapping("/download")
     public AjaxResult download(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public AjaxResult download(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
@@ -165,6 +168,7 @@ public class BizCarrierController extends BaseController {
      * 获取载具详细信息
      * 获取载具详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrier:query')")
     @PreAuthorize("@ss.hasPermi('business:carrier:query')")
+    @Log(title = "载具查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/getInfo/{id}")
     @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(iBizCarrierService.getById(id));
         return success(iBizCarrierService.getById(id));
@@ -174,7 +178,7 @@ public class BizCarrierController extends BaseController {
      * 新增载具
      * 新增载具
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:carrier:add, business:carrier:edit')")
 //    @PreAuthorize("@ss.hasPermi('business:carrier:add, business:carrier:edit')")
-    @Log(title = "载具", businessType = BusinessType.INSERT)
+    @Log(title = "载具新增", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     @PostMapping(value = "/save")
     public AjaxResult save(@RequestBody BizCarrier bizCarrier) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public AjaxResult save(@RequestBody BizCarrier bizCarrier) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
         final String tenantId = request.getHeader("tenantId");
         final String tenantId = request.getHeader("tenantId");
@@ -196,7 +200,7 @@ public class BizCarrierController extends BaseController {
         task.GenerateQcCode(bizCarrier);
         task.GenerateQcCode(bizCarrier);
         return bool ? success(bizCarrier) : error("操作失败!");
         return bool ? success(bizCarrier) : error("操作失败!");
     }
     }
-
+    @Log(title = "载具修改", businessType = BusinessType.UPDATE)
     @PutMapping(value = "/update")
     @PutMapping(value = "/update")
     public AjaxResult update(@RequestBody BizCarrier bizCarrier) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public AjaxResult update(@RequestBody BizCarrier bizCarrier) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
 
 
@@ -207,7 +211,7 @@ public class BizCarrierController extends BaseController {
      * 删除载具
      * 删除载具
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:carrier:remove')")
 //    @PreAuthorize("@ss.hasPermi('business:carrier:remove')")
-    @Log(title = "载具", businessType = BusinessType.DELETE)
+    @Log(title = "载具删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
     @DeleteMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {
     public AjaxResult remove(@PathVariable List<Long> ids) {
         return toAjax(iBizCarrierService.removeBatchByIds(ids));
         return toAjax(iBizCarrierService.removeBatchByIds(ids));
@@ -230,7 +234,7 @@ public class BizCarrierController extends BaseController {
      * @return ajax结果
      * @return ajax结果
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:carrier:unAbandoned')")
 //    @PreAuthorize("@ss.hasPermi('business:carrier:unAbandoned')")
-    @Log(title = "载具", businessType = BusinessType.DELETE)
+    @Log(title = "载具取消废弃", businessType = BusinessType.DELETE)
     @GetMapping("/unAbandoned/{id}")
     @GetMapping("/unAbandoned/{id}")
     public AjaxResult unAbandoned(@PathVariable Long id) {
     public AjaxResult unAbandoned(@PathVariable Long id) {
         QueryWrapper<BizCarrier> findWrapper = new QueryWrapper<>();
         QueryWrapper<BizCarrier> findWrapper = new QueryWrapper<>();

+ 6 - 4
src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierRejectController.java

@@ -34,6 +34,7 @@ public class BizCarrierRejectController extends BaseController
     /**
     /**
      * 查询企业租户列表
      * 查询企业租户列表
      */
      */
+    @Log(title = "载具废弃查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -46,7 +47,7 @@ public class BizCarrierRejectController extends BaseController
      * 导出企业租户列表
      * 导出企业租户列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrierReject:export')")
     @PreAuthorize("@ss.hasPermi('business:carrierReject:export')")
-    @Log(title = "企业租户", businessType = BusinessType.EXPORT)
+    @Log(title = "载具废弃导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -59,6 +60,7 @@ public class BizCarrierRejectController extends BaseController
      * 获取企业租户详细信息
      * 获取企业租户详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrierReject:query')")
     @PreAuthorize("@ss.hasPermi('business:carrierReject:query')")
+    @Log(title = "载具废弃查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -69,7 +71,7 @@ public class BizCarrierRejectController extends BaseController
      * 新增企业租户
      * 新增企业租户
      */
      */
     @PreAuthorize("@ss.hasPermi('business:carrierReject:add')")
     @PreAuthorize("@ss.hasPermi('business:carrierReject:add')")
-    @Log(title = "企业租户", businessType = BusinessType.INSERT)
+    @Log(title = "载具废弃保存", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     @PostMapping(value = "/save")
     public AjaxResult add(@RequestBody BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -87,7 +89,7 @@ public class BizCarrierRejectController extends BaseController
      * 修改企业租户
      * 修改企业租户
      */
      */
     @PreAuthorize("@ss.hasPermi('business:reject:edit')")
     @PreAuthorize("@ss.hasPermi('business:reject:edit')")
-    @Log(title = "企业租户", businessType = BusinessType.UPDATE)
+    @Log(title = "载具废弃修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizCarrierReject bizCarrierReject) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -98,7 +100,7 @@ public class BizCarrierRejectController extends BaseController
      * 删除企业租户
      * 删除企业租户
      */
      */
     @PreAuthorize("@ss.hasPermi('business:reject:remove')")
     @PreAuthorize("@ss.hasPermi('business:reject:remove')")
-    @Log(title = "企业租户", businessType = BusinessType.DELETE)
+    @Log(title = "载具废弃删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 6 - 4
src/main/java/cn/ezhizao/project/business/company/controller/BizCompanyController.java

@@ -38,6 +38,7 @@ public class BizCompanyController extends BaseController
     /**
     /**
      * 查询客户名称列表
      * 查询客户名称列表
      */
      */
+    @Log(title = "客户名称查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -51,7 +52,7 @@ public class BizCompanyController extends BaseController
      * 导出客户名称列表
      * 导出客户名称列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:company:export')")
     @PreAuthorize("@ss.hasPermi('business:company:export')")
-    @Log(title = "客户名称", businessType = BusinessType.EXPORT)
+    @Log(title = "客户名称导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -64,6 +65,7 @@ public class BizCompanyController extends BaseController
     /**
     /**
      * 获取客户名称详细信息
      * 获取客户名称详细信息
      */
      */
+    @Log(title = "客户名称查询详细信息", businessType = BusinessType.SELECT)
     @PreAuthorize("@ss.hasPermi('business:company:query')")
     @PreAuthorize("@ss.hasPermi('business:company:query')")
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -75,7 +77,7 @@ public class BizCompanyController extends BaseController
      * 新增客户名称
      * 新增客户名称
      */
      */
     @PreAuthorize("@ss.hasPermi('business:company:add')")
     @PreAuthorize("@ss.hasPermi('business:company:add')")
-    @Log(title = "客户名称", businessType = BusinessType.INSERT)
+    @Log(title = "客户名称新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -87,7 +89,7 @@ public class BizCompanyController extends BaseController
      * 修改客户名称
      * 修改客户名称
      */
      */
     @PreAuthorize("@ss.hasPermi('business:company:edit')")
     @PreAuthorize("@ss.hasPermi('business:company:edit')")
-    @Log(title = "客户名称", businessType = BusinessType.UPDATE)
+    @Log(title = "客户名称修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -99,7 +101,7 @@ public class BizCompanyController extends BaseController
      * 删除客户名称
      * 删除客户名称
      */
      */
     @PreAuthorize("@ss.hasPermi('business:company:remove')")
     @PreAuthorize("@ss.hasPermi('business:company:remove')")
-    @Log(title = "客户名称", businessType = BusinessType.DELETE)
+    @Log(title = "客户名称删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 6 - 4
src/main/java/cn/ezhizao/project/business/companyProductPackage/controller/BizCompanyProductPackageController.java

@@ -39,6 +39,7 @@ public class BizCompanyProductPackageController extends BaseController
      * 查询产品包装客户关联列表
      * 查询产品包装客户关联列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:list')")
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:list')")
+    @Log(title = "产品包装客户关联查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -52,7 +53,7 @@ public class BizCompanyProductPackageController extends BaseController
      * 导出产品包装客户关联列表
      * 导出产品包装客户关联列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:export')")
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:export')")
-    @Log(title = "产品包装客户关联", businessType = BusinessType.EXPORT)
+    @Log(title = "产品包装客户关联导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -65,6 +66,7 @@ public class BizCompanyProductPackageController extends BaseController
     /**
     /**
      * 获取产品包装客户关联详细信息
      * 获取产品包装客户关联详细信息
      */
      */
+    @Log(title = "产品包装客户关联查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -75,7 +77,7 @@ public class BizCompanyProductPackageController extends BaseController
      * 新增产品包装客户关联
      * 新增产品包装客户关联
      */
      */
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:add')")
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:add')")
-    @Log(title = "产品包装客户关联", businessType = BusinessType.INSERT)
+    @Log(title = "产品包装客户关联新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -87,7 +89,7 @@ public class BizCompanyProductPackageController extends BaseController
      * 修改产品包装客户关联
      * 修改产品包装客户关联
      */
      */
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:edit')")
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:edit')")
-    @Log(title = "产品包装客户关联", businessType = BusinessType.UPDATE)
+    @Log(title = "产品包装客户关联修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -99,7 +101,7 @@ public class BizCompanyProductPackageController extends BaseController
      * 删除产品包装客户关联
      * 删除产品包装客户关联
      */
      */
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:remove')")
     @PreAuthorize("@ss.hasPermi('business:companyProductPackage:remove')")
-    @Log(title = "产品包装客户关联", businessType = BusinessType.DELETE)
+    @Log(title = "产品包装客户关联删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 1 - 0
src/main/java/cn/ezhizao/project/business/consult/controller/BizDayworkItemConsultController.java

@@ -38,6 +38,7 @@ public class BizDayworkItemConsultController extends BaseController
     /**
     /**
      * 查询报工技术咨询列表
      * 查询报工技术咨询列表
      */
      */
+    @Log(title = "报工技术咨询查询", businessType = BusinessType.SELECT)
     @PreAuthorize("@ss.hasPermi('business:consult:list')")
     @PreAuthorize("@ss.hasPermi('business:consult:list')")
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizDayworkItemConsult bizDayworkItemConsult) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizDayworkItemConsult bizDayworkItemConsult) throws NoSuchFieldException, IllegalAccessException

+ 6 - 4
src/main/java/cn/ezhizao/project/business/consultResult/controller/BizConsultResultController.java

@@ -43,6 +43,7 @@ public class BizConsultResultController extends BaseController
     /**
     /**
      * 查询咨询结果维护列表
      * 查询咨询结果维护列表
      */
      */
+    @Log(title = "咨询结果维护查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizConsultResult bizConsultResult) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizConsultResult bizConsultResult) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -56,7 +57,7 @@ public class BizConsultResultController extends BaseController
      * 导出咨询结果维护列表
      * 导出咨询结果维护列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:consultResult:export')")
     @PreAuthorize("@ss.hasPermi('business:consultResult:export')")
-    @Log(title = "咨询结果维护", businessType = BusinessType.EXPORT)
+    @Log(title = "咨询结果维护导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizConsultResult bizConsultResult) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizConsultResult bizConsultResult) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -70,6 +71,7 @@ public class BizConsultResultController extends BaseController
      * 获取咨询结果维护详细信息
      * 获取咨询结果维护详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:consultResult:query')")
     @PreAuthorize("@ss.hasPermi('business:consultResult:query')")
+    @Log(title = "咨询结果维护查询详细信息", businessType = BusinessType.EXPORT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -80,7 +82,7 @@ public class BizConsultResultController extends BaseController
      * 新增咨询结果维护
      * 新增咨询结果维护
      */
      */
 
 
-    @Log(title = "咨询结果维护", businessType = BusinessType.INSERT)
+    @Log(title = "咨询结果维护新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizConsultResult bizConsultResult) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizConsultResult bizConsultResult) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -91,7 +93,7 @@ public class BizConsultResultController extends BaseController
     /**
     /**
      * 修改咨询结果维护
      * 修改咨询结果维护
      */
      */
-    @Log(title = "咨询结果维护", businessType = BusinessType.UPDATE)
+    @Log(title = "咨询结果维护修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizConsultResult bizConsultResult) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizConsultResult bizConsultResult) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -110,7 +112,7 @@ public class BizConsultResultController extends BaseController
     /**
     /**
      * 删除咨询结果维护
      * 删除咨询结果维护
      */
      */
-    @Log(title = "咨询结果维护", businessType = BusinessType.DELETE)
+    @Log(title = "咨询结果维护删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 6 - 4
src/main/java/cn/ezhizao/project/business/conversion/controller/BizProductDrawingConversionController.java

@@ -48,6 +48,7 @@ public class BizProductDrawingConversionController extends BaseController
      * 查询产品电子化率记录列表
      * 查询产品电子化率记录列表
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
+    @Log(title = "产品电子化率记录查询", businessType = BusinessType.INSERT)
     @Transactional
     @Transactional
     public AjaxResult list(BizProductDrawingConversion bizProductDrawingConversion) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult list(BizProductDrawingConversion bizProductDrawingConversion) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -200,7 +201,7 @@ public class BizProductDrawingConversionController extends BaseController
      * 导出产品电子化率记录列表
      * 导出产品电子化率记录列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:conversion:export')")
     @PreAuthorize("@ss.hasPermi('business:conversion:export')")
-    @Log(title = "产品电子化率记录", businessType = BusinessType.EXPORT)
+    @Log(title = "产品电子化率记录导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizProductDrawingConversion bizProductDrawingConversion) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizProductDrawingConversion bizProductDrawingConversion) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -214,6 +215,7 @@ public class BizProductDrawingConversionController extends BaseController
      * 获取产品电子化率记录详细信息
      * 获取产品电子化率记录详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:conversion:query')")
     @PreAuthorize("@ss.hasPermi('business:conversion:query')")
+    @Log(title = "产品电子化率记录查询详细信息", businessType = BusinessType.EXPORT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -223,7 +225,7 @@ public class BizProductDrawingConversionController extends BaseController
     /**
     /**
      * 新增产品电子化率记录
      * 新增产品电子化率记录
      */
      */
-    @Log(title = "产品电子化率记录", businessType = BusinessType.INSERT)
+    @Log(title = "产品电子化率记录新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizProductDrawingConversion bizProductDrawingConversion) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizProductDrawingConversion bizProductDrawingConversion) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -235,7 +237,7 @@ public class BizProductDrawingConversionController extends BaseController
      * 修改产品电子化率记录
      * 修改产品电子化率记录
      */
      */
     @PreAuthorize("@ss.hasPermi('business:conversion:edit')")
     @PreAuthorize("@ss.hasPermi('business:conversion:edit')")
-    @Log(title = "产品电子化率记录", businessType = BusinessType.UPDATE)
+    @Log(title = "产品电子化率记录修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizProductDrawingConversion bizProductDrawingConversion) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizProductDrawingConversion bizProductDrawingConversion) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -247,7 +249,7 @@ public class BizProductDrawingConversionController extends BaseController
      * 删除产品电子化率记录
      * 删除产品电子化率记录
      */
      */
     @PreAuthorize("@ss.hasPermi('business:conversion:remove')")
     @PreAuthorize("@ss.hasPermi('business:conversion:remove')")
-    @Log(title = "产品电子化率记录", businessType = BusinessType.DELETE)
+    @Log(title = "产品电子化率记录删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 4 - 2
src/main/java/cn/ezhizao/project/business/da/controller/DataAcquistionController.java

@@ -1,5 +1,7 @@
 package cn.ezhizao.project.business.da.controller;
 package cn.ezhizao.project.business.da.controller;
 
 
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.project.business.da.domain.EquipmentCurrentError;
 import cn.ezhizao.project.business.da.domain.EquipmentCurrentError;
@@ -39,7 +41,7 @@ public class DataAcquistionController extends BaseController {
     IBizEquipmentDetailService equipmentDetailService;
     IBizEquipmentDetailService equipmentDetailService;
     @Resource
     @Resource
     IBizProcessService processService;
     IBizProcessService processService;
-
+    @Log(title = "数采查询,单个设备加工情况", businessType = BusinessType.SELECT)
     @GetMapping("/getCurrentProductionByEquipCode")
     @GetMapping("/getCurrentProductionByEquipCode")
     public AjaxResult getCurrentProductionByEquipCode(@RequestParam("equipCode") String equipCode) {
     public AjaxResult getCurrentProductionByEquipCode(@RequestParam("equipCode") String equipCode) {
         List<BizEquipmentDetail> equipmentDetails = equipmentDetailService.query().eq("equipment_code", equipCode).list();
         List<BizEquipmentDetail> equipmentDetails = equipmentDetailService.query().eq("equipment_code", equipCode).list();
@@ -61,7 +63,7 @@ public class DataAcquistionController extends BaseController {
         status.setProcessAlias(process == null ? "" : process.getProcessAlias());
         status.setProcessAlias(process == null ? "" : process.getProcessAlias());
         return AjaxResult.success("查询成功", status);
         return AjaxResult.success("查询成功", status);
     }
     }
-
+    @Log(title = "数采查询,多个设备加工情况", businessType = BusinessType.SELECT)
     @GetMapping("getCurrentProductionByEquipCodes")
     @GetMapping("getCurrentProductionByEquipCodes")
     public AjaxResult getCurrentProductionByEquipCodes(@RequestParam("equipCode") String equipCodes) {
     public AjaxResult getCurrentProductionByEquipCodes(@RequestParam("equipCode") String equipCodes) {
         List<String> equipCodeList = Arrays.stream(equipCodes.split(",")).distinct().collect(Collectors.toList());
         List<String> equipCodeList = Arrays.stream(equipCodes.split(",")).distinct().collect(Collectors.toList());

+ 7 - 4
src/main/java/cn/ezhizao/project/business/deptUser/controller/BizDeptProcessController.java

@@ -36,6 +36,7 @@ public class BizDeptProcessController extends BaseController
      * 查询deptProcess列表
      * 查询deptProcess列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:list')")
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:list')")
+    @Log(title = "资源组工段绑定的工序查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizDeptProcess bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizDeptProcess bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -53,7 +54,8 @@ public class BizDeptProcessController extends BaseController
      * 导出deptProcess列表
      * 导出deptProcess列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:export')")
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:export')")
-    @Log(title = "deptProcess", businessType = BusinessType.EXPORT)
+
+    @Log(title = "工段下资源组绑定的工序导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizDeptProcess bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizDeptProcess bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -67,6 +69,7 @@ public class BizDeptProcessController extends BaseController
      * 获取deptProcess详细信息
      * 获取deptProcess详细信息
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:query')")
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:query')")
+    @Log(title = "资源组工段绑定的工序查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -77,7 +80,7 @@ public class BizDeptProcessController extends BaseController
      * 新增deptProcess
      * 新增deptProcess
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:add')")
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:add')")
-    @Log(title = "deptProcess", businessType = BusinessType.INSERT)
+    @Log(title = "资源组工段绑定的工序保存", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     @PostMapping("/save")
     public AjaxResult add(@RequestBody List<BizDeptProcess> bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody List<BizDeptProcess> bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -89,7 +92,7 @@ public class BizDeptProcessController extends BaseController
      * 修改deptProcess
      * 修改deptProcess
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:edit')")
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:edit')")
-    @Log(title = "deptProcess", businessType = BusinessType.UPDATE)
+    @Log(title = "资源组工段绑定的工序修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizDeptProcess bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizDeptProcess bizDeptProcess) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -102,7 +105,7 @@ public class BizDeptProcessController extends BaseController
      * 删除deptProcess
      * 删除deptProcess
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:remove')")
 //    @PreAuthorize("@ss.hasPermi('business:deptProcess:remove')")
-    @Log(title = "deptProcess", businessType = BusinessType.DELETE)
+    @Log(title = "资源组工段绑定的工序删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 5 - 2
src/main/java/cn/ezhizao/project/business/equipment/controller/BizEquipmentCategoryController.java

@@ -43,6 +43,7 @@ public class BizEquipmentCategoryController extends BaseController {
      * 查询设备档案列表
      * 查询设备档案列表
      */
      */
     @PreAuthorize("@ss.hasAnyPermi('business:equipmentCategory:list,business:equipment:list')")
     @PreAuthorize("@ss.hasAnyPermi('business:equipmentCategory:list,business:equipment:list')")
+    @Log(title = "设备类别及明细查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizEquipmentCategory equipmentCategory) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(BizEquipmentCategory equipmentCategory) throws NoSuchFieldException, IllegalAccessException {
           Integer zero = 0;
           Integer zero = 0;
@@ -64,6 +65,7 @@ public class BizEquipmentCategoryController extends BaseController {
     }
     }
 
 
     @PostMapping("/listCategories")
     @PostMapping("/listCategories")
+    @Log(title = "设备类别查询", businessType = BusinessType.SELECT)
     public AjaxResult listCategories(BizEquipmentCategory bizEquipmentCategory) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult listCategories(BizEquipmentCategory bizEquipmentCategory) throws NoSuchFieldException, IllegalAccessException {
 
 
         List<BizEquipmentCategory> list = bizEquipmentDetailService.getCategoryList(bizEquipmentCategory);
         List<BizEquipmentCategory> list = bizEquipmentDetailService.getCategoryList(bizEquipmentCategory);
@@ -74,6 +76,7 @@ public class BizEquipmentCategoryController extends BaseController {
      * 获取设备档案详细信息
      * 获取设备档案详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:equipmentCategory:query')")
     @PreAuthorize("@ss.hasPermi('business:equipmentCategory:query')")
+    @Log(title = "设备类别查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/getInfo/{id}")
     @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         Integer zero = 0;
         Integer zero = 0;
@@ -97,7 +100,7 @@ public class BizEquipmentCategoryController extends BaseController {
      * 新增设备档案
      * 新增设备档案
      */
      */
     @PreAuthorize("@ss.hasAnyPermi('business:equipmentCategory:add,business:equipment:add,business:equipmentCategory:edit')")
     @PreAuthorize("@ss.hasAnyPermi('business:equipmentCategory:add,business:equipment:add,business:equipmentCategory:edit')")
-    @Log(title = "设备档案", businessType = BusinessType.INSERT)
+    @Log(title = "设备类别保存", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     @PostMapping(value = "/save")
     public AjaxResult save(@RequestBody BizEquipmentCategory bizEquipmentDetail) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult save(@RequestBody BizEquipmentCategory bizEquipmentDetail) throws NoSuchFieldException, IllegalAccessException {
         final String tenantId = request.getHeader("tenantId");
         final String tenantId = request.getHeader("tenantId");
@@ -109,7 +112,7 @@ public class BizEquipmentCategoryController extends BaseController {
      * 删除设备档案
      * 删除设备档案
      */
      */
     @PreAuthorize("@ss.hasAnyPermi('business:equipmentCategory:remove,business:equipment:remove')")
     @PreAuthorize("@ss.hasAnyPermi('business:equipmentCategory:remove,business:equipment:remove')")
-    @Log(title = "设备档案", businessType = BusinessType.DELETE)
+    @Log(title = "设备类别删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
     @DeleteMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {
     public AjaxResult remove(@PathVariable List<Long> ids) {
         List<BizEquipmentDetail> equipmentCategoryId = bizEquipmentDetailService.query().in("equipment_category_id", ids).list();
         List<BizEquipmentDetail> equipmentCategoryId = bizEquipmentDetailService.query().in("equipment_category_id", ids).list();

+ 2 - 0
src/main/java/cn/ezhizao/project/business/equipment/controller/BizEquipmentDetailController.java

@@ -70,6 +70,7 @@ public class BizEquipmentDetailController extends BaseController {
      */
      */
     //@PreAuthorize("@ss.hasPermi('business:equipment:list')")
     //@PreAuthorize("@ss.hasPermi('business:equipment:list')")
     @PostMapping("/list")
     @PostMapping("/list")
+    @Log(title = "设备明细查询", businessType = BusinessType.SELECT)
     public TableDataInfo list(@RequestBody Map<String, Object> data) {
     public TableDataInfo list(@RequestBody Map<String, Object> data) {
         Integer zero = 0;
         Integer zero = 0;
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -99,6 +100,7 @@ public class BizEquipmentDetailController extends BaseController {
      */
      */
     //@PreAuthorize("@ss.hasPermi('business:equipment:list')")
     //@PreAuthorize("@ss.hasPermi('business:equipment:list')")
     @Transactional
     @Transactional
+    @Log(title = "设备档案管理查询", businessType = BusinessType.SELECT)
     @GetMapping("/detailList")
     @GetMapping("/detailList")
     public TableDataInfo detailList( BizEquipmentDetail data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public TableDataInfo detailList( BizEquipmentDetail data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
 //        final String tenantId = request.getHeader("tenantId");
 //        final String tenantId = request.getHeader("tenantId");

+ 6 - 4
src/main/java/cn/ezhizao/project/business/innerTurnover/controller/BizInnerTurnoverController.java

@@ -45,6 +45,7 @@ public class BizInnerTurnoverController extends BaseController
      * 查询工段内部人周转表列表
      * 查询工段内部人周转表列表
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
+    @Log(title = "工段内部人周转查询", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizInnerTurnover bizInnerTurnover) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizInnerTurnover bizInnerTurnover) throws NoSuchFieldException, IllegalAccessException
     {
     {
         setTenantId(bizInnerTurnover);
         setTenantId(bizInnerTurnover);
@@ -56,7 +57,7 @@ public class BizInnerTurnoverController extends BaseController
      * 导出工段内部人周转表列表
      * 导出工段内部人周转表列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:innerTurnover:export')")
     @PreAuthorize("@ss.hasPermi('business:innerTurnover:export')")
-    @Log(title = "工段内部人周转", businessType = BusinessType.EXPORT)
+    @Log(title = "工段内部人周转导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizInnerTurnover bizInnerTurnover) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizInnerTurnover bizInnerTurnover) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -70,6 +71,7 @@ public class BizInnerTurnoverController extends BaseController
      * 获取工段内部人周转表详细信息
      * 获取工段内部人周转表详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:innerTurnover:query')")
     @PreAuthorize("@ss.hasPermi('business:innerTurnover:query')")
+    @Log(title = "工段内部人周转查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -79,7 +81,7 @@ public class BizInnerTurnoverController extends BaseController
     /**
     /**
      * 新增工段内部人周转表
      * 新增工段内部人周转表
      */
      */
-    @Log(title = "工段内部人周转", businessType = BusinessType.INSERT)
+    @Log(title = "工段内部人周转新增", businessType = BusinessType.INSERT)
     @Transactional
     @Transactional
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody SysDept sysDept) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody SysDept sysDept) throws NoSuchFieldException, IllegalAccessException
@@ -98,7 +100,7 @@ public class BizInnerTurnoverController extends BaseController
      * 修改工段内部人周转表
      * 修改工段内部人周转表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:innerTurnover:edit')")
     @PreAuthorize("@ss.hasPermi('business:innerTurnover:edit')")
-    @Log(title = "工段内部人周转", businessType = BusinessType.UPDATE)
+    @Log(title = "工段内部人周转修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizInnerTurnover bizInnerTurnover) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizInnerTurnover bizInnerTurnover) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -110,7 +112,7 @@ public class BizInnerTurnoverController extends BaseController
      * 删除工段内部人周转表
      * 删除工段内部人周转表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:innerTurnover:remove')")
     @PreAuthorize("@ss.hasPermi('business:innerTurnover:remove')")
-    @Log(title = "工段内部人周转", businessType = BusinessType.DELETE)
+    @Log(title = "工段内部人周转删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 6 - 4
src/main/java/cn/ezhizao/project/business/inspectionChamber/controller/BizInspectionChamberController.java

@@ -49,6 +49,7 @@ public class BizInspectionChamberController extends BaseController
      * 查询检测室配置列表
      * 查询检测室配置列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:list')")
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:list')")
+    @Log(title = "检测室配置查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -69,7 +70,7 @@ public class BizInspectionChamberController extends BaseController
      * 导出检测室配置列表
      * 导出检测室配置列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:export')")
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:export')")
-    @Log(title = "检测室配置", businessType = BusinessType.EXPORT)
+    @Log(title = "检测室配置导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -83,6 +84,7 @@ public class BizInspectionChamberController extends BaseController
      * 获取检测室配置详细信息
      * 获取检测室配置详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:query')")
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:query')")
+    @Log(title = "检测室配置查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -93,7 +95,7 @@ public class BizInspectionChamberController extends BaseController
      * 新增检测室配置
      * 新增检测室配置
      */
      */
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:add')")
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:add')")
-    @Log(title = "检测室配置", businessType = BusinessType.INSERT)
+    @Log(title = "检测室配置新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -109,7 +111,7 @@ public class BizInspectionChamberController extends BaseController
      * 修改检测室配置
      * 修改检测室配置
      */
      */
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:edit')")
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:edit')")
-    @Log(title = "检测室配置", businessType = BusinessType.UPDATE)
+    @Log(title = "检测室配置修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizInspectionChamber bizInspectionChamber) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -125,7 +127,7 @@ public class BizInspectionChamberController extends BaseController
      * 删除检测室配置
      * 删除检测室配置
      */
      */
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:remove')")
     @PreAuthorize("@ss.hasPermi('business:inspectionChamber:remove')")
-    @Log(title = "检测室配置", businessType = BusinessType.DELETE)
+    @Log(title = "检测室配置删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 6 - 4
src/main/java/cn/ezhizao/project/business/outsourceBalanceAccount/controller/BizOutsourceBalanceAccountController.java

@@ -40,6 +40,7 @@ public class BizOutsourceBalanceAccountController extends BaseController
      * 查询外协结算列表
      * 查询外协结算列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:account:list')")
     @PreAuthorize("@ss.hasPermi('business:account:list')")
+    @Log(title = "外协结算查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -53,7 +54,7 @@ public class BizOutsourceBalanceAccountController extends BaseController
      * 导出外协结算列表
      * 导出外协结算列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:account:export')")
     @PreAuthorize("@ss.hasPermi('business:account:export')")
-    @Log(title = "外协结算", businessType = BusinessType.EXPORT)
+    @Log(title = "外协结算导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -67,6 +68,7 @@ public class BizOutsourceBalanceAccountController extends BaseController
      * 获取外协结算详细信息
      * 获取外协结算详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:account:query')")
     @PreAuthorize("@ss.hasPermi('business:account:query')")
+    @Log(title = "外协结算查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -77,7 +79,7 @@ public class BizOutsourceBalanceAccountController extends BaseController
      * 新增外协结算
      * 新增外协结算
      */
      */
     @PreAuthorize("@ss.hasPermi('business:account:add')")
     @PreAuthorize("@ss.hasPermi('business:account:add')")
-    @Log(title = "外协结算", businessType = BusinessType.INSERT)
+    @Log(title = "外协结算新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -89,7 +91,7 @@ public class BizOutsourceBalanceAccountController extends BaseController
      * 修改外协结算
      * 修改外协结算
      */
      */
     @PreAuthorize("@ss.hasPermi('business:account:edit')")
     @PreAuthorize("@ss.hasPermi('business:account:edit')")
-    @Log(title = "外协结算", businessType = BusinessType.UPDATE)
+    @Log(title = "外协结算编辑", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -101,7 +103,7 @@ public class BizOutsourceBalanceAccountController extends BaseController
      * 删除外协结算
      * 删除外协结算
      */
      */
     @PreAuthorize("@ss.hasPermi('business:account:remove')")
     @PreAuthorize("@ss.hasPermi('business:account:remove')")
-    @Log(title = "外协结算", businessType = BusinessType.DELETE)
+    @Log(title = "外协结算删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 7 - 5
src/main/java/cn/ezhizao/project/business/outsourceBalanceMonth/controller/BizOutsourceBalanceMonthController.java

@@ -40,6 +40,7 @@ public class BizOutsourceBalanceMonthController extends BaseController
      * 查询外协结算月设置列表
      * 查询外协结算月设置列表
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
+    @Log(title = "外协结算月设置查询", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     {
     {
 //        setTenantId(bizOutsourceBalanceMonth);
 //        setTenantId(bizOutsourceBalanceMonth);
@@ -51,7 +52,7 @@ public class BizOutsourceBalanceMonthController extends BaseController
     /**
     /**
      * 导出外协结算月设置列表
      * 导出外协结算月设置列表
      */
      */
-    @Log(title = "外协结算月设置", businessType = BusinessType.EXPORT)
+    @Log(title = "外协结算月设置导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -65,6 +66,7 @@ public class BizOutsourceBalanceMonthController extends BaseController
      * 获取外协结算月设置详细信息
      * 获取外协结算月设置详细信息
      */
      */
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
+    @Log(title = "外协结算月设置查询详细信息", businessType = BusinessType.SELECT)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
         return success(bizOutsourceBalanceMonthService.getById(id));
         return success(bizOutsourceBalanceMonthService.getById(id));
@@ -73,7 +75,7 @@ public class BizOutsourceBalanceMonthController extends BaseController
     /**
     /**
      * 新增外协结算月设置
      * 新增外协结算月设置
      */
      */
-    @Log(title = "外协结算月设置", businessType = BusinessType.INSERT)
+    @Log(title = "外协结算月设置新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -84,7 +86,7 @@ public class BizOutsourceBalanceMonthController extends BaseController
     /**
     /**
      * 修改外协结算月设置
      * 修改外协结算月设置
      */
      */
-    @Log(title = "外协结算月设置", businessType = BusinessType.UPDATE)
+    @Log(title = "外协结算月设置修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -95,7 +97,7 @@ public class BizOutsourceBalanceMonthController extends BaseController
     /**
     /**
      * 删除外协结算月设置
      * 删除外协结算月设置
      */
      */
-    @Log(title = "外协结算月设置", businessType = BusinessType.DELETE)
+    @Log(title = "外协结算月设置删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {
@@ -105,7 +107,7 @@ public class BizOutsourceBalanceMonthController extends BaseController
     /**
     /**
      * 修改外协结算月设置
      * 修改外协结算月设置
      */
      */
-    @Log(title = "外协结算月设置", businessType = BusinessType.INSERT)
+    @Log(title = "外协结算月设置保存", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     @PostMapping("/save")
     public AjaxResult save(@RequestBody BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult save(@RequestBody BizOutsourceBalanceMonth bizOutsourceBalanceMonth) throws NoSuchFieldException, IllegalAccessException
     {
     {

+ 7 - 4
src/main/java/cn/ezhizao/project/business/personSeal/controller/BizPersonalSealController.java

@@ -40,6 +40,7 @@ public class BizPersonalSealController extends BaseController
      * 查询电子图纸列表
      * 查询电子图纸列表
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
+    @Log(title = "个人印章查询", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizPersonalSeal bizPersonalSeal) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizPersonalSeal bizPersonalSeal) throws NoSuchFieldException, IllegalAccessException
     {
     {
         startPage();
         startPage();
@@ -52,6 +53,7 @@ public class BizPersonalSealController extends BaseController
      * 查询电子图纸列表
      * 查询电子图纸列表
      */
      */
     @GetMapping("/listByid")
     @GetMapping("/listByid")
+    @Log(title = "查询当前用户的印章", businessType = BusinessType.SELECT)
     public AjaxResult listByid() throws NoSuchFieldException, IllegalAccessException
     public AjaxResult listByid() throws NoSuchFieldException, IllegalAccessException
     {
     {
         Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
         Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
@@ -66,7 +68,7 @@ public class BizPersonalSealController extends BaseController
     /**
     /**
      * 导出电子图纸列表
      * 导出电子图纸列表
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.EXPORT)
+    @Log(title = "个人印章导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizPersonalSeal bizPersonalSeal) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizPersonalSeal bizPersonalSeal) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -79,6 +81,7 @@ public class BizPersonalSealController extends BaseController
      * 获取电子图纸详细信息
      * 获取电子图纸详细信息
      */
      */
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
+    @Log(title = "个人印章查询详细信息", businessType = BusinessType.SELECT)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
         return success(bizPersonalSealService.getById(id));
         return success(bizPersonalSealService.getById(id));
@@ -87,7 +90,7 @@ public class BizPersonalSealController extends BaseController
     /**
     /**
      * 新增电子图纸
      * 新增电子图纸
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.INSERT)
+    @Log(title = "个人印章新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizPersonalSeal bizPersonalSeal) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizPersonalSeal bizPersonalSeal) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -108,7 +111,7 @@ public class BizPersonalSealController extends BaseController
     /**
     /**
      * 修改电子图纸
      * 修改电子图纸
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.UPDATE)
+    @Log(title = "电子图纸修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizPersonalSeal bizPersonalSeal) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizPersonalSeal bizPersonalSeal) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -118,7 +121,7 @@ public class BizPersonalSealController extends BaseController
     /**
     /**
      * 删除电子图纸
      * 删除电子图纸
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.DELETE)
+    @Log(title = "个人印章删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 5 - 2
src/main/java/cn/ezhizao/project/business/process/controller/BizProcessController.java

@@ -37,6 +37,7 @@ public class BizProcessController extends BaseController {
      * 查询标准工序列表
      * 查询标准工序列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:process:list')")
 //    @PreAuthorize("@ss.hasPermi('business:process:list')")
+    @Log(title = "标准工序查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizProcess bizProcess) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(BizProcess bizProcess) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         startPage();
@@ -47,6 +48,7 @@ public class BizProcessController extends BaseController {
     /**
     /**
      * 查询标准工序列表
      * 查询标准工序列表
      */
      */
+    @Log(title = "当前工段没有配置的工序信息查询", businessType = BusinessType.SELECT)
     @GetMapping("/listFilterProcess")
     @GetMapping("/listFilterProcess")
     public TableDataInfo listFilterProcess(BizProcess bizProcess) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo listFilterProcess(BizProcess bizProcess) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         startPage();
@@ -59,6 +61,7 @@ public class BizProcessController extends BaseController {
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:process:query')")
 //    @PreAuthorize("@ss.hasPermi('business:process:query')")
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
+    @Log(title = "标准工序查询详细信息", businessType = BusinessType.SELECT)
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizProcessService.getById(id));
         return success(bizProcessService.getById(id));
     }
     }
@@ -67,7 +70,7 @@ public class BizProcessController extends BaseController {
      * 新增标准工序
      * 新增标准工序
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:process:add')")
 //    @PreAuthorize("@ss.hasPermi('business:process:add')")
-    @Log(title = "标准工序", businessType = BusinessType.INSERT)
+    @Log(title = "标准工序新增", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     @PostMapping(value = "/save")
     public AjaxResult save(@RequestBody BizProcess bizProcess) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult save(@RequestBody BizProcess bizProcess) throws NoSuchFieldException, IllegalAccessException {
         //修改标准工序
         //修改标准工序
@@ -109,7 +112,7 @@ public class BizProcessController extends BaseController {
      * 删除标准工序
      * 删除标准工序
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:process:remove')")
 //    @PreAuthorize("@ss.hasPermi('business:process:remove')")
-    @Log(title = "标准工序", businessType = BusinessType.DELETE)
+    @Log(title = "标准工序删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
     @DeleteMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {
     public AjaxResult remove(@PathVariable List<Long> ids) {
         QueryWrapper<BizTechnologicalProcessDetail> queryWrapper = new QueryWrapper<>();
         QueryWrapper<BizTechnologicalProcessDetail> queryWrapper = new QueryWrapper<>();

+ 7 - 4
src/main/java/cn/ezhizao/project/business/processCompletion/controller/BizProcessCompletionController.java

@@ -44,6 +44,7 @@ public class BizProcessCompletionController extends BaseController {
      * 查询企业租户列表
      * 查询企业租户列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:completion:list')")
 //    @PreAuthorize("@ss.hasPermi('business:completion:list')")
+    @Log(title = "工艺文件下发及时率查询", businessType = BusinessType.EXPORT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizProcessCompletion bizProcessCompletion) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(BizProcessCompletion bizProcessCompletion) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizProcessCompletion);
         setTenantId(bizProcessCompletion);
@@ -53,6 +54,7 @@ public class BizProcessCompletionController extends BaseController {
     }
     }
 
 
 //    @PreAuthorize("@ss.hasPermi('business:completion:list')")
 //    @PreAuthorize("@ss.hasPermi('business:completion:list')")
+    @Log(title = "工艺下发及时率图表数据查询", businessType = BusinessType.EXPORT)
     @GetMapping("/listStatistics")
     @GetMapping("/listStatistics")
     public TableDataInfo listStatistics(CompleteStatistics completeStatistics) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo listStatistics(CompleteStatistics completeStatistics) throws NoSuchFieldException, IllegalAccessException {
         List<CompleteStatistics> list = completeStatisticsService.getList(completeStatistics);
         List<CompleteStatistics> list = completeStatisticsService.getList(completeStatistics);
@@ -66,7 +68,7 @@ public class BizProcessCompletionController extends BaseController {
      * 导出企业租户列表
      * 导出企业租户列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:completion:export')")
 //    @PreAuthorize("@ss.hasPermi('business:completion:export')")
-    @Log(title = "企业租户", businessType = BusinessType.EXPORT)
+    @Log(title = "工艺下发及时率导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizProcessCompletion bizProcessCompletion) throws NoSuchFieldException, IllegalAccessException {
     public void export(HttpServletResponse response, BizProcessCompletion bizProcessCompletion) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizProcessCompletion);
         setTenantId(bizProcessCompletion);
@@ -79,6 +81,7 @@ public class BizProcessCompletionController extends BaseController {
      * 获取企业租户详细信息
      * 获取企业租户详细信息
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:completion:query')")
 //    @PreAuthorize("@ss.hasPermi('business:completion:query')")
+    @Log(title = "工艺下发及时率查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizProcessCompletionService.getById(id));
         return success(bizProcessCompletionService.getById(id));
@@ -88,7 +91,7 @@ public class BizProcessCompletionController extends BaseController {
      * 新增企业租户
      * 新增企业租户
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:completion:add')")
 //    @PreAuthorize("@ss.hasPermi('business:completion:add')")
-    @Log(title = "企业租户", businessType = BusinessType.INSERT)
+    @Log(title = "工艺下发及时率新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizProcessCompletion bizProcessCompletion) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult add(@RequestBody BizProcessCompletion bizProcessCompletion) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizProcessCompletion);
         setTenantId(bizProcessCompletion);
@@ -99,7 +102,7 @@ public class BizProcessCompletionController extends BaseController {
      * 修改企业租户
      * 修改企业租户
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:completion:edit')")
 //    @PreAuthorize("@ss.hasPermi('business:completion:edit')")
-    @Log(title = "企业租户", businessType = BusinessType.UPDATE)
+    @Log(title = "工艺下发及时率修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizProcessCompletion bizProcessCompletion) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult edit(@RequestBody BizProcessCompletion bizProcessCompletion) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizProcessCompletion);
         setTenantId(bizProcessCompletion);
@@ -110,7 +113,7 @@ public class BizProcessCompletionController extends BaseController {
      * 删除企业租户
      * 删除企业租户
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:completion:remove')")
 //    @PreAuthorize("@ss.hasPermi('business:completion:remove')")
-    @Log(title = "企业租户", businessType = BusinessType.DELETE)
+    @Log(title = "工艺下发及时率删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {
     public AjaxResult remove(@PathVariable List<Long> ids) {
         return toAjax(bizProcessCompletionService.removeBatchByIds(ids));
         return toAjax(bizProcessCompletionService.removeBatchByIds(ids));

+ 6 - 4
src/main/java/cn/ezhizao/project/business/processErrorStatistics/controller/BizProcessDocumentsErrorStatisticsController.java

@@ -39,6 +39,7 @@ public class BizProcessDocumentsErrorStatisticsController extends BaseController
     /**
     /**
      * 查询工艺文件制作错误次数统计列表
      * 查询工艺文件制作错误次数统计列表
      */
      */
+    @Log(title = "工艺文件制作错误次数统计查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizProcessDocumentsErrorStatistics bizProcessDocumentsErrorStatistics) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizProcessDocumentsErrorStatistics bizProcessDocumentsErrorStatistics) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -52,7 +53,7 @@ public class BizProcessDocumentsErrorStatisticsController extends BaseController
      * 导出工艺文件制作错误次数统计列表
      * 导出工艺文件制作错误次数统计列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:ProcessErrorStatistics:export')")
     @PreAuthorize("@ss.hasPermi('business:ProcessErrorStatistics:export')")
-    @Log(title = "工艺文件制作错误次数统计", businessType = BusinessType.EXPORT)
+    @Log(title = "工艺文件制作错误次数统计导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizProcessDocumentsErrorStatistics bizProcessDocumentsErrorStatistics) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizProcessDocumentsErrorStatistics bizProcessDocumentsErrorStatistics) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -66,6 +67,7 @@ public class BizProcessDocumentsErrorStatisticsController extends BaseController
      * 获取工艺文件制作错误次数统计详细信息
      * 获取工艺文件制作错误次数统计详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:ProcessErrorStatistics:query')")
     @PreAuthorize("@ss.hasPermi('business:ProcessErrorStatistics:query')")
+    @Log(title = "工艺文件制作错误次数统计查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -75,7 +77,7 @@ public class BizProcessDocumentsErrorStatisticsController extends BaseController
     /**
     /**
      * 新增工艺文件制作错误次数统计
      * 新增工艺文件制作错误次数统计
      */
      */
-    @Log(title = "工艺文件制作错误次数统计", businessType = BusinessType.INSERT)
+    @Log(title = "工艺文件制作错误次数统计新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizProcessDocumentsErrorStatistics bizProcessDocumentsErrorStatistics) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizProcessDocumentsErrorStatistics bizProcessDocumentsErrorStatistics) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -86,7 +88,7 @@ public class BizProcessDocumentsErrorStatisticsController extends BaseController
     /**
     /**
      * 修改工艺文件制作错误次数统计
      * 修改工艺文件制作错误次数统计
      */
      */
-    @Log(title = "工艺文件制作错误次数统计", businessType = BusinessType.UPDATE)
+    @Log(title = "工艺文件制作错误次数统计修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizProcessDocumentsErrorStatistics bizProcessDocumentsErrorStatistics) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizProcessDocumentsErrorStatistics bizProcessDocumentsErrorStatistics) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -97,7 +99,7 @@ public class BizProcessDocumentsErrorStatisticsController extends BaseController
     /**
     /**
      * 删除工艺文件制作错误次数统计
      * 删除工艺文件制作错误次数统计
      */
      */
-    @Log(title = "工艺文件制作错误次数统计", businessType = BusinessType.DELETE)
+    @Log(title = "工艺文件制作错误次数统计删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 5 - 0
src/main/java/cn/ezhizao/project/business/product/controller/BizProductController.java

@@ -39,6 +39,7 @@ public class BizProductController extends BaseController {
      * 查询产品管理列表
      * 查询产品管理列表
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
+    @Log(title = "产品列表查询", businessType = BusinessType.SELECT)
     public TableDataInfo list(BizProduct bizProduct) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(BizProduct bizProduct) throws NoSuchFieldException, IllegalAccessException {
 //        final String tenantId = request.getHeader("tenantId");
 //        final String tenantId = request.getHeader("tenantId");
 //        bizProduct.setTenantId(Long.valueOf(tenantId));
 //        bizProduct.setTenantId(Long.valueOf(tenantId));
@@ -47,6 +48,7 @@ public class BizProductController extends BaseController {
         return getDataTable(list);
         return getDataTable(list);
     }
     }
     @GetMapping("/getTotal")
     @GetMapping("/getTotal")
+    @Log(title = "产品列表查询总数", businessType = BusinessType.SELECT)
     public AjaxResult getTotal()
     public AjaxResult getTotal()
     {
     {
         BizProduct item = new BizProduct();
         BizProduct item = new BizProduct();
@@ -58,6 +60,7 @@ public class BizProductController extends BaseController {
      * 查询产品管理列表
      * 查询产品管理列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:product:list')")
     @PreAuthorize("@ss.hasPermi('business:product:list')")
+    @Log(title = "查询工艺信息", businessType = BusinessType.SELECT)
     @GetMapping("/getTechnological")
     @GetMapping("/getTechnological")
     public AjaxResult list(BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult list(BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
 //        final String tenantId = request.getHeader("tenantId");
 //        final String tenantId = request.getHeader("tenantId");
@@ -66,6 +69,7 @@ public class BizProductController extends BaseController {
         return success(list);
         return success(list);
     }
     }
     @GetMapping("/getProductsForSupplier")
     @GetMapping("/getProductsForSupplier")
+    @Log(title = "外协商能配置的产品查询", businessType = BusinessType.SELECT)
     public TableDataInfo getProductsForSupplier(BizProduct bizProduct) {
     public TableDataInfo getProductsForSupplier(BizProduct bizProduct) {
 //        final String tenantId = request.getHeader("tenantId");
 //        final String tenantId = request.getHeader("tenantId");
 //        bizProduct.setTenantId(Long.valueOf(tenantId));
 //        bizProduct.setTenantId(Long.valueOf(tenantId));
@@ -74,6 +78,7 @@ public class BizProductController extends BaseController {
         return getDataTable(list);
         return getDataTable(list);
     }
     }
     @GetMapping("/getProductsForOutsource")
     @GetMapping("/getProductsForOutsource")
+    @Log(title = "外协商配置的产品查询", businessType = BusinessType.SELECT)
     public TableDataInfo getProductsForOutsource(BizProduct bizProduct) {
     public TableDataInfo getProductsForOutsource(BizProduct bizProduct) {
         final String tenantId = request.getHeader("tenantId");
         final String tenantId = request.getHeader("tenantId");
         bizProduct.setTenantId(Long.valueOf(tenantId));
         bizProduct.setTenantId(Long.valueOf(tenantId));

+ 6 - 4
src/main/java/cn/ezhizao/project/business/publicSeal/controller/BizPublicSealController.java

@@ -39,6 +39,7 @@ public class BizPublicSealController extends BaseController
     /**
     /**
      * 查询电子图纸列表
      * 查询电子图纸列表
      */
      */
+    @Log(title = "公共章查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizPublicSeal bizPublicSeal) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizPublicSeal bizPublicSeal) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -51,7 +52,7 @@ public class BizPublicSealController extends BaseController
     /**
     /**
      * 导出电子图纸列表
      * 导出电子图纸列表
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.EXPORT)
+    @Log(title = "公共章导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizPublicSeal bizPublicSeal) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizPublicSeal bizPublicSeal) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -64,6 +65,7 @@ public class BizPublicSealController extends BaseController
     /**
     /**
      * 获取电子图纸详细信息
      * 获取电子图纸详细信息
      */
      */
+    @Log(title = "公共章查询详细信息", businessType = BusinessType.EXPORT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -73,7 +75,7 @@ public class BizPublicSealController extends BaseController
     /**
     /**
      * 新增电子图纸
      * 新增电子图纸
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.INSERT)
+    @Log(title = "公共章新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizPublicSeal bizPublicSeal) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizPublicSeal bizPublicSeal) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -84,7 +86,7 @@ public class BizPublicSealController extends BaseController
     /**
     /**
      * 修改电子图纸
      * 修改电子图纸
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.UPDATE)
+    @Log(title = "公共章修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizPublicSeal bizPublicSeal) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizPublicSeal bizPublicSeal) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -95,7 +97,7 @@ public class BizPublicSealController extends BaseController
     /**
     /**
      * 删除电子图纸
      * 删除电子图纸
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.DELETE)
+    @Log(title = "公共章删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 6 - 4
src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupController.java

@@ -43,6 +43,7 @@ public class BizProductionResourceGroupController extends BaseController {
     /**
     /**
      * 查询工段资源组列表
      * 查询工段资源组列表
      */
      */
+    @Log(title = "工段资源组查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
 
 
@@ -54,7 +55,7 @@ public class BizProductionResourceGroupController extends BaseController {
     /**
     /**
      * 导出工段资源组列表
      * 导出工段资源组列表
      */
      */
-    @Log(title = "工段资源组", businessType = BusinessType.EXPORT)
+    @Log(title = "工段资源组导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
     public void export(HttpServletResponse response, BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroup> list = bizProductionResourceGroupService.getList(bizProductionResourceGroup);
         List<BizProductionResourceGroup> list = bizProductionResourceGroupService.getList(bizProductionResourceGroup);
@@ -65,6 +66,7 @@ public class BizProductionResourceGroupController extends BaseController {
     /**
     /**
      * 获取工段资源组详细信息
      * 获取工段资源组详细信息
      */
      */
+    @Log(title = "工段资源组查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         BizProductionResourceGroup bizProductionResourceGroup = new BizProductionResourceGroup();
         BizProductionResourceGroup bizProductionResourceGroup = new BizProductionResourceGroup();
@@ -78,7 +80,7 @@ public class BizProductionResourceGroupController extends BaseController {
     /**
     /**
      * 新增工段资源组
      * 新增工段资源组
      */
      */
-    @Log(title = "工段资源组", businessType = BusinessType.INSERT)
+    @Log(title = "工段资源组新增", businessType = BusinessType.INSERT)
     @Transactional
     @Transactional
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult add(@RequestBody BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
@@ -131,7 +133,7 @@ public class BizProductionResourceGroupController extends BaseController {
     /**
     /**
      * 修改工段资源组
      * 修改工段资源组
      */
      */
-    @Log(title = "工段资源组", businessType = BusinessType.UPDATE)
+    @Log(title = "工段资源组修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult edit(@RequestBody BizProductionResourceGroup bizProductionResourceGroup) throws NoSuchFieldException, IllegalAccessException {
         return toAjax(bizProductionResourceGroupService.updateById(bizProductionResourceGroup));
         return toAjax(bizProductionResourceGroupService.updateById(bizProductionResourceGroup));
@@ -140,7 +142,7 @@ public class BizProductionResourceGroupController extends BaseController {
     /**
     /**
      * 删除工段资源组
      * 删除工段资源组
      */
      */
-    @Log(title = "工段资源组", businessType = BusinessType.DELETE)
+    @Log(title = "工段资源组删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @DeleteMapping("/{ids}")
     @Transactional
     @Transactional
     public AjaxResult remove(@PathVariable Long ids) {
     public AjaxResult remove(@PathVariable Long ids) {

+ 8 - 5
src/main/java/cn/ezhizao/project/business/resourceGroup/controller/BizProductionResourceGroupDetailController.java

@@ -33,6 +33,7 @@ public class BizProductionResourceGroupDetailController extends BaseController {
     /**
     /**
      * 查询工段资源组明细列表
      * 查询工段资源组明细列表
      */
      */
+    @Log(title = "工段资源组明细查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getList(bizProductionResourceGroupDetail);
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getList(bizProductionResourceGroupDetail);
@@ -42,6 +43,7 @@ public class BizProductionResourceGroupDetailController extends BaseController {
     /**
     /**
      * 查询工段资源组明细列表
      * 查询工段资源组明细列表
      */
      */
+    @Log(title = "工段资源组明细查询设备", businessType = BusinessType.SELECT)
     @GetMapping("/equipmentList")
     @GetMapping("/equipmentList")
     public TableDataInfo EquipmentList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo EquipmentList(BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getEquipmentList(bizProductionResourceGroupDetail);
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getEquipmentList(bizProductionResourceGroupDetail);
@@ -51,7 +53,7 @@ public class BizProductionResourceGroupDetailController extends BaseController {
     /**
     /**
      * 导出工段资源组明细列表
      * 导出工段资源组明细列表
      */
      */
-    @Log(title = "工段资源组明细", businessType = BusinessType.EXPORT)
+    @Log(title = "工段资源组明细导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
     public void export(HttpServletResponse response, BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getList(bizProductionResourceGroupDetail);
         List<BizProductionResourceGroupDetail> list = bizProductionResourceGroupDetailService.getList(bizProductionResourceGroupDetail);
@@ -62,6 +64,7 @@ public class BizProductionResourceGroupDetailController extends BaseController {
     /**
     /**
      * 获取工段资源组明细详细信息
      * 获取工段资源组明细详细信息
      */
      */
+    @Log(title = "工段资源组明细查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizProductionResourceGroupDetailService.getById(id));
         return success(bizProductionResourceGroupDetailService.getById(id));
@@ -70,7 +73,7 @@ public class BizProductionResourceGroupDetailController extends BaseController {
     /**
     /**
      * 新增工段资源组明细
      * 新增工段资源组明细
      */
      */
-    @Log(title = "工段资源组明细", businessType = BusinessType.INSERT)
+    @Log(title = "工段资源组明细新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult add(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
 
 
@@ -80,7 +83,7 @@ public class BizProductionResourceGroupDetailController extends BaseController {
     /**
     /**
      * 修改工段资源组明细
      * 修改工段资源组明细
      */
      */
-    @Log(title = "工段资源组明细", businessType = BusinessType.UPDATE)
+    @Log(title = "工段资源组明细修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult edit(@RequestBody BizProductionResourceGroupDetail bizProductionResourceGroupDetail) throws NoSuchFieldException, IllegalAccessException {
 
 
@@ -90,7 +93,7 @@ public class BizProductionResourceGroupDetailController extends BaseController {
     /**
     /**
      * 删除工段资源组明细
      * 删除工段资源组明细
      */
      */
-    @Log(title = "工段资源组明细", businessType = BusinessType.DELETE)
+    @Log(title = "工段资源组明细删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long ids) {
     public AjaxResult remove(@PathVariable Long ids) {
         return toAjax(bizProductionResourceGroupDetailService.removeById(ids));
         return toAjax(bizProductionResourceGroupDetailService.removeById(ids));
@@ -99,7 +102,7 @@ public class BizProductionResourceGroupDetailController extends BaseController {
     /**
     /**
      * 删除工段资源组(当删除部门人员时,执行删除操作)
      * 删除工段资源组(当删除部门人员时,执行删除操作)
      */
      */
-    @Log(title = "工段资源组", businessType = BusinessType.DELETE)
+    @Log(title = "工段删除人员,删除资源组明细当前的人员", businessType = BusinessType.DELETE)
     @PostMapping("/deleteGroupDetail")
     @PostMapping("/deleteGroupDetail")
     public AjaxResult deleteGroupDetail(@RequestBody List<SysDeptUser> deptUserList) {
     public AjaxResult deleteGroupDetail(@RequestBody List<SysDeptUser> deptUserList) {
         QueryWrapper<BizProductionResourceGroupDetail> queryWrapper = new QueryWrapper<>();
         QueryWrapper<BizProductionResourceGroupDetail> queryWrapper = new QueryWrapper<>();

+ 32 - 5
src/main/java/cn/ezhizao/project/business/supplier/controller/BizSupplierController.java

@@ -50,6 +50,7 @@ public class BizSupplierController extends BaseController {
      * 查询外协商列表
      * 查询外协商列表
      */
      */
     //@PreAuthorize("@ss.hasPermi('business:supplier:list')")
     //@PreAuthorize("@ss.hasPermi('business:supplier:list')")
+    @Log(title = "外协商单位查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizSupplier data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public TableDataInfo list(BizSupplier data) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -65,6 +66,7 @@ public class BizSupplierController extends BaseController {
      * 获取外协商详细信息
      * 获取外协商详细信息
      */
      */
     //@PreAuthorize("@ss.hasPermi('business:supplier:query')")
     //@PreAuthorize("@ss.hasPermi('business:supplier:query')")
+    @Log(title = "外协商单位查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/getInfo/{id}")
     @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(iBizSupplierService.getById(id));
         return success(iBizSupplierService.getById(id));
@@ -74,7 +76,7 @@ public class BizSupplierController extends BaseController {
      * 新增外协商
      * 新增外协商
      */
      */
     //@PreAuthorize("@ss.hasPermi('business:supplier:add, business:supplier:edit')")
     //@PreAuthorize("@ss.hasPermi('business:supplier:add, business:supplier:edit')")
-    @Log(title = "外协商", businessType = BusinessType.INSERT)
+    @Log(title = "外协商单位保存", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     @PostMapping(value = "/save")
     public AjaxResult save(@RequestBody BizSupplier bizSupplier) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public AjaxResult save(@RequestBody BizSupplier bizSupplier) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
         final String tenantId = request.getHeader("tenantId");
         final String tenantId = request.getHeader("tenantId");
@@ -125,7 +127,7 @@ public class BizSupplierController extends BaseController {
      * 新增外协商联系人
      * 新增外协商联系人
      */
      */
     //@PreAuthorize("@ss.hasPermi('business:supplier:add, business:supplier:edit')")
     //@PreAuthorize("@ss.hasPermi('business:supplier:add, business:supplier:edit')")
-    @Log(title = "外协商联系人", businessType = BusinessType.INSERT)
+    @Log(title = "外协商联系人保存", businessType = BusinessType.INSERT)
     @PostMapping(value = "/saveSupplierContacts")
     @PostMapping(value = "/saveSupplierContacts")
     public AjaxResult saveSupplierContacts(@RequestBody List<BizSupplierContacts> bizSupplierContacts) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public AjaxResult saveSupplierContacts(@RequestBody List<BizSupplierContacts> bizSupplierContacts) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
         List<BizSupplierContacts> oldList = iBizSupplierContactsService.query().eq("supplier_id", bizSupplierContacts.get(0).getSupplierId()).list();
         List<BizSupplierContacts> oldList = iBizSupplierContactsService.query().eq("supplier_id", bizSupplierContacts.get(0).getSupplierId()).list();
@@ -135,6 +137,7 @@ public class BizSupplierController extends BaseController {
     /**
     /**
      * 查询外协商联系人
      * 查询外协商联系人
      */
      */
+    @Log(title = "外协商联系人查询", businessType = BusinessType.SELECT)
     @GetMapping(value = "/getSupplierContacts")
     @GetMapping(value = "/getSupplierContacts")
     public AjaxResult getSupplierContacts(BizSupplierContacts bizSupplierContacts) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
     public AjaxResult getSupplierContacts(BizSupplierContacts bizSupplierContacts) throws NoSuchFieldException, IllegalAccessException, JsonProcessingException {
         List<BizSupplierContacts> list = iBizSupplierContactsService.getList(bizSupplierContacts);
         List<BizSupplierContacts> list = iBizSupplierContactsService.getList(bizSupplierContacts);
@@ -145,7 +148,7 @@ public class BizSupplierController extends BaseController {
      * 删除外协商
      * 删除外协商
      */
      */
     //@PreAuthorize("@ss.hasPermi('business:supplier:remove')")
     //@PreAuthorize("@ss.hasPermi('business:supplier:remove')")
-    @Log(title = "外协商", businessType = BusinessType.DELETE)
+    @Log(title = "外协商单位删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
     @DeleteMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {
     public AjaxResult remove(@PathVariable List<Long> ids) {
         return toAjax(iBizSupplierService.removeBatchByIds(ids));
         return toAjax(iBizSupplierService.removeBatchByIds(ids));
@@ -156,18 +159,20 @@ public class BizSupplierController extends BaseController {
      * @param data 过滤条件
      * @param data 过滤条件
      * @return TableDataInfo
      * @return TableDataInfo
      */
      */
+    @Log(title = "外协商产品", businessType = BusinessType.SELECT)
     @GetMapping("/getSupplierProduct")
     @GetMapping("/getSupplierProduct")
     public TableDataInfo getSupplierProduct(BizSupplierProduct data) {
     public TableDataInfo getSupplierProduct(BizSupplierProduct data) {
         startPage();
         startPage();
         List<BizSupplierProduct> list = iBizSupplierProductService.getList(data);
         List<BizSupplierProduct> list = iBizSupplierProductService.getList(data);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
+    @Log(title = "外协商产品保存", businessType = BusinessType.INSERT)
     @PostMapping("/saveSupplierProduct")
     @PostMapping("/saveSupplierProduct")
     public AjaxResult saveSupplierProduct(@RequestBody List<BizSupplierProduct> data) {
     public AjaxResult saveSupplierProduct(@RequestBody List<BizSupplierProduct> data) {
         boolean bool = iBizSupplierProductService.saveOrUpdateBatch(data);
         boolean bool = iBizSupplierProductService.saveOrUpdateBatch(data);
         return bool ? success("操作成功!") : error("操作失败!");
         return bool ? success("操作成功!") : error("操作失败!");
     }
     }
-    @Log(title = "外协商", businessType = BusinessType.DELETE)
+    @Log(title = "外协商产品删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/removeSupplierProduct/{ids}")
     @DeleteMapping("/removeSupplierProduct/{ids}")
     public AjaxResult removeSupplierProduct(@PathVariable List<Long> ids) {
     public AjaxResult removeSupplierProduct(@PathVariable List<Long> ids) {
         return toAjax(iBizSupplierProductService.removeBatchByIds(ids));
         return toAjax(iBizSupplierProductService.removeBatchByIds(ids));
@@ -178,11 +183,13 @@ public class BizSupplierController extends BaseController {
      * @param data 过滤条件
      * @param data 过滤条件
      * @return AjaxResult
      * @return AjaxResult
      */
      */
+    @Log(title = "外协商产品工序查询", businessType = BusinessType.SELECT)
     @PostMapping("/getSupplierProductProcess")
     @PostMapping("/getSupplierProductProcess")
     public AjaxResult getSupplierProductProcess(@RequestBody BizSupplierProductProcess data) {
     public AjaxResult getSupplierProductProcess(@RequestBody BizSupplierProductProcess data) {
         List<BizSupplierProductProcess> list = iBizSupplierProductProcessService.getList(data);
         List<BizSupplierProductProcess> list = iBizSupplierProductProcessService.getList(data);
         return success(list);
         return success(list);
     }
     }
+    @Log(title = "外协商产品工序保存", businessType = BusinessType.INSERT)
     @PostMapping("/saveSupplierProductProcess")
     @PostMapping("/saveSupplierProductProcess")
     public AjaxResult saveSupplierProductProcess(@RequestBody List<BizSupplierProductProcess> data) {
     public AjaxResult saveSupplierProductProcess(@RequestBody List<BizSupplierProductProcess> data) {
         boolean bool = iBizSupplierProductProcessService.saveOrUpdateBatch(data);
         boolean bool = iBizSupplierProductProcessService.saveOrUpdateBatch(data);
@@ -211,9 +218,26 @@ public class BizSupplierController extends BaseController {
         }
         }
         return bool ? success("操作成功!") : error("操作失败!");
         return bool ? success("操作成功!") : error("操作失败!");
     }
     }
-    @Log(title = "外协商", businessType = BusinessType.DELETE)
+    @Log(title = "外协商产品工序删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/removeSupplierProductProcess/{ids}")
     @DeleteMapping("/removeSupplierProductProcess/{ids}")
     public AjaxResult removeSupplierProductProcess(@PathVariable List<Long> ids) {
     public AjaxResult removeSupplierProductProcess(@PathVariable List<Long> ids) {
+        BizSupplierProductProcess supplierProductProcess = iBizSupplierProductProcessService.query().in("id", ids).one();
+        Long productId = supplierProductProcess.getProductId();
+        //对应产品的工序
+        List<BizOutsourceBalanceAccount> list = iBizOutsourceBalanceAccountService.query()
+                .eq("product_id", productId).eq("technological_process_id", supplierProductProcess.getTechnologicalProcessId())
+                .eq("supplier_id",supplierProductProcess.getSupplierId())
+                .eq("status",0)
+                .list();
+        List<BizOutsourceBalanceAccount> totalList = new ArrayList<>();
+        List<BizOutsourceBalanceAccount> currentProcessList = list.stream().filter(v1 -> v1.getTechnologicalProcessId().equals(supplierProductProcess.getTechnologicalProcessId()) && v1.getTechnologyVersion().equals(supplierProductProcess.getTechnologyVersion())&& v1.getProcessStepNumber().equals(supplierProductProcess.getProcessStepNumber())).collect(Collectors.toList());
+        if(!currentProcessList.isEmpty()){
+            currentProcessList.forEach(v1->{
+                v1.setProcessPrice(BigDecimal.valueOf(0));
+            });
+            totalList.addAll(currentProcessList);
+        }
+        iBizOutsourceBalanceAccountService.updateBatchById(totalList);
         return toAjax(iBizSupplierProductProcessService.removeBatchByIds(ids));
         return toAjax(iBizSupplierProductProcessService.removeBatchByIds(ids));
     }
     }
 
 
@@ -222,6 +246,7 @@ public class BizSupplierController extends BaseController {
      * @param supplierId 外协商id
      * @param supplierId 外协商id
      * @return BizSupplierUser
      * @return BizSupplierUser
      */
      */
+    @Log(title = "外协商管理员查询", businessType = BusinessType.DELETE)
     @GetMapping("/getAdminInfo/{supplierId}")
     @GetMapping("/getAdminInfo/{supplierId}")
     public AjaxResult getAdminInfo(@PathVariable Long supplierId) {
     public AjaxResult getAdminInfo(@PathVariable Long supplierId) {
         return success(iBizSupplierUserService.getAdminInfo(supplierId));
         return success(iBizSupplierUserService.getAdminInfo(supplierId));
@@ -232,6 +257,7 @@ public class BizSupplierController extends BaseController {
      * @param user 管理员信息
      * @param user 管理员信息
      * @return AjaxResult
      * @return AjaxResult
      */
      */
+    @Log(title = "外协商管理员保存", businessType = BusinessType.DELETE)
     @PostMapping("/saveAdmin")
     @PostMapping("/saveAdmin")
     public AjaxResult saveAdmin(@RequestBody BizSupplierUser user) {
     public AjaxResult saveAdmin(@RequestBody BizSupplierUser user) {
         if (user.getId() == null) {
         if (user.getId() == null) {
@@ -247,6 +273,7 @@ public class BizSupplierController extends BaseController {
      * @param user 管理员信息
      * @param user 管理员信息
      * @return AjaxResult
      * @return AjaxResult
      */
      */
+    @Log(title = "外协商管理员密码初始化", businessType = BusinessType.DELETE)
     @PostMapping("/initAdminPsw")
     @PostMapping("/initAdminPsw")
     public AjaxResult initAdminPsw(@RequestBody BizSupplierUser user) {
     public AjaxResult initAdminPsw(@RequestBody BizSupplierUser user) {
         user.setPassword(SecurityUtils.encryptPassword("123456"));
         user.setPassword(SecurityUtils.encryptPassword("123456"));

+ 6 - 3
src/main/java/cn/ezhizao/project/business/technologicalProcess/controller/BizTechnologicalProcessController.java

@@ -40,6 +40,7 @@ public class BizTechnologicalProcessController extends BaseController {
      * 查询工艺主表列表
      * 查询工艺主表列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:list')")
 //    @PreAuthorize("@ss.hasPermi('business:product:list')")
+    @Log(title = "标准工艺查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -48,6 +49,7 @@ public class BizTechnologicalProcessController extends BaseController {
         List<BizTechnologicalProcess> list = bizTechnologicalProcessService.getList(bizTechnologicalProcess);
         List<BizTechnologicalProcess> list = bizTechnologicalProcessService.getList(bizTechnologicalProcess);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
+    @Log(title = "产品下标准工艺查询", businessType = BusinessType.SELECT)
     @PostMapping("/getTechnologicalForSupplier")
     @PostMapping("/getTechnologicalForSupplier")
     public AjaxResult getTechnologicalForSupplier(@RequestBody Map<String, Object> data) {
     public AjaxResult getTechnologicalForSupplier(@RequestBody Map<String, Object> data) {
         Long productId = Long.parseLong(data.get("productId").toString());
         Long productId = Long.parseLong(data.get("productId").toString());
@@ -61,7 +63,7 @@ public class BizTechnologicalProcessController extends BaseController {
      * 导出工艺主表列表
      * 导出工艺主表列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:export')")
 //    @PreAuthorize("@ss.hasPermi('business:product:export')")
-    @Log(title = "工艺主表", businessType = BusinessType.EXPORT)
+    @Log(title = "标准工艺导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
     public void export(HttpServletResponse response, BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizTechnologicalProcess);
         setTenantId(bizTechnologicalProcess);
@@ -74,6 +76,7 @@ public class BizTechnologicalProcessController extends BaseController {
      * 获取工艺主表详细信息
      * 获取工艺主表详细信息
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:query')")
 //    @PreAuthorize("@ss.hasPermi('business:product:query')")
+    @Log(title = "标准工艺查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizTechnologicalProcessService.getById(id));
         return success(bizTechnologicalProcessService.getById(id));
@@ -83,7 +86,7 @@ public class BizTechnologicalProcessController extends BaseController {
      * 新增工艺主表
      * 新增工艺主表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:add, business:product:edit')")
 //    @PreAuthorize("@ss.hasPermi('business:product:add, business:product:edit')")
-    @Log(title = "工艺主表", businessType = BusinessType.INSERT)
+    @Log(title = "标准工艺保存", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     @PostMapping("/save")
     public AjaxResult save(@RequestBody BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult save(@RequestBody BizTechnologicalProcess bizTechnologicalProcess) throws NoSuchFieldException, IllegalAccessException {
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -95,7 +98,7 @@ public class BizTechnologicalProcessController extends BaseController {
      * 删除工艺主表
      * 删除工艺主表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:remove')")
 //    @PreAuthorize("@ss.hasPermi('business:product:remove')")
-    @Log(title = "工艺主表", businessType = BusinessType.DELETE)
+    @Log(title = "标准工艺删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids) {
     public AjaxResult remove(@PathVariable List<Long> ids) {
         List<BizTechnologicalProcessDetail> technologicalProcessId = bizTechnologicalProcessDetailService.query().in("technological_process_id", ids).list();
         List<BizTechnologicalProcessDetail> technologicalProcessId = bizTechnologicalProcessDetailService.query().in("technological_process_id", ids).list();

+ 9 - 6
src/main/java/cn/ezhizao/project/business/technologicalProcessDetail/controller/BizTechnologicalProcessDetailController.java

@@ -39,6 +39,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
      * 查询工艺工序中间表列表
      * 查询工艺工序中间表列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:list')")
 //    @PreAuthorize("@ss.hasPermi('business:product:list')")
+    @Log(title = "标准工艺下的工序查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizTechnologicalProcessDetail bizTechnologicalProcessDetail) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizTechnologicalProcessDetail bizTechnologicalProcessDetail) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -55,12 +56,13 @@ public class BizTechnologicalProcessDetailController extends BaseController
     item1.addAll(item2);
     item1.addAll(item2);
         return getDataTable(item1);
         return getDataTable(item1);
     }
     }
-
+    @Log(title = "标准工艺id查询工序", businessType = BusinessType.SELECT)
     @GetMapping("/getTechnologicalProcessDetails")
     @GetMapping("/getTechnologicalProcessDetails")
     public AjaxResult getTechnologicalProcessDetails(BizTechnologicalProcessDetail bizTechnologicalProcess) {
     public AjaxResult getTechnologicalProcessDetails(BizTechnologicalProcessDetail bizTechnologicalProcess) {
         List<BizTechnologicalProcessDetail> list = bizTechnologicalProcessDetailService.getTechnologicalProcessDetails(bizTechnologicalProcess);
         List<BizTechnologicalProcessDetail> list = bizTechnologicalProcessDetailService.getTechnologicalProcessDetails(bizTechnologicalProcess);
         return success(list);
         return success(list);
     }
     }
+    @Log(title = "外协商选择工序查询", businessType = BusinessType.SELECT)
     @PostMapping("/getProcessesForSupplier")
     @PostMapping("/getProcessesForSupplier")
     public AjaxResult getProcessesForSupplier(@RequestBody Map<String, Object> data) {
     public AjaxResult getProcessesForSupplier(@RequestBody Map<String, Object> data) {
         Long productId = Long.parseLong(data.get("productId").toString());
         Long productId = Long.parseLong(data.get("productId").toString());
@@ -87,7 +89,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
      * 导出工艺工序中间表列表
      * 导出工艺工序中间表列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:export')")
 //    @PreAuthorize("@ss.hasPermi('business:product:export')")
-    @Log(title = "工艺工序中间表", businessType = BusinessType.EXPORT)
+    @Log(title = "工艺工序导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizTechnologicalProcessDetail bizTechnologicalProcessDetail) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizTechnologicalProcessDetail bizTechnologicalProcessDetail) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -101,6 +103,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
      * 获取工艺工序中间表详细信息
      * 获取工艺工序中间表详细信息
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:query')")
 //    @PreAuthorize("@ss.hasPermi('business:product:query')")
+    @Log(title = "标准工艺下的工序查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -111,7 +114,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
      * 新增工艺工序中间表
      * 新增工艺工序中间表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:add')")
 //    @PreAuthorize("@ss.hasPermi('business:product:add')")
-    @Log(title = "工艺工序中间表", businessType = BusinessType.INSERT)
+    @Log(title = "标准工艺下工序保存", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     @PostMapping("/save")
     public AjaxResult save(@RequestBody List<BizTechnologicalProcessDetail> bizTechnologicalProcessDetail)
     public AjaxResult save(@RequestBody List<BizTechnologicalProcessDetail> bizTechnologicalProcessDetail)
     {
     {
@@ -128,7 +131,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
      * 新增工艺工序中间表单条操作
      * 新增工艺工序中间表单条操作
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:add')")
 //    @PreAuthorize("@ss.hasPermi('business:product:add')")
-    @Log(title = "工艺工序中间表", businessType = BusinessType.INSERT)
+    @Log(title = "标准工艺下工序单条保存", businessType = BusinessType.INSERT)
     @PostMapping("/singleSave")
     @PostMapping("/singleSave")
     public AjaxResult singleSave(@RequestBody BizTechnologicalProcessDetail bizTechnologicalProcessDetail)
     public AjaxResult singleSave(@RequestBody BizTechnologicalProcessDetail bizTechnologicalProcessDetail)
     {
     {
@@ -141,7 +144,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
      * 修改工艺工序中间表
      * 修改工艺工序中间表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:edit')")
 //    @PreAuthorize("@ss.hasPermi('business:product:edit')")
-    @Log(title = "工艺工序中间表", businessType = BusinessType.UPDATE)
+    @Log(title = "标准工艺下工序修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetail bizTechnologicalProcessDetail) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetail bizTechnologicalProcessDetail) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -154,7 +157,7 @@ public class BizTechnologicalProcessDetailController extends BaseController
      * 删除工艺工序中间表
      * 删除工艺工序中间表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:product:remove')")
 //    @PreAuthorize("@ss.hasPermi('business:product:remove')")
-    @Log(title = "工艺工序中间表", businessType = BusinessType.DELETE)
+    @Log(title = "标准工艺下工序删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 16 - 11
src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -73,7 +73,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     private IBizTechnologicalProcessDetailDrawingUserService bizTechnologicalProcessDetailDrawingUserService;
     private IBizTechnologicalProcessDetailDrawingUserService bizTechnologicalProcessDetailDrawingUserService;
 
 
 
 
-    @Log(title = "电子图纸", businessType = BusinessType.EXPORT)
+    @Log(title = "电子图纸导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void exportDrawing(HttpServletResponse response){
     public void exportDrawing(HttpServletResponse response){
 
 
@@ -94,7 +94,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         util.exportExcel(response, list, "电子图纸数据");
         util.exportExcel(response, list, "电子图纸数据");
     }
     }
 
 
-    @Log(title = "图纸导入", businessType = BusinessType.IMPORT)
+    @Log(title = "电子图纸导入", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('business:workpiece:import')")
     @PreAuthorize("@ss.hasPermi('business:workpiece:import')")
     @Transactional
     @Transactional
     @PostMapping("/importData")
     @PostMapping("/importData")
@@ -226,6 +226,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     /**
     /**
      * 查询电子图纸列表
      * 查询电子图纸列表
      */
      */
+    @Log(title = "电子图纸查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -238,6 +239,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     /**
     /**
      * 查询电子图纸列表
      * 查询电子图纸列表
      */
      */
+    @Log(title = "电子图纸查询", businessType = BusinessType.SELECT)
     @GetMapping("/drawingList")
     @GetMapping("/drawingList")
     public TableDataInfo drawingList(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo drawingList(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -250,6 +252,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     /**
     /**
      * 查询电子图纸列表
      * 查询电子图纸列表
      */
      */
+    @Log(title = "电子图纸条件查询", businessType = BusinessType.SELECT)
     @GetMapping("/byName")
     @GetMapping("/byName")
     public AjaxResult byName(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult byName(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -267,6 +270,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     /**
     /**
      * 根据文件名查询列表
      * 根据文件名查询列表
      */
      */
+    @Log(title = "电子图纸根据文件名查询", businessType = BusinessType.SELECT)
     @GetMapping("/getListByName")
     @GetMapping("/getListByName")
     public AjaxResult getListByName(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult getListByName(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -300,12 +304,13 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
      * 获取电子图纸详细信息
      * 获取电子图纸详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:drawing:query')")
     @PreAuthorize("@ss.hasPermi('business:drawing:query')")
+    @Log(title = "电子图纸查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
         return success(bizTechnologicalProcessDetailDrawingService.getById(id));
         return success(bizTechnologicalProcessDetailDrawingService.getById(id));
     }
     }
-
+    @Log(title = "产品电子图纸查询", businessType = BusinessType.SELECT)
     @GetMapping(value="/getProcuctDrawing")
     @GetMapping(value="/getProcuctDrawing")
     public AjaxResult getProcuctDrawing(){
     public AjaxResult getProcuctDrawing(){
         return success(bizTechnologicalProcessDetailDrawingService.getProcuctDrawing());
         return success(bizTechnologicalProcessDetailDrawingService.getProcuctDrawing());
@@ -314,7 +319,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     /**
     /**
      * 新增电子图纸会签
      * 新增电子图纸会签
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.INSERT)
+    @Log(title = "电子图纸保存", businessType = BusinessType.INSERT)
     @PostMapping("/save")
     @PostMapping("/save")
 
 
     public AjaxResult save(@RequestBody List<BizTechnologicalProcessDetailDrawing> bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException, COSVisitorException, DocumentException, IOException {
     public AjaxResult save(@RequestBody List<BizTechnologicalProcessDetailDrawing> bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException, COSVisitorException, DocumentException, IOException {
@@ -335,14 +340,14 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     /**
     /**
      * 电子图纸作废
      * 电子图纸作废
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.UPDATE)
+    @Log(title = "电子图纸作废", businessType = BusinessType.UPDATE)
     @PutMapping("/drawingNG")
     @PutMapping("/drawingNG")
     @Transactional
     @Transactional
     public AjaxResult drawingNG(@RequestBody List<BizTechnologicalProcessDetailDrawing> processDetailDrawing) throws NoSuchFieldException, IllegalAccessException, IOException {
     public AjaxResult drawingNG(@RequestBody List<BizTechnologicalProcessDetailDrawing> processDetailDrawing) throws NoSuchFieldException, IllegalAccessException, IOException {
        return success( bizTechnologicalProcessDetailDrawingService.drawingNG(processDetailDrawing,SecurityUtils.getLoginUser().getUser().getUserName(),SecurityUtils.getLoginUser().getUser().getNickName()));
        return success( bizTechnologicalProcessDetailDrawingService.drawingNG(processDetailDrawing,SecurityUtils.getLoginUser().getUser().getUserName(),SecurityUtils.getLoginUser().getUser().getNickName()));
     }
     }
 
 
-    @Log(title = "电子图纸", businessType = BusinessType.UPDATE)
+    @Log(title = "电子图纸作废", businessType = BusinessType.UPDATE)
     @PutMapping("/drawingRemove")
     @PutMapping("/drawingRemove")
     @Transactional
     @Transactional
     public AjaxResult drawingRemove(@RequestBody List<BizTechnologicalProcessDetailDrawing> processDetailDrawing) throws NoSuchFieldException, IllegalAccessException, IOException, DocumentException {
     public AjaxResult drawingRemove(@RequestBody List<BizTechnologicalProcessDetailDrawing> processDetailDrawing) throws NoSuchFieldException, IllegalAccessException, IOException, DocumentException {
@@ -360,7 +365,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     /**
     /**
      * 电子图纸替换
      * 电子图纸替换
      */
      */
-    @Log(title = "电子图纸", businessType = BusinessType.UPDATE)
+    @Log(title = "电子图纸替换", businessType = BusinessType.UPDATE)
     @PutMapping("/replaceDrawing")
     @PutMapping("/replaceDrawing")
     @Transactional
     @Transactional
     public AjaxResult replace(@RequestBody BizTechnologicalProcessDetailDrawing processDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult replace(@RequestBody BizTechnologicalProcessDetailDrawing processDetailDrawing) throws NoSuchFieldException, IllegalAccessException
@@ -386,7 +391,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
 
 
 
 
 
 
-    @Log(title = "电子图纸", businessType = BusinessType.UPDATE)
+    @Log(title = "电子图纸替换", businessType = BusinessType.UPDATE)
     @PutMapping("/replace")
     @PutMapping("/replace")
     @Transactional
     @Transactional
     public AjaxResult replaceDrawing(@RequestBody BizTechnologicalProcessDetailDrawing processDetailDrawing) throws NoSuchFieldException, IllegalAccessException, COSVisitorException, DocumentException, IOException {
     public AjaxResult replaceDrawing(@RequestBody BizTechnologicalProcessDetailDrawing processDetailDrawing) throws NoSuchFieldException, IllegalAccessException, COSVisitorException, DocumentException, IOException {
@@ -403,7 +408,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
      * 新增电子图纸
      * 新增电子图纸
      */
      */
     @PreAuthorize("@ss.hasPermi('business:drawing:add')")
     @PreAuthorize("@ss.hasPermi('business:drawing:add')")
-    @Log(title = "电子图纸", businessType = BusinessType.INSERT)
+    @Log(title = "电子图纸新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     @Transactional
     @Transactional
     public AjaxResult add(@RequestBody BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
@@ -470,7 +475,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
      * 覆盖电子图纸
      * 覆盖电子图纸
      */
      */
     @PreAuthorize("@ss.hasPermi('business:drawing:edit')")
     @PreAuthorize("@ss.hasPermi('business:drawing:edit')")
-    @Log(title = "电子图纸", businessType = BusinessType.UPDATE)
+    @Log(title = "电子图纸修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     @Transactional
     @Transactional
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetailDrawing processDetailDrawing) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetailDrawing processDetailDrawing) throws NoSuchFieldException, IllegalAccessException
@@ -543,7 +548,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
      * 删除电子图纸
      * 删除电子图纸
      */
      */
     @PreAuthorize("@ss.hasPermi('business:drawing:remove')")
     @PreAuthorize("@ss.hasPermi('business:drawing:remove')")
-    @Log(title = "电子图纸", businessType = BusinessType.DELETE)
+    @Log(title = "电子图纸删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     @Transactional
     @Transactional
     public AjaxResult remove(@PathVariable Long ids)
     public AjaxResult remove(@PathVariable Long ids)

+ 6 - 4
src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawingRecords/controller/BizTechnologicalProcessDetailDrawingRecordsController.java

@@ -39,6 +39,7 @@ public class BizTechnologicalProcessDetailDrawingRecordsController extends BaseC
      * 查询电子图纸操作记录列表
      * 查询电子图纸操作记录列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:records:list')")
 //    @PreAuthorize("@ss.hasPermi('business:records:list')")
+    @Log(title = "电子图纸操作记录查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizTechnologicalProcessDetailDrawingRecords bizTechnologicalProcessDetailDrawingRecords) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizTechnologicalProcessDetailDrawingRecords bizTechnologicalProcessDetailDrawingRecords) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -52,7 +53,7 @@ public class BizTechnologicalProcessDetailDrawingRecordsController extends BaseC
      * 导出电子图纸操作记录列表
      * 导出电子图纸操作记录列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:records:export')")
 //    @PreAuthorize("@ss.hasPermi('business:records:export')")
-    @Log(title = "电子图纸操作记录", businessType = BusinessType.EXPORT)
+    @Log(title = "电子图纸操作记录导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizTechnologicalProcessDetailDrawingRecords bizTechnologicalProcessDetailDrawingRecords) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizTechnologicalProcessDetailDrawingRecords bizTechnologicalProcessDetailDrawingRecords) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -66,6 +67,7 @@ public class BizTechnologicalProcessDetailDrawingRecordsController extends BaseC
      * 获取电子图纸操作记录详细信息
      * 获取电子图纸操作记录详细信息
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:records:query')")
 //    @PreAuthorize("@ss.hasPermi('business:records:query')")
+    @Log(title = "电子图纸操作记录查询详细信息", businessType = BusinessType.EXPORT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -76,7 +78,7 @@ public class BizTechnologicalProcessDetailDrawingRecordsController extends BaseC
      * 新增电子图纸操作记录
      * 新增电子图纸操作记录
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:records:add')")
 //    @PreAuthorize("@ss.hasPermi('business:records:add')")
-    @Log(title = "电子图纸操作记录", businessType = BusinessType.INSERT)
+    @Log(title = "电子图纸操作记录新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizTechnologicalProcessDetailDrawingRecords bizTechnologicalProcessDetailDrawingRecords) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizTechnologicalProcessDetailDrawingRecords bizTechnologicalProcessDetailDrawingRecords) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -88,7 +90,7 @@ public class BizTechnologicalProcessDetailDrawingRecordsController extends BaseC
      * 修改电子图纸操作记录
      * 修改电子图纸操作记录
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:records:edit')")
 //    @PreAuthorize("@ss.hasPermi('business:records:edit')")
-    @Log(title = "电子图纸操作记录", businessType = BusinessType.UPDATE)
+    @Log(title = "电子图纸操作记录修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetailDrawingRecords bizTechnologicalProcessDetailDrawingRecords) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetailDrawingRecords bizTechnologicalProcessDetailDrawingRecords) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -100,7 +102,7 @@ public class BizTechnologicalProcessDetailDrawingRecordsController extends BaseC
      * 删除电子图纸操作记录
      * 删除电子图纸操作记录
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:records:remove')")
 //    @PreAuthorize("@ss.hasPermi('business:records:remove')")
-    @Log(title = "电子图纸操作记录", businessType = BusinessType.DELETE)
+    @Log(title = "电子图纸操作记录删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 6 - 4
src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawingUser/controller/BizTechnologicalProcessDetailDrawingUserController.java

@@ -39,6 +39,7 @@ public class BizTechnologicalProcessDetailDrawingUserController extends BaseCont
      * 查询电子图纸操作人员列表
      * 查询电子图纸操作人员列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:user:list')")
     @PreAuthorize("@ss.hasPermi('business:user:list')")
+    @Log(title = "电子图纸操作人员查询", businessType = BusinessType.EXPORT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizTechnologicalProcessDetailDrawingUser bizTechnologicalProcessDetailDrawingUser) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizTechnologicalProcessDetailDrawingUser bizTechnologicalProcessDetailDrawingUser) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -52,7 +53,7 @@ public class BizTechnologicalProcessDetailDrawingUserController extends BaseCont
      * 导出电子图纸操作人员列表
      * 导出电子图纸操作人员列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:user:export')")
     @PreAuthorize("@ss.hasPermi('business:user:export')")
-    @Log(title = "电子图纸操作人员", businessType = BusinessType.EXPORT)
+    @Log(title = "电子图纸操作人员导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizTechnologicalProcessDetailDrawingUser bizTechnologicalProcessDetailDrawingUser) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizTechnologicalProcessDetailDrawingUser bizTechnologicalProcessDetailDrawingUser) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -66,6 +67,7 @@ public class BizTechnologicalProcessDetailDrawingUserController extends BaseCont
      * 获取电子图纸操作人员详细信息
      * 获取电子图纸操作人员详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:user:query')")
     @PreAuthorize("@ss.hasPermi('business:user:query')")
+    @Log(title = "电子图纸操作人员查询详细信息", businessType = BusinessType.EXPORT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -76,7 +78,7 @@ public class BizTechnologicalProcessDetailDrawingUserController extends BaseCont
      * 新增电子图纸操作人员
      * 新增电子图纸操作人员
      */
      */
     @PreAuthorize("@ss.hasPermi('business:user:add')")
     @PreAuthorize("@ss.hasPermi('business:user:add')")
-    @Log(title = "电子图纸操作人员", businessType = BusinessType.INSERT)
+    @Log(title = "电子图纸操作人员新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizTechnologicalProcessDetailDrawingUser bizTechnologicalProcessDetailDrawingUser) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizTechnologicalProcessDetailDrawingUser bizTechnologicalProcessDetailDrawingUser) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -88,7 +90,7 @@ public class BizTechnologicalProcessDetailDrawingUserController extends BaseCont
      * 修改电子图纸操作人员
      * 修改电子图纸操作人员
      */
      */
     @PreAuthorize("@ss.hasPermi('business:user:edit')")
     @PreAuthorize("@ss.hasPermi('business:user:edit')")
-    @Log(title = "电子图纸操作人员", businessType = BusinessType.UPDATE)
+    @Log(title = "电子图纸操作人员修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetailDrawingUser bizTechnologicalProcessDetailDrawingUser) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizTechnologicalProcessDetailDrawingUser bizTechnologicalProcessDetailDrawingUser) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -100,7 +102,7 @@ public class BizTechnologicalProcessDetailDrawingUserController extends BaseCont
      * 删除电子图纸操作人员
      * 删除电子图纸操作人员
      */
      */
     @PreAuthorize("@ss.hasPermi('business:user:remove')")
     @PreAuthorize("@ss.hasPermi('business:user:remove')")
-    @Log(title = "电子图纸操作人员", businessType = BusinessType.DELETE)
+    @Log(title = "电子图纸操作人员删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 6 - 4
src/main/java/cn/ezhizao/project/business/workshop/controller/BizWorkshopController.java

@@ -46,6 +46,7 @@ public class BizWorkshopController extends BaseController
      * 查询车间管理列表
      * 查询车间管理列表
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:workshop:list')")
 //    @PreAuthorize("@ss.hasPermi('business:workshop:list')")
+    @Log(title = "车间管理查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(BizWorkshop bizWorkshop) throws NoSuchFieldException, IllegalAccessException
     public TableDataInfo list(BizWorkshop bizWorkshop) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -58,7 +59,7 @@ public class BizWorkshopController extends BaseController
      * 导出车间管理列表
      * 导出车间管理列表
      */
      */
     @PreAuthorize("@ss.hasPermi('business:workshop:export')")
     @PreAuthorize("@ss.hasPermi('business:workshop:export')")
-    @Log(title = "车间管理", businessType = BusinessType.EXPORT)
+    @Log(title = "车间管理导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizWorkshop bizWorkshop) throws NoSuchFieldException, IllegalAccessException
     public void export(HttpServletResponse response, BizWorkshop bizWorkshop) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -72,6 +73,7 @@ public class BizWorkshopController extends BaseController
      * 获取车间管理详细信息
      * 获取车间管理详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('business:workshop:query')")
     @PreAuthorize("@ss.hasPermi('business:workshop:query')")
+    @Log(title = "车间管理查询详细信息", businessType = BusinessType.EXPORT)
     @GetMapping(value = "/{id}")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
     {
@@ -82,7 +84,7 @@ public class BizWorkshopController extends BaseController
      * 新增车间管理
      * 新增车间管理
      */
      */
     @PreAuthorize("@ss.hasPermi('business:workshop:add')")
     @PreAuthorize("@ss.hasPermi('business:workshop:add')")
-    @Log(title = "车间管理", businessType = BusinessType.INSERT)
+    @Log(title = "车间管理新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@RequestBody BizWorkshop bizWorkshop) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult add(@RequestBody BizWorkshop bizWorkshop) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -99,7 +101,7 @@ public class BizWorkshopController extends BaseController
      * 修改车间管理
      * 修改车间管理
      */
      */
     @PreAuthorize("@ss.hasPermi('business:workshop:edit')")
     @PreAuthorize("@ss.hasPermi('business:workshop:edit')")
-    @Log(title = "车间管理", businessType = BusinessType.UPDATE)
+    @Log(title = "车间管理修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@RequestBody BizWorkshop bizWorkshop) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult edit(@RequestBody BizWorkshop bizWorkshop) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -117,7 +119,7 @@ public class BizWorkshopController extends BaseController
      * 删除车间管理
      * 删除车间管理
      */
      */
     @PreAuthorize("@ss.hasPermi('business:workshop:remove')")
     @PreAuthorize("@ss.hasPermi('business:workshop:remove')")
-    @Log(title = "车间管理", businessType = BusinessType.DELETE)
+    @Log(title = "车间管理删除", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)
     public AjaxResult remove(@PathVariable List<Long> ids)
     {
     {

+ 4 - 3
src/main/java/cn/ezhizao/project/business/workshopTrunover/controller/BizWorkshopTurnoverController.java

@@ -42,6 +42,7 @@ public class BizWorkshopTurnoverController extends BaseController
      * 查询车间管理列表
      * 查询车间管理列表
      */
      */
     //@PreAuthorize("@ss.hasPermi('business:workshop:list')")
     //@PreAuthorize("@ss.hasPermi('business:workshop:list')")
+    @Log(title = "车间周转区查询", businessType = BusinessType.SELECT)
     @PostMapping("/list")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException
     public AjaxResult list(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException
     {
     {
@@ -66,7 +67,7 @@ public class BizWorkshopTurnoverController extends BaseController
      * 获取周转区详细信息
      * 获取周转区详细信息
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:turnover:query')")
 //    @PreAuthorize("@ss.hasPermi('business:turnover:query')")
-    @Log(title = "单一周转区信息获取", businessType = BusinessType.SELECT)
+    @Log(title = "车间周转区查询详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/getInfo/{id}")
     @GetMapping(value = "/getInfo/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizWorkshopTurnoverService.getById(id));
         return success(bizWorkshopTurnoverService.getById(id));
@@ -76,7 +77,7 @@ public class BizWorkshopTurnoverController extends BaseController
      * 新增周转区
      * 新增周转区
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:turnover:add, business:turnover:edit')")
 //    @PreAuthorize("@ss.hasPermi('business:turnover:add, business:turnover:edit')")
-    @Log(title = "周转区保存", businessType = BusinessType.INSERT)
+    @Log(title = "车间周转区保存", businessType = BusinessType.INSERT)
     @PostMapping(value = "/save")
     @PostMapping(value = "/save")
     public AjaxResult save(@RequestBody BizWorkshopTurnover bizWorkshopTurnover) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult save(@RequestBody BizWorkshopTurnover bizWorkshopTurnover) throws NoSuchFieldException, IllegalAccessException {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -102,7 +103,7 @@ public class BizWorkshopTurnoverController extends BaseController
      * 删除周转区
      * 删除周转区
      */
      */
 //    @PreAuthorize("@ss.hasPermi('business:turnover:remove')")
 //    @PreAuthorize("@ss.hasPermi('business:turnover:remove')")
-    @Log(title = "周转区删除", businessType = BusinessType.DELETE)
+    @Log(title = "车间周转区删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/remove/{ids}")
     @DeleteMapping("/remove/{ids}")
     public AjaxResult remove(@PathVariable Long ids) {
     public AjaxResult remove(@PathVariable Long ids) {
         List<BizDayworkItem> turnoverDayworkList = getTurnoverDayworkList((ids+""));
         List<BizDayworkItem> turnoverDayworkList = getTurnoverDayworkList((ids+""));

+ 14 - 7
src/main/java/cn/ezhizao/project/system/controller/SysDeptController.java

@@ -49,6 +49,7 @@ public class SysDeptController extends BaseController
     /**
     /**
      * 获取部门列表
      * 获取部门列表
      */
      */
+    @Log(title = "部门管理查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -61,7 +62,7 @@ public class SysDeptController extends BaseController
         List<SysDept> departments = deptService.selectDeptList(dept);
         List<SysDept> departments = deptService.selectDeptList(dept);
         return getDataTable(departments);
         return getDataTable(departments);
     }
     }
-
+    @Log(title = "合格证选择工段", businessType = BusinessType.SELECT)
     @GetMapping("/listForCertificate")
     @GetMapping("/listForCertificate")
     public TableDataInfo listForCertificate(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo listForCertificate(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -78,6 +79,7 @@ public class SysDeptController extends BaseController
     /**
     /**
      * 获取部门名称和id
      * 获取部门名称和id
      */
      */
+    @Log(title = "部门管理获取部门名称和id", businessType = BusinessType.SELECT)
     @GetMapping("/getDeptList")
     @GetMapping("/getDeptList")
     public AjaxResult getDeptList(SysDept dept) {
     public AjaxResult getDeptList(SysDept dept) {
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -88,6 +90,7 @@ public class SysDeptController extends BaseController
     /**
     /**
      * 获取部门信息
      * 获取部门信息
      */
      */
+    @Log(title = "获取未分配车间的工段", businessType = BusinessType.SELECT)
     @GetMapping("/getDeptInfo")
     @GetMapping("/getDeptInfo")
     public TableDataInfo getDeptInfo(SysDept dept) {
     public TableDataInfo getDeptInfo(SysDept dept) {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -96,6 +99,7 @@ public class SysDeptController extends BaseController
         List<SysDept> departments = deptService.getDeptInfo(dept);
         List<SysDept> departments = deptService.getDeptInfo(dept);
         return getDataTable(departments);
         return getDataTable(departments);
     }
     }
+    @Log(title = "针对设备设置使用部门,查询部门", businessType = BusinessType.SELECT)
     @GetMapping("/listForEquipment")
     @GetMapping("/listForEquipment")
     public AjaxResult listForEquipment(SysDept dept) {
     public AjaxResult listForEquipment(SysDept dept) {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -107,6 +111,7 @@ public class SysDeptController extends BaseController
      * 查询部门列表(排除节点)
      * 查询部门列表(排除节点)
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @Log(title = "查询部门列表(排除节点)", businessType = BusinessType.SELECT)
     @GetMapping("/list/exclude/{deptId}")
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
     {
@@ -121,6 +126,7 @@ public class SysDeptController extends BaseController
     /**
     /**
      * 根据部门编号获取详细信息
      * 根据部门编号获取详细信息
      */
      */
+    @Log(title = "根据部门编号获取详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{deptId}")
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     public AjaxResult getInfo(@PathVariable Long deptId)
     {
     {
@@ -132,7 +138,7 @@ public class SysDeptController extends BaseController
      * 新增部门
      * 新增部门
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
-    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @Log(title = "部门管理新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDept dept) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult add(@Validated @RequestBody SysDept dept) throws NoSuchFieldException, IllegalAccessException {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -147,7 +153,7 @@ public class SysDeptController extends BaseController
     /**
     /**
      * 新增或修改部门
      * 新增或修改部门
      */
      */
-    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @Log(title = "部门管理保存", businessType = BusinessType.INSERT)
     @PostMapping(value = "save")
     @PostMapping(value = "save")
     @Transactional
     @Transactional
     public AjaxResult save(@Validated @RequestBody SysDept dept) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult save(@Validated @RequestBody SysDept dept) throws NoSuchFieldException, IllegalAccessException {
@@ -199,7 +205,7 @@ public class SysDeptController extends BaseController
      * 修改部门
      * 修改部门
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
-    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @Log(title = "部门管理修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDept dept) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult edit(@Validated @RequestBody SysDept dept) throws NoSuchFieldException, IllegalAccessException {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -224,7 +230,7 @@ public class SysDeptController extends BaseController
     /**
     /**
      * 修改工段车间
      * 修改工段车间
      */
      */
-    @Log(title = "部门车间管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改工段车间", businessType = BusinessType.UPDATE)
     @PutMapping("/updateDeptWorkshop")
     @PutMapping("/updateDeptWorkshop")
     public AjaxResult updateDeptWorkshop(@RequestBody  SysDept sysDept) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult updateDeptWorkshop(@RequestBody  SysDept sysDept) throws NoSuchFieldException, IllegalAccessException {
         //车间工段进行删除工段时如果传入值代表添加工段,如果没传入则代表删除,讲workshopId的值变为0
         //车间工段进行删除工段时如果传入值代表添加工段,如果没传入则代表删除,讲workshopId的值变为0
@@ -237,7 +243,7 @@ public class SysDeptController extends BaseController
     /**
     /**
      * 修改工段车间
      * 修改工段车间
      */
      */
-    @Log(title = "部门车间管理", businessType = BusinessType.UPDATE)
+    @Log(title = "通过工段id修改工段车间", businessType = BusinessType.UPDATE)
     @PutMapping("/updateDeptWorkshopByDeptId")
     @PutMapping("/updateDeptWorkshopByDeptId")
     public AjaxResult updateDeptWorkshopByDeptId(@RequestBody  SysDept sysDept) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult updateDeptWorkshopByDeptId(@RequestBody  SysDept sysDept) throws NoSuchFieldException, IllegalAccessException {
         deptService.updateDeptWorkshopByDeptId(sysDept);
         deptService.updateDeptWorkshopByDeptId(sysDept);
@@ -247,7 +253,7 @@ public class SysDeptController extends BaseController
      * 删除部门
      * 删除部门
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
-    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除部门", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
     @DeleteMapping("/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId)
     public AjaxResult remove(@PathVariable Long deptId)
     {
     {
@@ -271,6 +277,7 @@ public class SysDeptController extends BaseController
     /**
     /**
      * 获取工段树列表
      * 获取工段树列表
      */
      */
+    @Log(title = "获取工段树列表", businessType = BusinessType.SELECT)
     @GetMapping("/workSectionTree")
     @GetMapping("/workSectionTree")
     public AjaxResult workSectionTree(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult workSectionTree(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");

+ 8 - 4
src/main/java/cn/ezhizao/project/system/controller/SysDictDataController.java

@@ -35,6 +35,7 @@ public class SysDictDataController extends BaseController
     private ISysDictTypeService dictTypeService;
     private ISysDictTypeService dictTypeService;
 
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @Log(title = "字典数据查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SysDictData dictData)
     public TableDataInfo list(SysDictData dictData)
     {
     {
@@ -43,7 +44,7 @@ public class SysDictDataController extends BaseController
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
-    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @Log(title = "字典数据导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictData dictData)
     public void export(HttpServletResponse response, SysDictData dictData)
@@ -57,6 +58,7 @@ public class SysDictDataController extends BaseController
      * 查询字典数据详细
      * 查询字典数据详细
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @Log(title = "查询字典数据详细", businessType = BusinessType.EXPORT)
     @GetMapping(value = "/{dictCode}")
     @GetMapping(value = "/{dictCode}")
     public AjaxResult getInfo(@PathVariable Long dictCode)
     public AjaxResult getInfo(@PathVariable Long dictCode)
     {
     {
@@ -66,6 +68,7 @@ public class SysDictDataController extends BaseController
     /**
     /**
      * 根据字典类型查询字典数据信息
      * 根据字典类型查询字典数据信息
      */
      */
+    @Log(title = "根据字典类型查询字典数据信息", businessType = BusinessType.EXPORT)
     @GetMapping(value = "/type/{dictType}")
     @GetMapping(value = "/type/{dictType}")
     public AjaxResult dictType(@PathVariable String dictType)
     public AjaxResult dictType(@PathVariable String dictType)
     {
     {
@@ -81,7 +84,7 @@ public class SysDictDataController extends BaseController
      * 新增字典类型
      * 新增字典类型
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
-    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @Log(title = "字典数据新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictData dict)
     public AjaxResult add(@Validated @RequestBody SysDictData dict)
     {
     {
@@ -93,7 +96,7 @@ public class SysDictDataController extends BaseController
      * 修改保存字典类型
      * 修改保存字典类型
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
-    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @Log(title = "字典数据修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
     {
     {
@@ -105,7 +108,7 @@ public class SysDictDataController extends BaseController
      * 删除字典类型
      * 删除字典类型
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @Log(title = "字典类型删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
     @DeleteMapping("/{dictCodes}")
     public AjaxResult remove(@PathVariable Long[] dictCodes)
     public AjaxResult remove(@PathVariable Long[] dictCodes)
     {
     {
@@ -116,6 +119,7 @@ public class SysDictDataController extends BaseController
     /**
     /**
      * 精确查询值
      * 精确查询值
      */
      */
+    @Log(title = "精确查询字典值", businessType = BusinessType.DELETE)
     @GetMapping("/getDictData")
     @GetMapping("/getDictData")
     public SysDictData getDictData(String type, String value)
     public SysDictData getDictData(String type, String value)
     {
     {

+ 9 - 5
src/main/java/cn/ezhizao/project/system/controller/SysDictTypeController.java

@@ -31,6 +31,7 @@ public class SysDictTypeController extends BaseController
     private ISysDictTypeService dictTypeService;
     private ISysDictTypeService dictTypeService;
 
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
+    @Log(title = "字典类型查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SysDictType dictType)
     public TableDataInfo list(SysDictType dictType)
     {
     {
@@ -39,7 +40,7 @@ public class SysDictTypeController extends BaseController
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 
-    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @Log(title = "字典类型导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictType dictType)
     public void export(HttpServletResponse response, SysDictType dictType)
@@ -58,6 +59,7 @@ public class SysDictTypeController extends BaseController
      * 查询字典类型详细
      * 查询字典类型详细
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
+    @Log(title = "通过id查询字典类型", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{dictId}")
     @GetMapping(value = "/{dictId}")
     public AjaxResult getInfo(@PathVariable Long dictId)
     public AjaxResult getInfo(@PathVariable Long dictId)
     {
     {
@@ -68,7 +70,7 @@ public class SysDictTypeController extends BaseController
      * 新增字典类型
      * 新增字典类型
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
-    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @Log(title = "字典类型新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDictType dict)
     public AjaxResult add(@Validated @RequestBody SysDictType dict)
     {
     {
@@ -84,7 +86,7 @@ public class SysDictTypeController extends BaseController
      * 修改字典类型
      * 修改字典类型
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
-    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @Log(title = "字典类型修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDictType dict)
     public AjaxResult edit(@Validated @RequestBody SysDictType dict)
     {
     {
@@ -100,7 +102,7 @@ public class SysDictTypeController extends BaseController
      * 删除字典类型
      * 删除字典类型
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @Log(title = "字典类型删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictIds}")
     @DeleteMapping("/{dictIds}")
     public AjaxResult remove(@PathVariable Long[] dictIds)
     public AjaxResult remove(@PathVariable Long[] dictIds)
     {
     {
@@ -112,7 +114,7 @@ public class SysDictTypeController extends BaseController
      * 刷新字典缓存
      * 刷新字典缓存
      */
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
-    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @Log(title = "字典类型刷新", businessType = BusinessType.CLEAN)
     @DeleteMapping("/refreshCache")
     @DeleteMapping("/refreshCache")
     public AjaxResult refreshCache()
     public AjaxResult refreshCache()
     {
     {
@@ -123,7 +125,9 @@ public class SysDictTypeController extends BaseController
     /**
     /**
      * 获取字典选择框列表
      * 获取字典选择框列表
      */
      */
+    @Log(title = "取字典选择框列表", businessType = BusinessType.SELECT)
     @GetMapping("/optionselect")
     @GetMapping("/optionselect")
+
     public AjaxResult optionselect()
     public AjaxResult optionselect()
     {
     {
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();

+ 7 - 0
src/main/java/cn/ezhizao/project/system/controller/SysLoginController.java

@@ -2,6 +2,8 @@ package cn.ezhizao.project.system.controller;
 
 
 import cn.ezhizao.common.constant.Constants;
 import cn.ezhizao.common.constant.Constants;
 import cn.ezhizao.common.utils.SecurityUtils;
 import cn.ezhizao.common.utils.SecurityUtils;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.security.LoginBody;
 import cn.ezhizao.framework.security.LoginBody;
 import cn.ezhizao.framework.security.service.SysLoginService;
 import cn.ezhizao.framework.security.service.SysLoginService;
 import cn.ezhizao.framework.security.service.SysPermissionService;
 import cn.ezhizao.framework.security.service.SysPermissionService;
@@ -45,6 +47,7 @@ public class SysLoginController extends BaseController
      * @param loginBody 登录信息
      * @param loginBody 登录信息
      * @return 结果
      * @return 结果
      */
      */
+    @Log(title = "登录", businessType = BusinessType.SELECT)
     @PostMapping("/login")
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody)
     public AjaxResult login(@RequestBody LoginBody loginBody)
     {
     {
@@ -62,6 +65,7 @@ public class SysLoginController extends BaseController
      *
      *
      * @return 用户信息
      * @return 用户信息
      */
      */
+    @Log(title = "用户信息查询", businessType = BusinessType.SELECT)
     @GetMapping("getInfo")
     @GetMapping("getInfo")
     public AjaxResult getInfo()
     public AjaxResult getInfo()
     {
     {
@@ -82,6 +86,7 @@ public class SysLoginController extends BaseController
      *
      *
      * @return 路由信息
      * @return 路由信息
      */
      */
+    @Log(title = "获取路由信息", businessType = BusinessType.SELECT)
     @GetMapping("getRouters")
     @GetMapping("getRouters")
     public AjaxResult getRouters()
     public AjaxResult getRouters()
     {
     {
@@ -95,6 +100,7 @@ public class SysLoginController extends BaseController
      * @param userName
      * @param userName
      * @return
      * @return
      */
      */
+    @Log(title = "根据用户名获取租户列表", businessType = BusinessType.SELECT)
     @GetMapping("/snms/getTenantList/{userName}")
     @GetMapping("/snms/getTenantList/{userName}")
     public AjaxResult getTenantList(@PathVariable("userName") String userName){
     public AjaxResult getTenantList(@PathVariable("userName") String userName){
         List<BizTenant> bizTenantList = loginService.getTenantList(userName);
         List<BizTenant> bizTenantList = loginService.getTenantList(userName);
@@ -110,6 +116,7 @@ public class SysLoginController extends BaseController
      * @param orgName
      * @param orgName
      * @return
      * @return
      */
      */
+    @Log(title = "根据企业名称 模糊查询租户", businessType = BusinessType.SELECT)
     @GetMapping("/snms/getTenantListByOrgName/{orgName}")
     @GetMapping("/snms/getTenantListByOrgName/{orgName}")
     public AjaxResult getTenantListByOrgName(@PathVariable("orgName") String orgName){
     public AjaxResult getTenantListByOrgName(@PathVariable("orgName") String orgName){
         return success(tenantService.query().like("org_name",orgName).list());
         return success(tenantService.query().like("org_name",orgName).list());

+ 7 - 3
src/main/java/cn/ezhizao/project/system/controller/SysMenuController.java

@@ -31,6 +31,7 @@ public class SysMenuController extends BaseController
      * 获取菜单列表
      * 获取菜单列表
      */
      */
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
+    @Log(title = "菜单管理查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public AjaxResult list(SysMenu menu)
     public AjaxResult list(SysMenu menu)
     {
     {
@@ -42,6 +43,7 @@ public class SysMenuController extends BaseController
      * 根据菜单编号获取详细信息
      * 根据菜单编号获取详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
     @PreAuthorize("@ss.hasPermi('system:menu:query')")
+    @Log(title = "根据菜单编号获取详细信息", businessType = BusinessType.SELECT)
     @GetMapping(value = "/{menuId}")
     @GetMapping(value = "/{menuId}")
     public AjaxResult getInfo(@PathVariable Long menuId)
     public AjaxResult getInfo(@PathVariable Long menuId)
     {
     {
@@ -51,6 +53,7 @@ public class SysMenuController extends BaseController
     /**
     /**
      * 获取菜单下拉树列表
      * 获取菜单下拉树列表
      */
      */
+    @Log(title = "获取菜单下拉树列表", businessType = BusinessType.SELECT)
     @GetMapping("/treeselect")
     @GetMapping("/treeselect")
     public AjaxResult treeselect(SysMenu menu)
     public AjaxResult treeselect(SysMenu menu)
     {
     {
@@ -61,6 +64,7 @@ public class SysMenuController extends BaseController
     /**
     /**
      * 加载对应角色菜单列表树
      * 加载对应角色菜单列表树
      */
      */
+    @Log(title = "加载对应角色菜单列表树", businessType = BusinessType.SELECT)
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
     {
@@ -75,7 +79,7 @@ public class SysMenuController extends BaseController
      * 新增菜单
      * 新增菜单
      */
      */
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
-    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @Log(title = "菜单管理新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysMenu menu)
     public AjaxResult add(@Validated @RequestBody SysMenu menu)
     {
     {
@@ -95,7 +99,7 @@ public class SysMenuController extends BaseController
      * 修改菜单
      * 修改菜单
      */
      */
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
-    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @Log(title = "菜单管理修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysMenu menu)
     public AjaxResult edit(@Validated @RequestBody SysMenu menu)
     {
     {
@@ -123,7 +127,7 @@ public class SysMenuController extends BaseController
      * 删除菜单
      * 删除菜单
      */
      */
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
-    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @Log(title = "菜单管理删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
     @DeleteMapping("/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId)
     public AjaxResult remove(@PathVariable("menuId") Long menuId)
     {
     {

+ 16 - 9
src/main/java/cn/ezhizao/project/system/controller/SysRoleController.java

@@ -56,6 +56,7 @@ public class SysRoleController extends BaseController
     private HttpServletRequest request;
     private HttpServletRequest request;
 
 
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @Log(title = "角色管理查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SysRole role) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(SysRole role) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         startPage();
@@ -63,13 +64,14 @@ public class SysRoleController extends BaseController
         List<SysRole> list = roleService.selectRoleList(role);
         List<SysRole> list = roleService.selectRoleList(role);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
+    @Log(title = "获取当前用户的角色", businessType = BusinessType.EXPORT)
     @PostMapping("/getListByUserId")
     @PostMapping("/getListByUserId")
     public AjaxResult getListByUserId(@RequestBody SysRole role) {
     public AjaxResult getListByUserId(@RequestBody SysRole role) {
         List<SysRole> list = roleService.selectRoleMenu(role.getUserId());
         List<SysRole> list = roleService.selectRoleMenu(role.getUserId());
         return success(list);
         return success(list);
     }
     }
 
 
-    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @Log(title = "角色管理到处", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysRole role) throws NoSuchFieldException, IllegalAccessException {
     public void export(HttpServletResponse response, SysRole role) throws NoSuchFieldException, IllegalAccessException {
@@ -87,6 +89,7 @@ public class SysRoleController extends BaseController
     /**
     /**
      * 根据角色编号获取详细信息
      * 根据角色编号获取详细信息
      */
      */
+    @Log(title = "根据角色编号获取详细信息", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
     @GetMapping(value = "/{roleId}")
     public AjaxResult getInfo(@PathVariable Long roleId)
     public AjaxResult getInfo(@PathVariable Long roleId)
@@ -99,7 +102,7 @@ public class SysRoleController extends BaseController
      * 新增角色
      * 新增角色
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @PreAuthorize("@ss.hasPermi('system:role:add')")
-    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @Log(title = "角色管理新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysRole role) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult add(@Validated @RequestBody SysRole role) throws NoSuchFieldException, IllegalAccessException {
 //        setTenantId(role);
 //        setTenantId(role);
@@ -120,7 +123,7 @@ public class SysRoleController extends BaseController
      * 修改保存角色
      * 修改保存角色
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @Log(title = "角色管理修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysRole role) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult edit(@Validated @RequestBody SysRole role) throws NoSuchFieldException, IllegalAccessException {
 //        setTenantId(role);
 //        setTenantId(role);
@@ -155,7 +158,7 @@ public class SysRoleController extends BaseController
      * 修改保存数据权限
      * 修改保存数据权限
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @Log(title = "角色管理修改保存数据权限", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
     @PutMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role)
     public AjaxResult dataScope(@RequestBody SysRole role)
     {
     {
@@ -168,7 +171,7 @@ public class SysRoleController extends BaseController
      * 状态修改
      * 状态修改
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @Log(title = "角色管理修改状态", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role)
     public AjaxResult changeStatus(@RequestBody SysRole role)
     {
     {
@@ -182,7 +185,7 @@ public class SysRoleController extends BaseController
      * 删除角色
      * 删除角色
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
-    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @Log(title = "角色管理删除角色", businessType = BusinessType.DELETE)
     @DeleteMapping("/{roleIds}")
     @DeleteMapping("/{roleIds}")
     public AjaxResult remove(@PathVariable Long[] roleIds)
     public AjaxResult remove(@PathVariable Long[] roleIds)
     {
     {
@@ -193,6 +196,7 @@ public class SysRoleController extends BaseController
      * 获取角色选择框列表
      * 获取角色选择框列表
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @Log(title = "获取角色选择框列表", businessType = BusinessType.SELECT)
     @GetMapping("/optionselect")
     @GetMapping("/optionselect")
     public AjaxResult optionselect()
     public AjaxResult optionselect()
     {
     {
@@ -203,6 +207,7 @@ public class SysRoleController extends BaseController
      * 查询已分配用户角色列表
      * 查询已分配用户角色列表
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @Log(title = "查询已分配用户角色列表", businessType = BusinessType.SELECT)
     @GetMapping("/authUser/allocatedList")
     @GetMapping("/authUser/allocatedList")
     public TableDataInfo allocatedList(SysUser user)
     public TableDataInfo allocatedList(SysUser user)
     {
     {
@@ -215,6 +220,7 @@ public class SysRoleController extends BaseController
      * 查询未分配用户角色列表
      * 查询未分配用户角色列表
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
+    @Log(title = "查询未分配用户角色列表", businessType = BusinessType.SELECT)
     @GetMapping("/authUser/unallocatedList")
     @GetMapping("/authUser/unallocatedList")
     public TableDataInfo unallocatedList(SysUser user)
     public TableDataInfo unallocatedList(SysUser user)
     {
     {
@@ -229,7 +235,7 @@ public class SysRoleController extends BaseController
      * 取消授权用户
      * 取消授权用户
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @Log(title = "角色管理取消授权用户", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
     @PutMapping("/authUser/cancel")
     public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
     public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
     {
     {
@@ -240,7 +246,7 @@ public class SysRoleController extends BaseController
      * 批量取消授权用户
      * 批量取消授权用户
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @Log(title = "角色管理批量取消授权用户", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
     @PutMapping("/authUser/cancelAll")
     public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
     public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
     {
     {
@@ -251,7 +257,7 @@ public class SysRoleController extends BaseController
      * 批量选择用户授权
      * 批量选择用户授权
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @Log(title = "角色管理批量选择用户授权", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
     @PutMapping("/authUser/selectAll")
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
     {
     {
@@ -263,6 +269,7 @@ public class SysRoleController extends BaseController
      * 获取对应角色部门树列表
      * 获取对应角色部门树列表
      */
      */
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
+    @Log(title = "获取对应角色部门树列表", businessType = BusinessType.SELECT)
     @GetMapping(value = "/deptTree/{roleId}")
     @GetMapping(value = "/deptTree/{roleId}")
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
     {
     {

+ 29 - 15
src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -63,6 +63,7 @@ public class SysUserController extends BaseController {
      * 获取用户列表
      * 获取用户列表
      */
      */
     //@PreAuthorize("@ss.hasPermi('system:user:list')")
     //@PreAuthorize("@ss.hasPermi('system:user:list')")
+    @Log(title = "用户查询", businessType = BusinessType.SELECT)
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo list(SysUser user) throws NoSuchFieldException, IllegalAccessException {
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -72,6 +73,7 @@ public class SysUserController extends BaseController {
         return getDataTable(list);
         return getDataTable(list);
     }
     }
     //包装线添加员工已经添加的不显示
     //包装线添加员工已经添加的不显示
+    @Log(title = "用户查询,包装线添加员工", businessType = BusinessType.SELECT)
     @GetMapping("/notHasAddList")
     @GetMapping("/notHasAddList")
     public TableDataInfo notHasAddList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo notHasAddList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -80,19 +82,21 @@ public class SysUserController extends BaseController {
         List<SysUser> list = userService.selectNotAddList(user);
         List<SysUser> list = userService.selectNotAddList(user);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
+    @Log(title = "通过厂别查询用户", businessType = BusinessType.SELECT)
     @GetMapping("/tenantList")
     @GetMapping("/tenantList")
     public TableDataInfo tenantList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo tenantList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         startPage();
         List<SysUser> list = userService.selectTenantList(user);
         List<SysUser> list = userService.selectTenantList(user);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
+    @Log(title = "用户名和用户账户查询用户", businessType = BusinessType.SELECT)
     @GetMapping("/listByLikeNickNameOrUserName")
     @GetMapping("/listByLikeNickNameOrUserName")
     public TableDataInfo listByLikeNickNameOrUserName(SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo listByLikeNickNameOrUserName(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         startPage();
         List<SysUser> userList = userService.listByLikeNickNameOrUserName(user);
         List<SysUser> userList = userService.listByLikeNickNameOrUserName(user);
         return getDataTable(userList);
         return getDataTable(userList);
     }
     }
-
+    @Log(title = "用户查询", businessType = BusinessType.SELECT)
     @GetMapping("/listEmployee")
     @GetMapping("/listEmployee")
     public TableDataInfo listEmployee(SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo listEmployee(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         startPage();
@@ -101,12 +105,14 @@ public class SysUserController extends BaseController {
         List<SysUser> list = userService.selectEmployeeList(user);
         List<SysUser> list = userService.selectEmployeeList(user);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
+    @Log(title = "通过用户id查询菜单权限", businessType = BusinessType.SELECT)
     @PostMapping("/selectUserPermissionList")
     @PostMapping("/selectUserPermissionList")
     public AjaxResult selectUserPermissionList(@RequestBody SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult selectUserPermissionList(@RequestBody SysUser user) throws NoSuchFieldException, IllegalAccessException {
         Long userId = SecurityUtils.getLoginUser().getUserId();
         Long userId = SecurityUtils.getLoginUser().getUserId();
         List<SysMenu> sysMenus = userService.selectUserPermissionList(userId);
         List<SysMenu> sysMenus = userService.selectUserPermissionList(userId);
         return success(sysMenus);
         return success(sysMenus);
     }
     }
+    @Log(title = "用户查询", businessType = BusinessType.SELECT)
     @GetMapping("/getUserList")
     @GetMapping("/getUserList")
     public TableDataInfo getUserList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public TableDataInfo getUserList(SysUser user) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         startPage();
@@ -119,6 +125,7 @@ public class SysUserController extends BaseController {
     /**
     /**
      * 获取中间表信息
      * 获取中间表信息
      */
      */
+    @Log(title = "查询工段下员工信息", businessType = BusinessType.SELECT)
     @GetMapping("/deptUser")
     @GetMapping("/deptUser")
     public TableDataInfo deptUser(SysDeptUser deptUser) {
     public TableDataInfo deptUser(SysDeptUser deptUser) {
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -135,6 +142,7 @@ public class SysUserController extends BaseController {
      * 获取用户部门
      * 获取用户部门
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @Log(title = "工段下员工信息查询", businessType = BusinessType.SELECT)
     @GetMapping("/getUsersByDeptId")
     @GetMapping("/getUsersByDeptId")
     public TableDataInfo getUsersByDeptId( SysDept data) {
     public TableDataInfo getUsersByDeptId( SysDept data) {
         Long deptId = data.getDeptId();
         Long deptId = data.getDeptId();
@@ -161,6 +169,7 @@ public class SysUserController extends BaseController {
      * 获取用户通过deptId
      * 获取用户通过deptId
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @Log(title = "通过工段查询工段下员工信息", businessType = BusinessType.SELECT)
     @GetMapping("/getUsersItemByDeptId")
     @GetMapping("/getUsersItemByDeptId")
     public TableDataInfo getUsersItemByDeptId(SysDeptUser sysDeptUser) {
     public TableDataInfo getUsersItemByDeptId(SysDeptUser sysDeptUser) {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -169,6 +178,7 @@ public class SysUserController extends BaseController {
         return getDataTable(list);
         return getDataTable(list);
     }
     }
     //获取用户详细通过deptId
     //获取用户详细通过deptId
+    @Log(title = "过工段查询工段下员工信息", businessType = BusinessType.SELECT)
     @PostMapping("/getUserInfoByDeptId")
     @PostMapping("/getUserInfoByDeptId")
     public TableDataInfo getUserInfoByDeptId(@RequestBody SysDeptUser sysDeptUser) {
     public TableDataInfo getUserInfoByDeptId(@RequestBody SysDeptUser sysDeptUser) {
         startPage();
         startPage();
@@ -187,7 +197,7 @@ public class SysUserController extends BaseController {
         }
         }
         return subDepartments;
         return subDepartments;
     }
     }
-    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @Log(title = "用户管理导出", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public void export(HttpServletResponse response, SysUser user) throws NoSuchFieldException, IllegalAccessException {
@@ -201,7 +211,7 @@ public class SysUserController extends BaseController {
         util.exportExcel(response, list, "用户数据");
         util.exportExcel(response, list, "用户数据");
     }
     }
 
 
-    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @Log(title = "用户管理导入", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
@@ -211,7 +221,6 @@ public class SysUserController extends BaseController {
         String message = userService.importUser(userList, updateSupport, operName);
         String message = userService.importUser(userList, updateSupport, operName);
         return success(message);
         return success(message);
     }
     }
-
     @PostMapping("/importTemplate")
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
     public void importTemplate(HttpServletResponse response) {
         ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
         ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
@@ -222,6 +231,7 @@ public class SysUserController extends BaseController {
      * 根据用户编号获取详细信息
      * 根据用户编号获取详细信息
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @Log(title = "根据用户编号获取详细信息", businessType = BusinessType.IMPORT)
     @GetMapping(value = { "/", "/{userId}" })
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
         userService.checkUserDataScope(userId);
@@ -242,7 +252,7 @@ public class SysUserController extends BaseController {
      * 新增用户
      * 新增用户
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @Log(title = "用户管理新增", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysUser user) {
     public AjaxResult add(@Validated @RequestBody SysUser user) {
 //        String tenantId = request.getHeader("tenantId");
 //        String tenantId = request.getHeader("tenantId");
@@ -276,7 +286,7 @@ public class SysUserController extends BaseController {
      * 新增管理员用户
      * 新增管理员用户
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @Log(title = "用户管理新增管理员用户", businessType = BusinessType.INSERT)
     @PostMapping("/saveAdmin")
     @PostMapping("/saveAdmin")
     public AjaxResult saveAdmin(@Validated @RequestBody SysUser user) {
     public AjaxResult saveAdmin(@Validated @RequestBody SysUser user) {
         if(user.getTenantId() == null) {
         if(user.getTenantId() == null) {
@@ -313,7 +323,7 @@ public class SysUserController extends BaseController {
      * 新增或修改用户
      * 新增或修改用户
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:add')")
     @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @Log(title = "用户管理保存", businessType = BusinessType.INSERT)
     @PostMapping(value = "save")
     @PostMapping(value = "save")
     @Transactional
     @Transactional
     public AjaxResult save(@Validated @RequestBody SysUser user) {
     public AjaxResult save(@Validated @RequestBody SysUser user) {
@@ -355,7 +365,7 @@ public class SysUserController extends BaseController {
      * 新增或修改中间表用户
      * 新增或修改中间表用户
      */
      */
 //    @PreAuthorize("@ss.hasPermi('system:user:add')")
 //    @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @Log(title = "工段下员工信息保存", businessType = BusinessType.INSERT)
     @PostMapping(value = "saveDeptUser")
     @PostMapping(value = "saveDeptUser")
     @Transactional
     @Transactional
     public AjaxResult saveDeptUser(@Validated @RequestBody List<SysDeptUser> deptUserList) {
     public AjaxResult saveDeptUser(@Validated @RequestBody List<SysDeptUser> deptUserList) {
@@ -383,7 +393,7 @@ public class SysUserController extends BaseController {
      * 修改中间表用户是否是工段长或调机或主管或调度
      * 修改中间表用户是否是工段长或调机或主管或调度
      */
      */
 //    @PreAuthorize("@ss.hasPermi('system:user:add')")
 //    @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @Log(title = "工段下员工修改", businessType = BusinessType.INSERT)
     @PutMapping("/updateDeptUser")
     @PutMapping("/updateDeptUser")
     @Transactional
     @Transactional
     public AjaxResult updateDeptUser(@RequestBody SysDeptUser data) {
     public AjaxResult updateDeptUser(@RequestBody SysDeptUser data) {
@@ -396,7 +406,7 @@ public class SysUserController extends BaseController {
      * 修改用户
      * 修改用户
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "用户管理修改", businessType = BusinessType.UPDATE)
     @PutMapping
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysUser user) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult edit(@Validated @RequestBody SysUser user) throws NoSuchFieldException, IllegalAccessException {
         userService.checkUserAllowed(user);
         userService.checkUserAllowed(user);
@@ -423,7 +433,7 @@ public class SysUserController extends BaseController {
      * 删除用户
      * 删除用户
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @Log(title = "用户管理删除", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     @DeleteMapping("/{userIds}")
     public AjaxResult remove(@PathVariable List<Long> userIds) {
     public AjaxResult remove(@PathVariable List<Long> userIds) {
         if (userIds.contains(getUserId())) {
         if (userIds.contains(getUserId())) {
@@ -433,7 +443,7 @@ public class SysUserController extends BaseController {
     }
     }
 
 
 //    @PreAuthorize("@ss.hasPermi('system:user:remove')")
 //    @PreAuthorize("@ss.hasPermi('system:user:remove')")
-    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除工段下员工信息", businessType = BusinessType.DELETE)
     @PostMapping("/delDeptUser")
     @PostMapping("/delDeptUser")
     public AjaxResult delDeptUser(@RequestBody List<SysDeptUser> deptUsers) {
     public AjaxResult delDeptUser(@RequestBody List<SysDeptUser> deptUsers) {
         Long userId = SecurityUtils.getLoginUser().getUserId();
         Long userId = SecurityUtils.getLoginUser().getUserId();
@@ -454,7 +464,7 @@ public class SysUserController extends BaseController {
      * 重置密码
      * 重置密码
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "用户管理重置密码", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
     public AjaxResult resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserAllowed(user);
@@ -468,7 +478,7 @@ public class SysUserController extends BaseController {
      * 状态修改
      * 状态修改
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @Log(title = "用户管理状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
     public AjaxResult changeStatus(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserAllowed(user);
@@ -481,6 +491,7 @@ public class SysUserController extends BaseController {
      * 根据用户编号获取授权角色
      * 根据用户编号获取授权角色
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @Log(title = "根据用户编号获取授权角色", businessType = BusinessType.UPDATE)
     @GetMapping("/authRole/{userId}")
     @GetMapping("/authRole/{userId}")
     public AjaxResult authRole(@PathVariable("userId") Long userId) {
     public AjaxResult authRole(@PathVariable("userId") Long userId) {
         AjaxResult ajax = AjaxResult.success();
         AjaxResult ajax = AjaxResult.success();
@@ -496,7 +507,7 @@ public class SysUserController extends BaseController {
      * 用户授权角色
      * 用户授权角色
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @Log(title = "用户管理授权角色", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
     @PutMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
         userService.checkUserDataScope(userId);
         userService.checkUserDataScope(userId);
@@ -507,6 +518,7 @@ public class SysUserController extends BaseController {
     /**
     /**
      * 获取部门树列表
      * 获取部门树列表
      */
      */
+    @Log(title = "获取部门树列表", businessType = BusinessType.SELECT)
     @GetMapping("/deptTree")
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
     public AjaxResult deptTree(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
         String tenantId = request.getHeader("tenantId");
         String tenantId = request.getHeader("tenantId");
@@ -515,6 +527,7 @@ public class SysUserController extends BaseController {
         dept.setTenantId(Long.valueOf(tenantId));
         dept.setTenantId(Long.valueOf(tenantId));
         return success(deptService.selectDeptTreeList(dept));
         return success(deptService.selectDeptTreeList(dept));
     }
     }
+    @Log(title = "工段下内部周转用户", businessType = BusinessType.SELECT)
     @GetMapping("/listInnerUserByDeptId")
     @GetMapping("/listInnerUserByDeptId")
     public TableDataInfo listInnerUserByDeptId(SysDept sysDept) {
     public TableDataInfo listInnerUserByDeptId(SysDept sysDept) {
         startPage();
         startPage();
@@ -524,6 +537,7 @@ public class SysUserController extends BaseController {
      * 根据userName获取id
      * 根据userName获取id
      */
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @Log(title = "用户管理,根据userName获取id", businessType = BusinessType.SELECT)
     @GetMapping("/getUserByCode")
     @GetMapping("/getUserByCode")
     public SysUser getUserByCode(String userName) {
     public SysUser getUserByCode(String userName) {