增加操作记录日志

main
HUOJIN\92525 2025-04-15 14:57:39 +08:00
parent 0f9fbc9544
commit 3fd035f129
13 changed files with 70 additions and 2 deletions

View File

@ -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.domain.ValidateList;
import net.lab1024.sa.base.common.util.SmartExcelUtil; import net.lab1024.sa.base.common.util.SmartExcelUtil;
import net.lab1024.sa.base.common.util.SmartRequestUtil; 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 org.springframework.web.bind.annotation.*;
import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.PageResult;
@ -63,6 +64,7 @@ public class AddressController {
@Operation(summary = "添加 @author hj") @Operation(summary = "添加 @author hj")
@PostMapping("/address/add") @PostMapping("/address/add")
@SaCheckPermission("address:add") @SaCheckPermission("address:add")
@OperateLog
public ResponseDTO<String> add(@RequestBody @Valid AddressAddForm addForm) { public ResponseDTO<String> add(@RequestBody @Valid AddressAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser(); RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setCreateUserId(requestUser.getUserId()); addForm.setCreateUserId(requestUser.getUserId());
@ -73,6 +75,7 @@ public class AddressController {
@Operation(summary = "更新 @author hj") @Operation(summary = "更新 @author hj")
@PostMapping("/address/update") @PostMapping("/address/update")
@SaCheckPermission("address:update") @SaCheckPermission("address:update")
@OperateLog
public ResponseDTO<String> update(@RequestBody @Valid AddressUpdateForm updateForm) { public ResponseDTO<String> update(@RequestBody @Valid AddressUpdateForm updateForm) {
return addressService.update(updateForm); return addressService.update(updateForm);
} }
@ -80,6 +83,7 @@ public class AddressController {
@Operation(summary = "批量删除 @author hj") @Operation(summary = "批量删除 @author hj")
@PostMapping("/address/batchDelete") @PostMapping("/address/batchDelete")
@SaCheckPermission("address:batchDelete") @SaCheckPermission("address:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return addressService.batchDelete(idList); return addressService.batchDelete(idList);
} }
@ -87,6 +91,7 @@ public class AddressController {
@Operation(summary = "单个删除 @author hj") @Operation(summary = "单个删除 @author hj")
@GetMapping("/address/delete") @GetMapping("/address/delete")
@SaCheckPermission("address:delete") @SaCheckPermission("address:delete")
@OperateLog
public ResponseDTO<String> delete(@RequestParam Long addressId) { public ResponseDTO<String> delete(@RequestParam Long addressId) {
return addressService.delete(addressId); return addressService.delete(addressId);
} }
@ -100,6 +105,7 @@ public class AddressController {
@Operation(summary = "导入 霍锦") @Operation(summary = "导入 霍锦")
@PostMapping("/address/importAddress") @PostMapping("/address/importAddress")
@SaCheckPermission("address:importAddress") @SaCheckPermission("address:importAddress")
@OperateLog
public ResponseDTO<String> importAddress(@RequestParam MultipartFile file) { public ResponseDTO<String> importAddress(@RequestParam MultipartFile file) {
return addressService.importAddress(file); return addressService.importAddress(file);
} }
@ -107,6 +113,7 @@ public class AddressController {
@Operation(summary = "导出 霍锦") @Operation(summary = "导出 霍锦")
@GetMapping("/address/exportAddress") @GetMapping("/address/exportAddress")
@SaCheckPermission("address:exportAddress") @SaCheckPermission("address:exportAddress")
@OperateLog
public void exportAddress(HttpServletResponse response) throws IOException { public void exportAddress(HttpServletResponse response) throws IOException {
List<AddressExcelVO> addressList = addressQueryService.getAddressExcelVOList(); List<AddressExcelVO> addressList = addressQueryService.getAddressExcelVOList();
SmartExcelUtil.exportExcel(response, "收货地址信息.xlsx", "收货地址", AddressExcelVO.class, addressList); SmartExcelUtil.exportExcel(response, "收货地址信息.xlsx", "收货地址", AddressExcelVO.class, addressList);

View File

@ -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.RequestUser;
import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.domain.ValidateList;
import net.lab1024.sa.base.common.util.SmartRequestUtil; 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 org.springframework.web.bind.annotation.*;
import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.PageResult;
@ -53,6 +54,7 @@ public class AreaController {
@Operation(summary = "添加 @author hj") @Operation(summary = "添加 @author hj")
@PostMapping("/area/add") @PostMapping("/area/add")
@SaCheckPermission("area:add") @SaCheckPermission("area:add")
@OperateLog
public ResponseDTO<String> add(@RequestBody @Valid AreaAddForm addForm) { public ResponseDTO<String> add(@RequestBody @Valid AreaAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser(); RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setCreateUserId(requestUser.getUserId()); addForm.setCreateUserId(requestUser.getUserId());
@ -63,6 +65,7 @@ public class AreaController {
@Operation(summary = "更新 @author hj") @Operation(summary = "更新 @author hj")
@PostMapping("/area/update") @PostMapping("/area/update")
@SaCheckPermission("area:update") @SaCheckPermission("area:update")
@OperateLog
public ResponseDTO<String> update(@RequestBody @Valid AreaUpdateForm updateForm) { public ResponseDTO<String> update(@RequestBody @Valid AreaUpdateForm updateForm) {
return areaService.update(updateForm); return areaService.update(updateForm);
} }
@ -70,6 +73,7 @@ public class AreaController {
@Operation(summary = "批量删除 @author hj") @Operation(summary = "批量删除 @author hj")
@PostMapping("/area/batchDelete") @PostMapping("/area/batchDelete")
@SaCheckPermission("area:batchDelete") @SaCheckPermission("area:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return areaService.batchDelete(idList); return areaService.batchDelete(idList);
} }
@ -77,6 +81,7 @@ public class AreaController {
@Operation(summary = "单个删除 @author hj") @Operation(summary = "单个删除 @author hj")
@GetMapping("/area/delete") @GetMapping("/area/delete")
@SaCheckPermission("area:delete") @SaCheckPermission("area:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestParam Long areaId) { public ResponseDTO<String> batchDelete(@RequestParam Long areaId) {
return areaService.delete(areaId); return areaService.delete(areaId);
} }

View File

@ -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.RequestUser;
import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.domain.ValidateList;
import net.lab1024.sa.base.common.util.SmartRequestUtil; 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 org.springframework.web.bind.annotation.*;
import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.PageResult;
@ -53,6 +54,7 @@ public class CustomerController {
@Operation(summary = "添加 @author 霍锦") @Operation(summary = "添加 @author 霍锦")
@PostMapping("/customer/add") @PostMapping("/customer/add")
@SaCheckPermission("customer:add") @SaCheckPermission("customer:add")
@OperateLog
public ResponseDTO<String> add(@RequestBody @Valid CustomerAddForm addForm) { public ResponseDTO<String> add(@RequestBody @Valid CustomerAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser(); RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setCreateUserId(requestUser.getUserId()); addForm.setCreateUserId(requestUser.getUserId());
@ -63,6 +65,7 @@ public class CustomerController {
@Operation(summary = "更新 @author 霍锦") @Operation(summary = "更新 @author 霍锦")
@PostMapping("/customer/update") @PostMapping("/customer/update")
@SaCheckPermission("customer:update") @SaCheckPermission("customer:update")
@OperateLog
public ResponseDTO<String> update(@RequestBody @Valid CustomerUpdateForm updateForm) { public ResponseDTO<String> update(@RequestBody @Valid CustomerUpdateForm updateForm) {
return customerService.update(updateForm); return customerService.update(updateForm);
} }
@ -70,6 +73,7 @@ public class CustomerController {
@Operation(summary = "批量删除 @author 霍锦") @Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/customer/batchDelete") @PostMapping("/customer/batchDelete")
@SaCheckPermission("customer:batchDelete") @SaCheckPermission("customer:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return customerService.batchDelete(idList); return customerService.batchDelete(idList);
} }
@ -77,6 +81,7 @@ public class CustomerController {
@Operation(summary = "单个删除 @author 霍锦") @Operation(summary = "单个删除 @author 霍锦")
@GetMapping("/customer/delete") @GetMapping("/customer/delete")
@SaCheckPermission("customer:delete") @SaCheckPermission("customer:delete")
@OperateLog
public ResponseDTO<String> delete(@RequestParam Long customerId) { public ResponseDTO<String> delete(@RequestParam Long customerId) {
return customerService.delete(customerId); return customerService.delete(customerId);
} }

View File

@ -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.domain.ValidateList;
import net.lab1024.sa.base.common.util.SmartExcelUtil; import net.lab1024.sa.base.common.util.SmartExcelUtil;
import net.lab1024.sa.base.common.util.SmartRequestUtil; 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 org.springframework.web.bind.annotation.*;
import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.ResponseDTO;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
@ -59,6 +60,7 @@ public class ItemController {
@Operation(summary = "添加 @author 霍锦") @Operation(summary = "添加 @author 霍锦")
@PostMapping("/item/add") @PostMapping("/item/add")
@SaCheckPermission("item:add") @SaCheckPermission("item:add")
@OperateLog
public ResponseDTO<String> add(@RequestBody @Valid ItemAddForm addForm) { public ResponseDTO<String> add(@RequestBody @Valid ItemAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser(); RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setCreateUserId(requestUser.getUserId()); addForm.setCreateUserId(requestUser.getUserId());
@ -69,6 +71,7 @@ public class ItemController {
@Operation(summary = "更新 @author 霍锦") @Operation(summary = "更新 @author 霍锦")
@PostMapping("/item/update") @PostMapping("/item/update")
@SaCheckPermission("item:update") @SaCheckPermission("item:update")
@OperateLog
public ResponseDTO<String> update(@RequestBody @Valid ItemUpdateForm updateForm) { public ResponseDTO<String> update(@RequestBody @Valid ItemUpdateForm updateForm) {
return itemService.update(updateForm); return itemService.update(updateForm);
} }
@ -76,6 +79,7 @@ public class ItemController {
@Operation(summary = "批量删除 @author 霍锦") @Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/item/batchDelete") @PostMapping("/item/batchDelete")
@SaCheckPermission("item:batchDelete") @SaCheckPermission("item:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return itemService.batchDelete(idList); return itemService.batchDelete(idList);
} }
@ -83,6 +87,7 @@ public class ItemController {
@Operation(summary = "单个删除 @author 霍锦") @Operation(summary = "单个删除 @author 霍锦")
@GetMapping("/item/delete") @GetMapping("/item/delete")
@SaCheckPermission("item:delete") @SaCheckPermission("item:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestParam Long itemId) { public ResponseDTO<String> batchDelete(@RequestParam Long itemId) {
return itemService.delete(itemId); return itemService.delete(itemId);
} }
@ -96,6 +101,7 @@ public class ItemController {
@Operation(summary = "导入 霍锦") @Operation(summary = "导入 霍锦")
@PostMapping("/item/importItems") @PostMapping("/item/importItems")
@SaCheckPermission("item:importItems") @SaCheckPermission("item:importItems")
@OperateLog
public ResponseDTO<String> importItems(@RequestParam MultipartFile file) { public ResponseDTO<String> importItems(@RequestParam MultipartFile file) {
return itemService.importItems(file); return itemService.importItems(file);
} }
@ -103,6 +109,7 @@ public class ItemController {
@Operation(summary = "导出 霍锦") @Operation(summary = "导出 霍锦")
@GetMapping("/item/exportItems") @GetMapping("/item/exportItems")
@SaCheckPermission("item:exportItems") @SaCheckPermission("item:exportItems")
@OperateLog
public void exportItems(HttpServletResponse response) throws IOException { public void exportItems(HttpServletResponse response) throws IOException {
List<ItemsExcelVO> itemsList = itemQueryService.getItemsExcelVOList(); List<ItemsExcelVO> itemsList = itemQueryService.getItemsExcelVOList();
SmartExcelUtil.exportExcel(response, "物料信息.xlsx", "物料", ItemsExcelVO.class, itemsList); SmartExcelUtil.exportExcel(response, "物料信息.xlsx", "物料", ItemsExcelVO.class, itemsList);

View File

@ -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.domain.ValidateList;
import net.lab1024.sa.base.common.util.SmartExcelUtil; import net.lab1024.sa.base.common.util.SmartExcelUtil;
import net.lab1024.sa.base.common.util.SmartRequestUtil; 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 org.springframework.web.bind.annotation.*;
import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.PageResult;
@ -51,6 +52,7 @@ public class LocationController {
@Operation(summary = "添加 @author 霍锦") @Operation(summary = "添加 @author 霍锦")
@PostMapping("/location/add") @PostMapping("/location/add")
@SaCheckPermission("location:add") @SaCheckPermission("location:add")
@OperateLog
public ResponseDTO<String> add(@RequestBody @Valid LocationAddForm addForm) { public ResponseDTO<String> add(@RequestBody @Valid LocationAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser(); RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setCreateUserId(requestUser.getUserId()); addForm.setCreateUserId(requestUser.getUserId());
@ -61,6 +63,7 @@ public class LocationController {
@Operation(summary = "更新 @author 霍锦") @Operation(summary = "更新 @author 霍锦")
@PostMapping("/location/update") @PostMapping("/location/update")
@SaCheckPermission("location:update") @SaCheckPermission("location:update")
@OperateLog
public ResponseDTO<String> update(@RequestBody @Valid LocationUpdateForm updateForm) { public ResponseDTO<String> update(@RequestBody @Valid LocationUpdateForm updateForm) {
return locationService.update(updateForm); return locationService.update(updateForm);
} }
@ -68,6 +71,7 @@ public class LocationController {
@Operation(summary = "批量删除 @author 霍锦") @Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/location/batchDelete") @PostMapping("/location/batchDelete")
@SaCheckPermission("location:batchDelete") @SaCheckPermission("location:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return locationService.batchDelete(idList); return locationService.batchDelete(idList);
} }
@ -75,6 +79,7 @@ public class LocationController {
@Operation(summary = "单个删除 @author 霍锦") @Operation(summary = "单个删除 @author 霍锦")
@GetMapping("/location/delete") @GetMapping("/location/delete")
@SaCheckPermission("location:delete") @SaCheckPermission("location:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestParam Long locationId) { public ResponseDTO<String> batchDelete(@RequestParam Long locationId) {
return locationService.delete(locationId); return locationService.delete(locationId);
} }
@ -88,6 +93,7 @@ public class LocationController {
@Operation(summary = "批量调整 霍锦") @Operation(summary = "批量调整 霍锦")
@PostMapping("/location/multipleAdjust") @PostMapping("/location/multipleAdjust")
@SaCheckPermission("location:multipleAdjust") @SaCheckPermission("location:multipleAdjust")
@OperateLog
public ResponseDTO<String> multipleAdjust(@RequestBody @Valid MultipleAdjust multipleAdjust) { public ResponseDTO<String> multipleAdjust(@RequestBody @Valid MultipleAdjust multipleAdjust) {
return locationService.multipleAdjust(multipleAdjust); return locationService.multipleAdjust(multipleAdjust);
} }
@ -95,6 +101,7 @@ public class LocationController {
@Operation(summary = "批量新建 霍锦") @Operation(summary = "批量新建 霍锦")
@PostMapping("/location/multipleInsert") @PostMapping("/location/multipleInsert")
@SaCheckPermission("location:multipleInsert") @SaCheckPermission("location:multipleInsert")
@OperateLog
public ResponseDTO<String> multipleInsert(@RequestBody @Valid MultipleInsert multipleInsert) { public ResponseDTO<String> multipleInsert(@RequestBody @Valid MultipleInsert multipleInsert) {
return locationService.multipleInsert(multipleInsert); return locationService.multipleInsert(multipleInsert);
} }
@ -102,6 +109,7 @@ public class LocationController {
@Operation(summary = "导入 霍锦") @Operation(summary = "导入 霍锦")
@PostMapping("/location/importLocations") @PostMapping("/location/importLocations")
@SaCheckPermission("location:importLocations") @SaCheckPermission("location:importLocations")
@OperateLog
public ResponseDTO<String> importLocations(@RequestParam MultipartFile file) { public ResponseDTO<String> importLocations(@RequestParam MultipartFile file) {
return locationService.importLocations(file); return locationService.importLocations(file);
} }
@ -109,6 +117,7 @@ public class LocationController {
@Operation(summary = "导出 霍锦") @Operation(summary = "导出 霍锦")
@GetMapping("/location/exportLocations") @GetMapping("/location/exportLocations")
@SaCheckPermission("location:exportLocations") @SaCheckPermission("location:exportLocations")
@OperateLog
public void exportLocations(HttpServletResponse response) throws IOException { public void exportLocations(HttpServletResponse response) throws IOException {
List<LocationsExcelVO> locationsList = locationQueryService.getLocationsExcelVOList(); List<LocationsExcelVO> locationsList = locationQueryService.getLocationsExcelVOList();
SmartExcelUtil.exportExcel(response, "库位信息.xlsx", "库位", LocationsExcelVO.class, locationsList); SmartExcelUtil.exportExcel(response, "库位信息.xlsx", "库位", LocationsExcelVO.class, locationsList);

View File

@ -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.domain.ValidateList;
import net.lab1024.sa.base.common.util.SmartExcelUtil; import net.lab1024.sa.base.common.util.SmartExcelUtil;
import net.lab1024.sa.base.common.util.SmartRequestUtil; 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 org.springframework.web.bind.annotation.*;
import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.PageResult;
@ -60,6 +61,7 @@ public class StockController {
@Operation(summary = "添加 @author 霍锦") @Operation(summary = "添加 @author 霍锦")
@PostMapping("/stock/add") @PostMapping("/stock/add")
@SaCheckPermission("stock:add") @SaCheckPermission("stock:add")
@OperateLog
public ResponseDTO<String> add(@RequestBody @Valid StockAddForm addForm) { public ResponseDTO<String> add(@RequestBody @Valid StockAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser(); RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setCreateUserId(requestUser.getUserId()); addForm.setCreateUserId(requestUser.getUserId());
@ -70,6 +72,7 @@ public class StockController {
@Operation(summary = "更新 @author 霍锦") @Operation(summary = "更新 @author 霍锦")
@PostMapping("/stock/update") @PostMapping("/stock/update")
@SaCheckPermission("stock:update") @SaCheckPermission("stock:update")
@OperateLog
public ResponseDTO<String> update(@RequestBody @Valid StockUpdateForm updateForm) { public ResponseDTO<String> update(@RequestBody @Valid StockUpdateForm updateForm) {
return stockService.update(updateForm); return stockService.update(updateForm);
} }
@ -77,6 +80,7 @@ public class StockController {
@Operation(summary = "批量删除 @author 霍锦") @Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/stock/batchDelete") @PostMapping("/stock/batchDelete")
@SaCheckPermission("stock:batchDelete") @SaCheckPermission("stock:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return stockService.batchDelete(idList); return stockService.batchDelete(idList);
} }
@ -84,6 +88,7 @@ public class StockController {
@Operation(summary = "单个删除 @author 霍锦") @Operation(summary = "单个删除 @author 霍锦")
@GetMapping("/stock/delete") @GetMapping("/stock/delete")
@SaCheckPermission("stock:delete") @SaCheckPermission("stock:delete")
@OperateLog
public ResponseDTO<String> delete(@RequestParam Long stockId) { public ResponseDTO<String> delete(@RequestParam Long stockId) {
return stockService.delete(stockId); return stockService.delete(stockId);
} }
@ -97,6 +102,7 @@ public class StockController {
@Operation(summary = "导入 霍锦") @Operation(summary = "导入 霍锦")
@PostMapping("/stock/importStocks") @PostMapping("/stock/importStocks")
@SaCheckPermission("stock:importStocks") @SaCheckPermission("stock:importStocks")
@OperateLog
public ResponseDTO<String> importStocks(@RequestParam MultipartFile file) { public ResponseDTO<String> importStocks(@RequestParam MultipartFile file) {
return stockService.importStocks(file); return stockService.importStocks(file);
} }
@ -104,6 +110,7 @@ public class StockController {
@Operation(summary = "导出 霍锦") @Operation(summary = "导出 霍锦")
@GetMapping("/stock/exportStocks") @GetMapping("/stock/exportStocks")
@SaCheckPermission("stock:exportStocks") @SaCheckPermission("stock:exportStocks")
@OperateLog
public void stock(HttpServletResponse response) throws IOException { public void stock(HttpServletResponse response) throws IOException {
List<StocksExcelVO> stocksList = stockQueryService.getStocksExcelVOList(); List<StocksExcelVO> stocksList = stockQueryService.getStocksExcelVOList();
SmartExcelUtil.exportExcel(response, "容器信息.xlsx", "容器", StocksExcelVO.class, stocksList); SmartExcelUtil.exportExcel(response, "容器信息.xlsx", "容器", StocksExcelVO.class, stocksList);

View File

@ -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.InventoryQueryService;
import net.lab1024.sa.admin.module.business.wms.inventory.service.InventoryService; import net.lab1024.sa.admin.module.business.wms.inventory.service.InventoryService;
import net.lab1024.sa.base.common.domain.ValidateList; 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 org.springframework.web.bind.annotation.*;
import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.PageResult;
@ -26,6 +27,7 @@ import jakarta.validation.Valid;
@RestController @RestController
@Tag(name = "库存信息") @Tag(name = "库存信息")
@OperateLog
public class InventoryController { public class InventoryController {
@Resource @Resource
@ -44,6 +46,7 @@ public class InventoryController {
@Operation(summary = "添加 @author 霍锦") @Operation(summary = "添加 @author 霍锦")
@PostMapping("/inventory/add") @PostMapping("/inventory/add")
@SaCheckPermission("inventory:add") @SaCheckPermission("inventory:add")
@OperateLog
public ResponseDTO<String> add(@RequestBody @Valid InventoryAddForm addForm) { public ResponseDTO<String> add(@RequestBody @Valid InventoryAddForm addForm) {
return inventoryService.add(addForm); return inventoryService.add(addForm);
} }
@ -51,6 +54,7 @@ public class InventoryController {
@Operation(summary = "更新 @author 霍锦") @Operation(summary = "更新 @author 霍锦")
@PostMapping("/inventory/update") @PostMapping("/inventory/update")
@SaCheckPermission("inventory:update") @SaCheckPermission("inventory:update")
@OperateLog
public ResponseDTO<String> update(@RequestBody @Valid InventoryUpdateForm updateForm) { public ResponseDTO<String> update(@RequestBody @Valid InventoryUpdateForm updateForm) {
return inventoryService.update(updateForm); return inventoryService.update(updateForm);
} }
@ -58,6 +62,7 @@ public class InventoryController {
@Operation(summary = "批量删除 @author 霍锦") @Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/inventory/batchDelete") @PostMapping("/inventory/batchDelete")
@SaCheckPermission("inventory:batchDelete") @SaCheckPermission("inventory:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return inventoryService.batchDelete(idList); return inventoryService.batchDelete(idList);
} }
@ -65,6 +70,7 @@ public class InventoryController {
@Operation(summary = "单个删除 @author 霍锦") @Operation(summary = "单个删除 @author 霍锦")
@GetMapping("/inventory/delete") @GetMapping("/inventory/delete")
@SaCheckPermission("inventory:delete") @SaCheckPermission("inventory:delete")
@OperateLog
public ResponseDTO<String> delete(@RequestParam Long inventoryId) { public ResponseDTO<String> delete(@RequestParam Long inventoryId) {
return inventoryService.delete(inventoryId); return inventoryService.delete(inventoryId);
} }

View File

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@Tag(name = "收货") @Tag(name = "收货")
@OperateLog
public class ReceiveController { public class ReceiveController {
@Resource @Resource
@ -24,6 +24,7 @@ public class ReceiveController {
@Operation(summary = "批量收货 @author 霍锦") @Operation(summary = "批量收货 @author 霍锦")
@PostMapping("/receive/batchReceive") @PostMapping("/receive/batchReceive")
@SaCheckPermission("receive:batchReceive") @SaCheckPermission("receive:batchReceive")
@OperateLog
public ResponseDTO<String> batchReceive(@RequestBody BatchReceiveForm batchReceiveForm) { public ResponseDTO<String> batchReceive(@RequestBody BatchReceiveForm batchReceiveForm) {
return receiveService.batchReceive(batchReceiveForm); return receiveService.batchReceive(batchReceiveForm);
} }
@ -31,6 +32,7 @@ public class ReceiveController {
@Operation(summary = "批量退货 @author 霍锦") @Operation(summary = "批量退货 @author 霍锦")
@PostMapping("/receive/batchReturn") @PostMapping("/receive/batchReturn")
@SaCheckPermission("receive:batchReturn") @SaCheckPermission("receive:batchReturn")
@OperateLog
public ResponseDTO<String> batchReturn(@RequestBody BatchReturnForm batchReturnForm) { public ResponseDTO<String> batchReturn(@RequestBody BatchReturnForm batchReturnForm) {
return receiveService.batchReturn(batchReturnForm); return receiveService.batchReturn(batchReturnForm);
} }

View File

@ -34,7 +34,6 @@ import jakarta.validation.Valid;
@RestController @RestController
@Tag(name = "入库单") @Tag(name = "入库单")
@OperateLog
public class AsnController { public class AsnController {
@Resource @Resource
@ -43,6 +42,7 @@ public class AsnController {
@Resource @Resource
private AsnQueryService asnQueryService; private AsnQueryService asnQueryService;
@Operation(summary = "分页查询 @author 霍锦")
@PostMapping("/asn/queryPage") @PostMapping("/asn/queryPage")
@SaCheckPermission("asn:query") @SaCheckPermission("asn:query")
public ResponseDTO<PageResult<AsnVO>> queryPage(@RequestBody @Valid AsnQueryForm queryForm) { public ResponseDTO<PageResult<AsnVO>> queryPage(@RequestBody @Valid AsnQueryForm queryForm) {
@ -52,6 +52,7 @@ public class AsnController {
@Operation(summary = "添加 @author 霍锦") @Operation(summary = "添加 @author 霍锦")
@PostMapping("/asn/add") @PostMapping("/asn/add")
@SaCheckPermission("asn:add") @SaCheckPermission("asn:add")
@OperateLog
public ResponseDTO<AsnEntity> add(@RequestBody @Valid AsnAddForm addForm) { public ResponseDTO<AsnEntity> add(@RequestBody @Valid AsnAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser(); RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setCreateUserId(requestUser.getUserId()); addForm.setCreateUserId(requestUser.getUserId());
@ -62,6 +63,7 @@ public class AsnController {
@Operation(summary = "更新 @author 霍锦") @Operation(summary = "更新 @author 霍锦")
@PostMapping("/asn/update") @PostMapping("/asn/update")
@SaCheckPermission("asn:update") @SaCheckPermission("asn:update")
@OperateLog
public ResponseDTO<AsnEntity> update(@RequestBody @Valid AsnUpdateForm updateForm) { public ResponseDTO<AsnEntity> update(@RequestBody @Valid AsnUpdateForm updateForm) {
return asnService.update(updateForm); return asnService.update(updateForm);
} }
@ -69,6 +71,7 @@ public class AsnController {
@Operation(summary = "批量删除 @author 霍锦") @Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/asn/batchDelete") @PostMapping("/asn/batchDelete")
@SaCheckPermission("asn:batchDelete") @SaCheckPermission("asn:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return asnService.batchDelete(idList); return asnService.batchDelete(idList);
} }
@ -76,6 +79,7 @@ public class AsnController {
@Operation(summary = "单个删除 @author 霍锦") @Operation(summary = "单个删除 @author 霍锦")
@GetMapping("/asn/delete") @GetMapping("/asn/delete")
@SaCheckPermission("asn:delete") @SaCheckPermission("asn:delete")
@OperateLog
public ResponseDTO<String> delete(@RequestParam Long asnId) { public ResponseDTO<String> delete(@RequestParam Long asnId) {
return asnService.delete(asnId); return asnService.delete(asnId);
} }

View File

@ -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.RequestUser;
import net.lab1024.sa.base.common.domain.ValidateList; import net.lab1024.sa.base.common.domain.ValidateList;
import net.lab1024.sa.base.common.util.SmartRequestUtil; 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 org.springframework.web.bind.annotation.*;
import net.lab1024.sa.base.common.domain.ResponseDTO; import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.PageResult; import net.lab1024.sa.base.common.domain.PageResult;
@ -52,6 +53,7 @@ public class AsnDetailController {
@Operation(summary = "添加 @author 霍锦") @Operation(summary = "添加 @author 霍锦")
@PostMapping("/asnDetail/add") @PostMapping("/asnDetail/add")
@SaCheckPermission("asnDetail:add") @SaCheckPermission("asnDetail:add")
@OperateLog
public ResponseDTO<String> add(@RequestBody @Valid AsnDetailAddForm addForm) { public ResponseDTO<String> add(@RequestBody @Valid AsnDetailAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser(); RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setCreateUserId(requestUser.getUserId()); addForm.setCreateUserId(requestUser.getUserId());
@ -62,6 +64,7 @@ public class AsnDetailController {
@Operation(summary = "更新 @author 霍锦") @Operation(summary = "更新 @author 霍锦")
@PostMapping("/asnDetail/update") @PostMapping("/asnDetail/update")
@SaCheckPermission("asnDetail:update") @SaCheckPermission("asnDetail:update")
@OperateLog
public ResponseDTO<String> update(@RequestBody @Valid AsnDetailUpdateForm updateForm) { public ResponseDTO<String> update(@RequestBody @Valid AsnDetailUpdateForm updateForm) {
return asnDetailService.update(updateForm); return asnDetailService.update(updateForm);
} }
@ -69,6 +72,7 @@ public class AsnDetailController {
@Operation(summary = "批量删除 @author 霍锦") @Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/asnDetail/batchDelete") @PostMapping("/asnDetail/batchDelete")
@SaCheckPermission("asnDetail:batchDelete") @SaCheckPermission("asnDetail:batchDelete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) { public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return asnDetailService.batchDelete(idList); return asnDetailService.batchDelete(idList);
} }
@ -76,6 +80,7 @@ public class AsnDetailController {
@Operation(summary = "单个删除 @author 霍锦") @Operation(summary = "单个删除 @author 霍锦")
@GetMapping("/asnDetail/delete") @GetMapping("/asnDetail/delete")
@SaCheckPermission("asnDetail:delete") @SaCheckPermission("asnDetail:delete")
@OperateLog
public ResponseDTO<String> delete(@RequestParam Long asnDetailId) { public ResponseDTO<String> delete(@RequestParam Long asnDetailId) {
return asnDetailService.delete(asnDetailId); return asnDetailService.delete(asnDetailId);
} }

View File

@ -178,6 +178,7 @@ public abstract class OperateLogAspect {
* @throws Exception * @throws Exception
*/ */
private void submitLog(final JoinPoint joinPoint, final Throwable e) throws Exception { private void submitLog(final JoinPoint joinPoint, final Throwable e) throws Exception {
long startTime = System.currentTimeMillis();
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
//设置用户信息 //设置用户信息
RequestUser user = SmartRequestUtil.getRequestUser(); RequestUser user = SmartRequestUtil.getRequestUser();
@ -219,6 +220,8 @@ public abstract class OperateLogAspect {
String name = api.name(); String name = api.name();
operateLogEntity.setModule(StrUtil.join(",", name)); operateLogEntity.setModule(StrUtil.join(",", name));
} }
long endTime = System.currentTimeMillis();
operateLogEntity.setTimes((endTime - startTime));
taskExecutor.execute(() -> { taskExecutor.execute(() -> {
this.saveLog(operateLogEntity); this.saveLog(operateLogEntity);
}); });

View File

@ -107,5 +107,10 @@ public class OperateLogEntity {
*/ */
private LocalDateTime createTime; private LocalDateTime createTime;
/**
*
*/
private Long times;
} }

View File

@ -62,6 +62,9 @@ public class OperateLogVO {
@Schema(description = "失败原因") @Schema(description = "失败原因")
private String failReason; private String failReason;
@Schema(description = "耗时")
private Long times;
@Schema(description = "更新时间") @Schema(description = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime; private LocalDateTime updateTime;