From 3fd035f129e9a6ce42c655f02f95f2cea617cc19 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Tue, 15 Apr 2025 14:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/base/address/controller/AddressController.java | 7 +++++++ .../wms/base/area/controller/AreaController.java | 5 +++++ .../wms/base/customer/controller/CustomerController.java | 5 +++++ .../wms/base/item/controller/ItemController.java | 7 +++++++ .../wms/base/location/controller/LocationController.java | 9 +++++++++ .../wms/base/stock/controller/StockController.java | 7 +++++++ .../wms/inventory/controller/InventoryController.java | 6 ++++++ .../module/business/wms/receive/ReceiveController.java | 4 +++- .../wms/receive/asn/controller/AsnController.java | 6 +++++- .../asnDetail/controller/AsnDetailController.java | 5 +++++ .../module/support/operatelog/core/OperateLogAspect.java | 3 +++ .../support/operatelog/domain/OperateLogEntity.java | 5 +++++ .../module/support/operatelog/domain/OperateLogVO.java | 3 +++ 13 files changed, 70 insertions(+), 2 deletions(-) diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/controller/AddressController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/controller/AddressController.java index f7b3580..c242c2d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/controller/AddressController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/controller/AddressController.java @@ -22,6 +22,7 @@ import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartExcelUtil; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; @@ -63,6 +64,7 @@ public class AddressController { @Operation(summary = "添加 @author hj") @PostMapping("/address/add") @SaCheckPermission("address:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid AddressAddForm addForm) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); addForm.setCreateUserId(requestUser.getUserId()); @@ -73,6 +75,7 @@ public class AddressController { @Operation(summary = "更新 @author hj") @PostMapping("/address/update") @SaCheckPermission("address:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid AddressUpdateForm updateForm) { return addressService.update(updateForm); } @@ -80,6 +83,7 @@ public class AddressController { @Operation(summary = "批量删除 @author hj") @PostMapping("/address/batchDelete") @SaCheckPermission("address:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return addressService.batchDelete(idList); } @@ -87,6 +91,7 @@ public class AddressController { @Operation(summary = "单个删除 @author hj") @GetMapping("/address/delete") @SaCheckPermission("address:delete") + @OperateLog public ResponseDTO delete(@RequestParam Long addressId) { return addressService.delete(addressId); } @@ -100,6 +105,7 @@ public class AddressController { @Operation(summary = "导入 霍锦") @PostMapping("/address/importAddress") @SaCheckPermission("address:importAddress") + @OperateLog public ResponseDTO importAddress(@RequestParam MultipartFile file) { return addressService.importAddress(file); } @@ -107,6 +113,7 @@ public class AddressController { @Operation(summary = "导出 霍锦") @GetMapping("/address/exportAddress") @SaCheckPermission("address:exportAddress") + @OperateLog public void exportAddress(HttpServletResponse response) throws IOException { List addressList = addressQueryService.getAddressExcelVOList(); SmartExcelUtil.exportExcel(response, "收货地址信息.xlsx", "收货地址", AddressExcelVO.class, addressList); diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/controller/AreaController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/controller/AreaController.java index 5e8795a..82aedee 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/controller/AreaController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/controller/AreaController.java @@ -14,6 +14,7 @@ import net.lab1024.sa.admin.module.business.wms.base.area.service.AreaQueryServi import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; @@ -53,6 +54,7 @@ public class AreaController { @Operation(summary = "添加 @author hj") @PostMapping("/area/add") @SaCheckPermission("area:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid AreaAddForm addForm) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); addForm.setCreateUserId(requestUser.getUserId()); @@ -63,6 +65,7 @@ public class AreaController { @Operation(summary = "更新 @author hj") @PostMapping("/area/update") @SaCheckPermission("area:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid AreaUpdateForm updateForm) { return areaService.update(updateForm); } @@ -70,6 +73,7 @@ public class AreaController { @Operation(summary = "批量删除 @author hj") @PostMapping("/area/batchDelete") @SaCheckPermission("area:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return areaService.batchDelete(idList); } @@ -77,6 +81,7 @@ public class AreaController { @Operation(summary = "单个删除 @author hj") @GetMapping("/area/delete") @SaCheckPermission("area:delete") + @OperateLog public ResponseDTO batchDelete(@RequestParam Long areaId) { return areaService.delete(areaId); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/controller/CustomerController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/controller/CustomerController.java index 59ae9a8..aced5b0 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/controller/CustomerController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/controller/CustomerController.java @@ -14,6 +14,7 @@ import net.lab1024.sa.admin.module.business.wms.base.customer.service.CustomerSe import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; @@ -53,6 +54,7 @@ public class CustomerController { @Operation(summary = "添加 @author 霍锦") @PostMapping("/customer/add") @SaCheckPermission("customer:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid CustomerAddForm addForm) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); addForm.setCreateUserId(requestUser.getUserId()); @@ -63,6 +65,7 @@ public class CustomerController { @Operation(summary = "更新 @author 霍锦") @PostMapping("/customer/update") @SaCheckPermission("customer:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid CustomerUpdateForm updateForm) { return customerService.update(updateForm); } @@ -70,6 +73,7 @@ public class CustomerController { @Operation(summary = "批量删除 @author 霍锦") @PostMapping("/customer/batchDelete") @SaCheckPermission("customer:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return customerService.batchDelete(idList); } @@ -77,6 +81,7 @@ public class CustomerController { @Operation(summary = "单个删除 @author 霍锦") @GetMapping("/customer/delete") @SaCheckPermission("customer:delete") + @OperateLog public ResponseDTO delete(@RequestParam Long customerId) { return customerService.delete(customerId); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java index f0f4377..abd8a74 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java @@ -19,6 +19,7 @@ import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartExcelUtil; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import io.swagger.v3.oas.annotations.tags.Tag; @@ -59,6 +60,7 @@ public class ItemController { @Operation(summary = "添加 @author 霍锦") @PostMapping("/item/add") @SaCheckPermission("item:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid ItemAddForm addForm) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); addForm.setCreateUserId(requestUser.getUserId()); @@ -69,6 +71,7 @@ public class ItemController { @Operation(summary = "更新 @author 霍锦") @PostMapping("/item/update") @SaCheckPermission("item:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid ItemUpdateForm updateForm) { return itemService.update(updateForm); } @@ -76,6 +79,7 @@ public class ItemController { @Operation(summary = "批量删除 @author 霍锦") @PostMapping("/item/batchDelete") @SaCheckPermission("item:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return itemService.batchDelete(idList); } @@ -83,6 +87,7 @@ public class ItemController { @Operation(summary = "单个删除 @author 霍锦") @GetMapping("/item/delete") @SaCheckPermission("item:delete") + @OperateLog public ResponseDTO batchDelete(@RequestParam Long itemId) { return itemService.delete(itemId); } @@ -96,6 +101,7 @@ public class ItemController { @Operation(summary = "导入 霍锦") @PostMapping("/item/importItems") @SaCheckPermission("item:importItems") + @OperateLog public ResponseDTO importItems(@RequestParam MultipartFile file) { return itemService.importItems(file); } @@ -103,6 +109,7 @@ public class ItemController { @Operation(summary = "导出 霍锦") @GetMapping("/item/exportItems") @SaCheckPermission("item:exportItems") + @OperateLog public void exportItems(HttpServletResponse response) throws IOException { List itemsList = itemQueryService.getItemsExcelVOList(); SmartExcelUtil.exportExcel(response, "物料信息.xlsx", "物料", ItemsExcelVO.class, itemsList); diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/controller/LocationController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/controller/LocationController.java index 1acdb50..5685142 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/controller/LocationController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/controller/LocationController.java @@ -10,6 +10,7 @@ import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartExcelUtil; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; @@ -51,6 +52,7 @@ public class LocationController { @Operation(summary = "添加 @author 霍锦") @PostMapping("/location/add") @SaCheckPermission("location:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid LocationAddForm addForm) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); addForm.setCreateUserId(requestUser.getUserId()); @@ -61,6 +63,7 @@ public class LocationController { @Operation(summary = "更新 @author 霍锦") @PostMapping("/location/update") @SaCheckPermission("location:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid LocationUpdateForm updateForm) { return locationService.update(updateForm); } @@ -68,6 +71,7 @@ public class LocationController { @Operation(summary = "批量删除 @author 霍锦") @PostMapping("/location/batchDelete") @SaCheckPermission("location:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return locationService.batchDelete(idList); } @@ -75,6 +79,7 @@ public class LocationController { @Operation(summary = "单个删除 @author 霍锦") @GetMapping("/location/delete") @SaCheckPermission("location:delete") + @OperateLog public ResponseDTO batchDelete(@RequestParam Long locationId) { return locationService.delete(locationId); } @@ -88,6 +93,7 @@ public class LocationController { @Operation(summary = "批量调整 霍锦") @PostMapping("/location/multipleAdjust") @SaCheckPermission("location:multipleAdjust") + @OperateLog public ResponseDTO multipleAdjust(@RequestBody @Valid MultipleAdjust multipleAdjust) { return locationService.multipleAdjust(multipleAdjust); } @@ -95,6 +101,7 @@ public class LocationController { @Operation(summary = "批量新建 霍锦") @PostMapping("/location/multipleInsert") @SaCheckPermission("location:multipleInsert") + @OperateLog public ResponseDTO multipleInsert(@RequestBody @Valid MultipleInsert multipleInsert) { return locationService.multipleInsert(multipleInsert); } @@ -102,6 +109,7 @@ public class LocationController { @Operation(summary = "导入 霍锦") @PostMapping("/location/importLocations") @SaCheckPermission("location:importLocations") + @OperateLog public ResponseDTO importLocations(@RequestParam MultipartFile file) { return locationService.importLocations(file); } @@ -109,6 +117,7 @@ public class LocationController { @Operation(summary = "导出 霍锦") @GetMapping("/location/exportLocations") @SaCheckPermission("location:exportLocations") + @OperateLog public void exportLocations(HttpServletResponse response) throws IOException { List locationsList = locationQueryService.getLocationsExcelVOList(); SmartExcelUtil.exportExcel(response, "库位信息.xlsx", "库位", LocationsExcelVO.class, locationsList); diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/controller/StockController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/controller/StockController.java index a486772..a84c886 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/controller/StockController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/controller/StockController.java @@ -19,6 +19,7 @@ import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartExcelUtil; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; @@ -60,6 +61,7 @@ public class StockController { @Operation(summary = "添加 @author 霍锦") @PostMapping("/stock/add") @SaCheckPermission("stock:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid StockAddForm addForm) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); addForm.setCreateUserId(requestUser.getUserId()); @@ -70,6 +72,7 @@ public class StockController { @Operation(summary = "更新 @author 霍锦") @PostMapping("/stock/update") @SaCheckPermission("stock:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid StockUpdateForm updateForm) { return stockService.update(updateForm); } @@ -77,6 +80,7 @@ public class StockController { @Operation(summary = "批量删除 @author 霍锦") @PostMapping("/stock/batchDelete") @SaCheckPermission("stock:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return stockService.batchDelete(idList); } @@ -84,6 +88,7 @@ public class StockController { @Operation(summary = "单个删除 @author 霍锦") @GetMapping("/stock/delete") @SaCheckPermission("stock:delete") + @OperateLog public ResponseDTO delete(@RequestParam Long stockId) { return stockService.delete(stockId); } @@ -97,6 +102,7 @@ public class StockController { @Operation(summary = "导入 霍锦") @PostMapping("/stock/importStocks") @SaCheckPermission("stock:importStocks") + @OperateLog public ResponseDTO importStocks(@RequestParam MultipartFile file) { return stockService.importStocks(file); } @@ -104,6 +110,7 @@ public class StockController { @Operation(summary = "导出 霍锦") @GetMapping("/stock/exportStocks") @SaCheckPermission("stock:exportStocks") + @OperateLog public void stock(HttpServletResponse response) throws IOException { List stocksList = stockQueryService.getStocksExcelVOList(); SmartExcelUtil.exportExcel(response, "容器信息.xlsx", "容器", StocksExcelVO.class, stocksList); diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/controller/InventoryController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/controller/InventoryController.java index 63c07bd..6c1944f 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/controller/InventoryController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/controller/InventoryController.java @@ -7,6 +7,7 @@ import net.lab1024.sa.admin.module.business.wms.inventory.domain.vo.InventoryVO; import net.lab1024.sa.admin.module.business.wms.inventory.service.InventoryQueryService; import net.lab1024.sa.admin.module.business.wms.inventory.service.InventoryService; import net.lab1024.sa.base.common.domain.ValidateList; +import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; @@ -26,6 +27,7 @@ import jakarta.validation.Valid; @RestController @Tag(name = "库存信息") +@OperateLog public class InventoryController { @Resource @@ -44,6 +46,7 @@ public class InventoryController { @Operation(summary = "添加 @author 霍锦") @PostMapping("/inventory/add") @SaCheckPermission("inventory:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid InventoryAddForm addForm) { return inventoryService.add(addForm); } @@ -51,6 +54,7 @@ public class InventoryController { @Operation(summary = "更新 @author 霍锦") @PostMapping("/inventory/update") @SaCheckPermission("inventory:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid InventoryUpdateForm updateForm) { return inventoryService.update(updateForm); } @@ -58,6 +62,7 @@ public class InventoryController { @Operation(summary = "批量删除 @author 霍锦") @PostMapping("/inventory/batchDelete") @SaCheckPermission("inventory:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return inventoryService.batchDelete(idList); } @@ -65,6 +70,7 @@ public class InventoryController { @Operation(summary = "单个删除 @author 霍锦") @GetMapping("/inventory/delete") @SaCheckPermission("inventory:delete") + @OperateLog public ResponseDTO delete(@RequestParam Long inventoryId) { return inventoryService.delete(inventoryId); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveController.java index 98d2ada..deb3855 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/ReceiveController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Tag(name = "收货") -@OperateLog + public class ReceiveController { @Resource @@ -24,6 +24,7 @@ public class ReceiveController { @Operation(summary = "批量收货 @author 霍锦") @PostMapping("/receive/batchReceive") @SaCheckPermission("receive:batchReceive") + @OperateLog public ResponseDTO batchReceive(@RequestBody BatchReceiveForm batchReceiveForm) { return receiveService.batchReceive(batchReceiveForm); } @@ -31,6 +32,7 @@ public class ReceiveController { @Operation(summary = "批量退货 @author 霍锦") @PostMapping("/receive/batchReturn") @SaCheckPermission("receive:batchReturn") + @OperateLog public ResponseDTO batchReturn(@RequestBody BatchReturnForm batchReturnForm) { return receiveService.batchReturn(batchReturnForm); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/controller/AsnController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/controller/AsnController.java index fa782e2..46f7f8e 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/controller/AsnController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/controller/AsnController.java @@ -34,7 +34,6 @@ import jakarta.validation.Valid; @RestController @Tag(name = "入库单") -@OperateLog public class AsnController { @Resource @@ -43,6 +42,7 @@ public class AsnController { @Resource private AsnQueryService asnQueryService; + @Operation(summary = "分页查询 @author 霍锦") @PostMapping("/asn/queryPage") @SaCheckPermission("asn:query") public ResponseDTO> queryPage(@RequestBody @Valid AsnQueryForm queryForm) { @@ -52,6 +52,7 @@ public class AsnController { @Operation(summary = "添加 @author 霍锦") @PostMapping("/asn/add") @SaCheckPermission("asn:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid AsnAddForm addForm) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); addForm.setCreateUserId(requestUser.getUserId()); @@ -62,6 +63,7 @@ public class AsnController { @Operation(summary = "更新 @author 霍锦") @PostMapping("/asn/update") @SaCheckPermission("asn:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid AsnUpdateForm updateForm) { return asnService.update(updateForm); } @@ -69,6 +71,7 @@ public class AsnController { @Operation(summary = "批量删除 @author 霍锦") @PostMapping("/asn/batchDelete") @SaCheckPermission("asn:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return asnService.batchDelete(idList); } @@ -76,6 +79,7 @@ public class AsnController { @Operation(summary = "单个删除 @author 霍锦") @GetMapping("/asn/delete") @SaCheckPermission("asn:delete") + @OperateLog public ResponseDTO delete(@RequestParam Long asnId) { return asnService.delete(asnId); } diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/controller/AsnDetailController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/controller/AsnDetailController.java index f43f8be..4760b59 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/controller/AsnDetailController.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/controller/AsnDetailController.java @@ -15,6 +15,7 @@ import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.service.AsnDet import net.lab1024.sa.base.common.domain.RequestUser; import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.util.SmartRequestUtil; +import net.lab1024.sa.base.module.support.operatelog.annotation.OperateLog; import org.springframework.web.bind.annotation.*; import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.PageResult; @@ -52,6 +53,7 @@ public class AsnDetailController { @Operation(summary = "添加 @author 霍锦") @PostMapping("/asnDetail/add") @SaCheckPermission("asnDetail:add") + @OperateLog public ResponseDTO add(@RequestBody @Valid AsnDetailAddForm addForm) { RequestUser requestUser = SmartRequestUtil.getRequestUser(); addForm.setCreateUserId(requestUser.getUserId()); @@ -62,6 +64,7 @@ public class AsnDetailController { @Operation(summary = "更新 @author 霍锦") @PostMapping("/asnDetail/update") @SaCheckPermission("asnDetail:update") + @OperateLog public ResponseDTO update(@RequestBody @Valid AsnDetailUpdateForm updateForm) { return asnDetailService.update(updateForm); } @@ -69,6 +72,7 @@ public class AsnDetailController { @Operation(summary = "批量删除 @author 霍锦") @PostMapping("/asnDetail/batchDelete") @SaCheckPermission("asnDetail:batchDelete") + @OperateLog public ResponseDTO batchDelete(@RequestBody ValidateList idList) { return asnDetailService.batchDelete(idList); } @@ -76,6 +80,7 @@ public class AsnDetailController { @Operation(summary = "单个删除 @author 霍锦") @GetMapping("/asnDetail/delete") @SaCheckPermission("asnDetail:delete") + @OperateLog public ResponseDTO delete(@RequestParam Long asnDetailId) { return asnDetailService.delete(asnDetailId); } diff --git a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java index 19349e7..5cc8ebd 100644 --- a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java +++ b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java @@ -178,6 +178,7 @@ public abstract class OperateLogAspect { * @throws Exception */ private void submitLog(final JoinPoint joinPoint, final Throwable e) throws Exception { + long startTime = System.currentTimeMillis(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); //设置用户信息 RequestUser user = SmartRequestUtil.getRequestUser(); @@ -219,6 +220,8 @@ public abstract class OperateLogAspect { String name = api.name(); operateLogEntity.setModule(StrUtil.join(",", name)); } + long endTime = System.currentTimeMillis(); + operateLogEntity.setTimes((endTime - startTime)); taskExecutor.execute(() -> { this.saveLog(operateLogEntity); }); diff --git a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java index 4f83b1d..42831da 100644 --- a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java +++ b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogEntity.java @@ -107,5 +107,10 @@ public class OperateLogEntity { */ private LocalDateTime createTime; + /** + * 耗时 + */ + private Long times; + } diff --git a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java index 9cf3529..646a92b 100644 --- a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java +++ b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/domain/OperateLogVO.java @@ -62,6 +62,9 @@ public class OperateLogVO { @Schema(description = "失败原因") private String failReason; + @Schema(description = "耗时") + private Long times; + @Schema(description = "更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime updateTime;