From 24dc810bcb4d79b0757f56b046013053ec4dade8 Mon Sep 17 00:00:00 2001 From: xia Date: Wed, 17 Aug 2022 10:31:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../archives/controller/ArchivesController.java | 8 ++++++++ .../archives/controller/ArrangeController.java | 5 +++++ .../archives/controller/BorrowController.java | 12 ++++++++++++ .../modules/archives/controller/CaseController.java | 5 +++++ .../modules/archives/controller/RFIDController.java | 3 +++ .../archives/controller/StorageController.java | 9 +++++++++ .../modules/archives/controller/TagController.java | 4 ++++ 7 files changed, 46 insertions(+) diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java index 59a8857..aed50af 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/ArchivesController.java @@ -1,6 +1,7 @@ package com.storeroom.modules.archives.controller; import com.storeroom.annotaion.rest.AnonymousGetMapping; +import com.storeroom.annotation.Log; import com.storeroom.modules.archives.service.ArchivesService; import com.storeroom.modules.archives.service.dto.ArchivesDTO; import com.storeroom.modules.archives.service.dto.ArchivesFileDTO; @@ -132,6 +133,7 @@ public class ArchivesController { @ApiOperation("档案编辑") @PostMapping("/edit") + @Log(value = "档案编辑",apiAddress = "/api/archives/edit") public ApiResponse edit( @Validated @RequestBody ArchivesDTO dto ){ @@ -148,6 +150,7 @@ public class ArchivesController { @ApiOperation("编辑档案附件") @PostMapping("/editFile") + @Log(value = "编辑档案附件",apiAddress = "/api/archives/editFile") public ApiResponse editFile( @Validated @RequestBody ArchivesFileDTO dto ){ @@ -156,6 +159,7 @@ public class ArchivesController { @ApiOperation("档案附件排序") @PostMapping("/fileSort") + @Log(value = "档案附件排序",apiAddress = "/api/archives/fileSort") public ApiResponse fileSort( @Validated @RequestBody ArchivesFileDTO dto ){ @@ -164,6 +168,7 @@ public class ArchivesController { @ApiOperation("删除档案附件") @PostMapping("/deleteFile") + @Log(value = "删除档案附件",apiAddress = "/api/archives/deleteFile") public ApiResponse deleteFile( @Validated @RequestBody ArchivesFileDTO dto ){ @@ -172,6 +177,7 @@ public class ArchivesController { @ApiOperation("档案删除") @PostMapping("/delete") + @Log(value = "档案删除",apiAddress = "/api/archives/delete") public ApiResponse delete( @Validated @RequestBody ArchivesDTO dto ){ @@ -181,6 +187,7 @@ public class ArchivesController { @ApiOperation("档案还原") @PostMapping("/reduction") + @Log(value = "档案还原",apiAddress = "/api/archives/reduction") public ApiResponse reduction( @Validated @RequestBody ArchivesDTO dto ){ @@ -189,6 +196,7 @@ public class ArchivesController { @ApiOperation("档案回收站删除") @PostMapping("/completelyDelete") + @Log(value = "档案回收站删除",apiAddress = "/api/archives/completelyDelete") public ApiResponse completelyDelete( @Validated @RequestBody ArchivesDTO dto ){ diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/ArrangeController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/ArrangeController.java index 276bce7..6aca514 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/ArrangeController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/ArrangeController.java @@ -1,6 +1,7 @@ package com.storeroom.modules.archives.controller; import com.storeroom.annotaion.rest.AnonymousGetMapping; +import com.storeroom.annotation.Log; import com.storeroom.modules.archives.domain.ArchivesCheckBill; import com.storeroom.modules.archives.domain.ArchivesCheckBillDetails; import com.storeroom.modules.archives.domain.vo.BorrowBillDetailsVO; @@ -46,6 +47,7 @@ public class ArrangeController { @ApiOperation("新增盘点") @PostMapping("/addArrange") + @Log(value = "新增盘点",apiAddress = "/api/arrange/addArrange") public ApiResponse addArrange( @Validated @RequestBody ArrangeAddDTO dto ){ @@ -78,6 +80,7 @@ public class ArrangeController { @ApiOperation("结算盘点") @PostMapping("/settlement") + @Log(value = "结算盘点",apiAddress = "/api/arrange/settlement") public ApiResponse settlement( @Validated @RequestBody ArrangeAddDTO dto ){ @@ -86,6 +89,7 @@ public class ArrangeController { @ApiOperation("清空完结盘点缓存数据") @PostMapping("/clean") + @Log(value = "清空完结盘点缓存数据",apiAddress = "/api/arrange/clean") public ApiResponse clean() { Date date = new Date(); @@ -97,6 +101,7 @@ public class ArrangeController { @ApiOperation("删除盘点") @PostMapping("/del") + @Log(value = "删除盘点",apiAddress = "/api/arrange/del") public ApiResponse del( @Validated @RequestBody List orderIds ){ diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java index 679650f..cb6bb0a 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/BorrowController.java @@ -1,6 +1,7 @@ package com.storeroom.modules.archives.controller; import com.storeroom.annotaion.rest.AnonymousGetMapping; +import com.storeroom.annotation.Log; import com.storeroom.modules.archives.domain.Borrower; import com.storeroom.modules.archives.domain.vo.BorrowBillDetailsVO; import com.storeroom.modules.archives.service.ArchivesTagService; @@ -45,6 +46,7 @@ public class BorrowController { @ApiOperation("更改借阅流程管理在线离线") @PostMapping("/updateBorrowRule") + @Log(value = "更改借阅流程管理在线离线",apiAddress = "/api/borrow/updateBorrowRule") public ApiResponse updateBorrowRule( @Validated @RequestBody boolean isType ){ @@ -70,6 +72,7 @@ public class BorrowController { @ApiOperation("添加档案到待借阅列表") @PostMapping("/addArchivesWaitRegister") + @Log(value = "添加档案到待借阅列表",apiAddress = "/api/borrow/addArchivesWaitRegister") public ApiResponse addArchivesWaitRegister( @Validated @RequestBody List archiveIds ){ @@ -78,6 +81,7 @@ public class BorrowController { @ApiOperation("移出待登记档案") @PostMapping("/delWaitBorrow") + @Log(value = "移出待登记档案",apiAddress = "/api/borrow/delWaitBorrow") public ApiResponse delWaitRegister( @Validated @RequestBody List baIds ){ @@ -94,6 +98,7 @@ public class BorrowController { @ApiOperation("登记借出") @PostMapping("/registerBorrow") + @Log(value = "登记借出",apiAddress = "/api/borrow/registerBorrow") public ApiResponse registerBorrow( @Validated @RequestBody RegisterBorrowDTO dto ){ @@ -117,6 +122,7 @@ public class BorrowController { @ApiOperation("借阅档案异常处理") @PostMapping("/borrowException") + @Log(value = "借阅档案异常处理",apiAddress = "/api/borrow/borrowException") public ApiResponse borrowException( @Validated @RequestBody List baIds ){ @@ -141,6 +147,7 @@ public class BorrowController { @ApiOperation("重新登记") @PostMapping("/reRegister") + @Log(value = "重新登记",apiAddress = "/api/borrow/reRegister") public ApiResponse reRegister( @Validated @RequestBody List orderNos ){ @@ -149,6 +156,7 @@ public class BorrowController { @ApiOperation("移出待借阅清单") @PostMapping("/removeWaitBorrow") + @Log(value = "移出待借阅清单",apiAddress = "/api/borrow/removeWaitBorrow") public ApiResponse removeWaitBorrow( @Validated @RequestBody List orderNos ){ @@ -174,6 +182,7 @@ public class BorrowController { @ApiOperation("借出确认") @PostMapping("/billBorrowConfirm") + @Log(value = "借出确认",apiAddress = "/api/borrow/billBorrowConfirm") public ApiResponse billBorrowConfirm( @Validated @RequestBody List orderNos ){ @@ -191,6 +200,7 @@ public class BorrowController { @ApiOperation("归还确认") @PostMapping("/archivesReturnConfirm") + @Log(value = "归还确认",apiAddress = "/api/borrow/archivesReturnConfirm") public ApiResponse archivesReturnConfirm( @Validated @RequestBody List rbIds ){ @@ -216,6 +226,7 @@ public class BorrowController { @ApiOperation("编辑借阅者") @PostMapping("/editBorrower") + @Log(value = "编辑借阅者",apiAddress = "/api/borrow/editBorrower") public ApiResponse editBorrower( @Validated @RequestBody BorrowerDTO dto ){ @@ -224,6 +235,7 @@ public class BorrowController { @ApiOperation("删除借阅者") @PostMapping("/deleteBorrower") + @Log(value = "删除借阅者",apiAddress = "/api/borrow/deleteBorrower") public ApiResponse deleteBorrower( @Validated @RequestBody List borrowersId ){ diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java index 22fa4ef..c4ac4d9 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/CaseController.java @@ -2,6 +2,7 @@ package com.storeroom.modules.archives.controller; import cn.hutool.json.JSONObject; import com.storeroom.annotaion.rest.AnonymousGetMapping; +import com.storeroom.annotation.Log; import com.storeroom.modules.archives.domain.ArchivesCase; import com.storeroom.modules.archives.domain.ArchivesCaseLog; import com.storeroom.modules.common.ExcelUtil; @@ -76,6 +77,7 @@ public class CaseController { @ApiOperation("档案盒编辑") @PostMapping("/edit") + @Log(value = "档案盒编辑",apiAddress = "/api/case/edit") public ApiResponse edit( @Validated @RequestBody CaseDTO dto ){ @@ -121,6 +123,7 @@ public class CaseController { @ApiOperation("装盒") @PostMapping("/cartoning") + @Log(value = "装盒",apiAddress = "/api/case/cartoning") public ApiResponse cartoning( @Validated @RequestBody List dtos ){ @@ -137,6 +140,7 @@ public class CaseController { @ApiOperation("拆盒") @PostMapping("/unpacking") + @Log(value = "拆盒",apiAddress = "/api/case/unpacking") public ApiResponse unpacking( @Validated @RequestBody List caseId ){ @@ -153,6 +157,7 @@ public class CaseController { @ApiOperation("删除盒") @PostMapping("/del") + @Log(value = "删除盒",apiAddress = "/api/case/del") public ApiResponse del( @Validated @RequestBody List caseId ){ diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java index 6ff243b..c449495 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; +import com.storeroom.annotation.Log; import com.storeroom.modules.archives.domain.ArchivesCheckBillData; import com.storeroom.modules.archives.service.ArchivesTagService; import com.storeroom.modules.archives.service.ArrangeService; @@ -280,6 +281,7 @@ public class RFIDController { @ApiOperation("借出确认") @AnonymousPostMapping("/billBorrowConfirm") + @Log(value = "手持机-借出确认",apiAddress = "/api/RFID/billBorrowConfirm") public ApiResponse billBorrowConfirm( @Validated @RequestBody RFIDBorrowOkDTO dto ){ @@ -289,6 +291,7 @@ public class RFIDController { @ApiOperation("归还确认") @AnonymousPostMapping("/archivesReturnConfirm") + @Log(value = "手持机-归还确认",apiAddress = "/api/RFID/archivesReturnConfirm") public ApiResponse archivesReturnConfirm( @Validated @RequestBody List rbIds ){ diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java index 5d8eb81..23838e1 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/StorageController.java @@ -3,6 +3,7 @@ package com.storeroom.modules.archives.controller; import com.alibaba.fastjson.JSONObject; import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; +import com.storeroom.annotation.Log; import com.storeroom.modules.archives.domain.ArchivesCase; import com.storeroom.modules.archives.domain.ArchivesSummary; import com.storeroom.modules.archives.domain.ArchivesTagLog; @@ -115,6 +116,7 @@ public class StorageController { @ApiOperation("入库") @PostMapping("/collect") + @Log(value = "入库",apiAddress = "/api/storage/collect") public ApiResponse collect( @Validated @RequestBody List dtos ){ @@ -168,6 +170,7 @@ public class StorageController { @ApiOperation("出库") @PostMapping("/grant") + @Log(value = "出库",apiAddress = "/api/storage/grant") public ApiResponse grant( @Validated @RequestBody List caseIds ){ @@ -227,6 +230,7 @@ public class StorageController { @ApiOperation("手持机-入库") @AnonymousPostMapping("/rfidCollect") + @Log(value = "手持机-入库",apiAddress = "/api/storage/rfidCollect") public ApiResponse rfidCollect( @Validated @RequestBody List dtos ){ @@ -236,6 +240,7 @@ public class StorageController { @ApiOperation("手持机-出库") @AnonymousPostMapping("/rfidGrant") + @Log(value = "手持机-出库",apiAddress = "/api/storage/rfidGrant") public ApiResponse rfidGrant( @Validated @RequestBody List dtos ){ @@ -279,6 +284,7 @@ public class StorageController { @ApiOperation("预人工确认") @PostMapping("/readyCollectConfirm") + @Log(value = "预人工确认",apiAddress = "/api/storage/readyCollectConfirm") public ApiResponse readyCollectConfirm( @Validated @RequestBody List caseIds ){ @@ -287,6 +293,7 @@ public class StorageController { @ApiOperation("人工确认-入库") @PostMapping("/collectConfirm") + @Log(value = "人工确认-入库",apiAddress = "/api/storage/collectConfirm") public ApiResponse collectConfirm( @Validated @RequestBody List caseIds ){ @@ -295,6 +302,7 @@ public class StorageController { @ApiOperation("人工确认-出库") @PostMapping("/grantConfirm") + @Log(value = "人工确认-出库",apiAddress = "/api/storage/grantConfirm") public ApiResponse grantConfirm( @Validated @RequestBody List caseIds ){ @@ -303,6 +311,7 @@ public class StorageController { @ApiOperation("外部回调-确认出入库") @AnonymousPostMapping("/externalCallback") + @Log(value = "外部回调-确认出入库",apiAddress = "/api/storage/externalCallback") public ApiResponse externalCallback( @Validated @RequestBody String json ){ diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/TagController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/TagController.java index 80a2de7..2e97775 100644 --- a/archives/src/main/java/com/storeroom/modules/archives/controller/TagController.java +++ b/archives/src/main/java/com/storeroom/modules/archives/controller/TagController.java @@ -1,6 +1,7 @@ package com.storeroom.modules.archives.controller; import com.storeroom.annotaion.rest.AnonymousGetMapping; +import com.storeroom.annotation.Log; import com.storeroom.modules.archives.domain.ArchivesTagLog; import com.storeroom.modules.archives.service.ArchivesTagService; import com.storeroom.modules.archives.service.dto.CaseDTO; @@ -41,6 +42,7 @@ public class TagController { @ApiOperation("绑定标签") @PostMapping("/bingdingLabel") + @Log(value = "绑定标签",apiAddress = "/api/tag/bingdingLabel") public ApiResponse bingdingLabel( @Validated @RequestBody CaseDTO dto ){ @@ -55,6 +57,7 @@ public class TagController { @ApiOperation("解绑标签") @PostMapping("/unbindTag") + @Log(value = "解绑标签",apiAddress = "/api/tag/unbindTag") public ApiResponse unbindTag( @Validated @RequestBody List dtos ){ @@ -71,6 +74,7 @@ public class TagController { @ApiOperation("根据tid更改报警信息") @PostMapping("/updateEasByTid") + @Log(value = "根据tid更改报警信息",apiAddress = "/api/tag/updateEasByTid") public ApiResponse updateEasByTid( @Validated @RequestBody List dtos ){