From 6c10ea02b732952d578a00856dbb994b21539606 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 26 十月 2023 09:40:00 +0800 Subject: [PATCH] 添加统计日志 --- server/src/main/java/doumeemes/api/ext/DepartmentExtController.java | 3 server/src/main/java/doumeemes/api/ext/SystemUserExternalExtController.java | 2 server/src/main/java/doumeemes/api/ext/CompanyOpenExtController.java | 2 server/src/main/java/doumeemes/api/ext/SalesorderDetailExtController.java | 2 server/db/business.biz_lingyang.permissions.sql | 6 server/src/main/java/doumeemes/api/ext/EndcheckExtController.java | 2 server/src/main/java/doumeemes/api/ext/DeviceCheckExtController.java | 2 server/src/main/java/doumeemes/api/ext/WarehouseExtController.java | 2 server/src/main/java/doumeemes/api/ext/WarehouseLocationExtController.java | 2 server/src/main/java/doumeemes/api/ext/CheckAttrExtController.java | 2 server/src/main/java/doumeemes/api/ext/NoticesExtController.java | 2 server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 12 + server/src/main/java/doumeemes/api/ext/BomExtController.java | 2 server/src/main/java/doumeemes/core/annotation/trace/TraceInterceptor.java | 2 server/src/main/java/doumeemes/api/ext/WInventoryExtController.java | 2 server/src/main/java/doumeemes/api/business/BizLingyangController.java | 92 ++++++++ server/src/main/java/doumeemes/api/ext/BomVersionExtController.java | 2 server/src/main/java/doumeemes/api/ext/WTransferExtController.java | 2 server/src/main/java/doumeemes/api/ext/CategoryExtController.java | 2 server/src/main/java/doumeemes/dao/system/model/SystemTraceLog.java | 6 server/src/main/java/doumeemes/api/ext/WorkorderCheckAttrExtController.java | 2 server/src/main/java/doumeemes/api/ext/WorkorderHistoryExtController.java | 2 server/src/main/java/doumeemes/api/ext/UnitDistributeExtController.java | 2 server/src/main/java/doumeemes/api/ext/WorkorderCheckExtController.java | 2 server/src/main/java/doumeemes/api/ext/BarcodeParamExtController.java | 2 server/src/main/java/doumeemes/api/ext/StatisticsController.java | 2 server/src/main/java/doumeemes/api/business/BackorderController.java | 2 server/src/main/java/doumeemes/api/ext/FinishedWarehouseExtController.java | 2 server/src/main/java/doumeemes/api/system/SystemDataPermissionController.java | 4 server/src/main/java/doumeemes/api/business/SalaryParamController.java | 2 server/src/main/java/doumeemes/api/ext/WInventoryDetailExtController.java | 2 server/src/main/java/doumeemes/api/ext/SystemExternalExtController.java | 2 server/src/main/java/doumeemes/api/common/EdgpController.java | 2 server/src/main/java/doumeemes/api/ext/WorkorderExtController.java | 2 server/src/main/java/doumeemes/api/business/SalesorderController.java | 2 server/src/main/java/doumeemes/api/ext/CustomerExtController.java | 2 server/src/main/resources/application.yml | 2 server/src/main/java/doumeemes/api/ext/MaterialDistributeExtController.java | 2 server/src/main/java/doumeemes/api/business/BackOrderDetailController.java | 2 server/src/main/java/doumeemes/api/ext/CategoryUnionExtController.java | 2 server/src/main/java/doumeemes/api/ext/CompanyUserExtController.java | 2 server/src/main/java/doumeemes/api/ext/WOutboundExtController.java | 2 server/src/main/java/doumeemes/task/ScheduleTool.java | 15 + server/src/main/java/doumeemes/dao/business/model/BizLingyang.java | 63 +++++ server/src/main/java/doumeemes/api/ext/AppliancesExtController.java | 2 server/src/main/java/doumeemes/api/ext/MaterialExtController.java | 2 server/src/main/java/doumeemes/api/ext/BeFinishedRecordExtController.java | 2 server/src/main/java/doumeemes/api/ext/UserDeviceExtController.java | 2 server/src/main/java/doumeemes/api/ext/WorkorderUserExtController.java | 2 server/src/main/java/doumeemes/service/business/impl/BizLingyangServiceImpl.java | 186 ++++++++++++++++ server/src/main/java/doumeemes/api/ext/WOutboundRecordExtController.java | 2 server/src/main/java/doumeemes/api/ext/WHistoryExtController.java | 2 server/src/main/java/doumeemes/service/business/BizLingyangService.java | 98 ++++++++ server/src/main/java/doumeemes/api/ext/ProceduresExtController.java | 2 coderd.json | 1 server/src/main/java/doumeemes/api/ext/CompanyExtController.java | 2 server/src/main/java/doumeemes/api/ext/MaterialCraftExtController.java | 2 server/src/main/java/doumeemes/api/ext/WorkPlansExtController.java | 2 server/src/main/java/doumeemes/api/ext/CompanyPositionExtController.java | 2 server/src/main/java/doumeemes/api/ext/EndcheckDetailExtController.java | 2 server/src/main/java/doumeemes/api/ext/PlanHistoryExtController.java | 2 server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java | 2 server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java | 2 server/src/main/java/doumeemes/api/ext/WOutboundDetailExtController.java | 2 server/src/main/java/doumeemes/api/common/AntelopeController.java | 2 server/src/main/java/doumeemes/api/ext/CustomerDistributeExtController.java | 2 server/src/main/java/doumeemes/api/system/SystemLoginLogController.java | 1 server/src/main/java/doumeemes/api/ext/UnitExtController.java | 2 server/src/main/java/doumeemes/api/ext/SalesorderStockupExtController.java | 2 server/src/main/java/doumeemes/api/ext/CustomerLinkmanExtController.java | 2 server/src/main/java/doumeemes/dao/business/BizLingyangMapper.java | 12 + server/src/main/java/doumeemes/api/ext/ApplianceChangeController.java | 2 server/src/main/java/doumeemes/api/ext/WStockRecordExtController.java | 2 server/src/main/java/doumeemes/api/ext/DeviceExtController.java | 2 server/src/main/java/doumeemes/api/ext/PlanImportExtController.java | 2 server/src/main/java/doumeemes/api/ext/RouteCardExtController.java | 2 server/src/main/java/doumeemes/api/common/DingdingController.java | 2 server/src/main/java/doumeemes/api/system/SystemDepartmentController.java | 1 server/src/main/java/doumeemes/api/system/SystemPositionController.java | 1 server/src/main/java/doumeemes/api/ext/BomDetailExtController.java | 2 server/src/main/java/doumeemes/api/ext/CompanyAuthExtController.java | 2 server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java | 2 server/src/main/java/doumeemes/api/ext/PlansExtController.java | 2 server/src/main/java/doumeemes/api/ext/RouteProcedureExtController.java | 2 server/src/main/java/doumeemes/api/ext/WTransferDetailExtController.java | 2 server/src/main/java/doumeemes/api/ext/AdjustmentRecordExtController.java | 3 server/src/main/java/doumeemes/api/ext/BarcodeSgExtController.java | 2 server/src/main/java/doumeemes/api/ext/MultifilesExtController.java | 2 server/src/main/java/doumeemes/api/ext/RouteExtController.java | 2 server/src/main/java/doumeemes/api/ext/CompanyLogController.java | 2 server/src/main/java/doumeemes/api/ext/UnitConversionExtController.java | 2 server/src/main/java/doumeemes/api/ext/WStockExtController.java | 2 92 files changed, 647 insertions(+), 9 deletions(-) diff --git a/coderd.json b/coderd.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/coderd.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/server/db/business.biz_lingyang.permissions.sql b/server/db/business.biz_lingyang.permissions.sql new file mode 100644 index 0000000..b476233 --- /dev/null +++ b/server/db/business.biz_lingyang.permissions.sql @@ -0,0 +1,6 @@ +INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:bizlingyang:create', '鏂板缓缇氱緤瀵规帴鏁版嵁鏄庣粏琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0); +INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:bizlingyang:delete', '鍒犻櫎缇氱緤瀵规帴鏁版嵁鏄庣粏琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0); +INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:bizlingyang:update', '淇敼缇氱緤瀵规帴鏁版嵁鏄庣粏琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0); +INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:bizlingyang:query', '鏌ヨ缇氱緤瀵规帴鏁版嵁鏄庣粏琛�', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0); +INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:bizlingyang:exportExcel', '瀵煎嚭缇氱緤瀵规帴鏁版嵁鏄庣粏琛�(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0); + diff --git a/server/src/main/java/doumeemes/api/business/BackOrderDetailController.java b/server/src/main/java/doumeemes/api/business/BackOrderDetailController.java index 1238b87..a94427c 100644 --- a/server/src/main/java/doumeemes/api/business/BackOrderDetailController.java +++ b/server/src/main/java/doumeemes/api/business/BackOrderDetailController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -24,6 +25,7 @@ */ @Api(tags = "宸ュ崟绫�-杩斾慨鐢宠鍗曟槑缁嗚〃") @RestController +@Trace(withRequestResult = false,withRequestParameters = false) @RequestMapping("/business/backOrderDetail") public class BackOrderDetailController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/business/BackorderController.java b/server/src/main/java/doumeemes/api/business/BackorderController.java index d183722..490c118 100644 --- a/server/src/main/java/doumeemes/api/business/BackorderController.java +++ b/server/src/main/java/doumeemes/api/business/BackorderController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -25,6 +26,7 @@ */ @Api(tags = "宸ュ崟绫�-杩斾慨鐢宠鍗曚俊鎭〃") @RestController +@Trace(withRequestResult = false,withRequestParameters = false) @RequestMapping("/business/backorder") public class BackorderController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/business/BizLingyangController.java b/server/src/main/java/doumeemes/api/business/BizLingyangController.java new file mode 100644 index 0000000..7c6828d --- /dev/null +++ b/server/src/main/java/doumeemes/api/business/BizLingyangController.java @@ -0,0 +1,92 @@ +package doumeemes.api.business; + +import doumeemes.api.BaseController; +import doumeemes.core.annotation.excel.ExcelExporter; +import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; +import doumeemes.core.model.ApiResponse; +import doumeemes.core.model.PageWrap; +import doumeemes.core.model.PageData; +import doumeemes.dao.business.model.BizLingyang; +import doumeemes.service.business.BizLingyangService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author 姹熻箘韫� + * @date 2023/10/25 18:17 + */ +@Api(tags = "缇氱緤瀵规帴鏁版嵁鏄庣粏琛�") +@RestController +@Trace(withRequestResult = false,withRequestParameters = false) +@RequestMapping("/business/bizLingyang") +public class BizLingyangController extends BaseController { + + @Autowired + private BizLingyangService bizLingyangService; + + @PreventRepeat + @ApiOperation("鏂板缓") + @PostMapping("/create") + @RequiresPermissions("business:bizlingyang:create") + public ApiResponse create(@RequestBody BizLingyang bizLingyang) { + return ApiResponse.success(bizLingyangService.create(bizLingyang)); + } + + @ApiOperation("鏍规嵁ID鍒犻櫎") + @GetMapping("/delete/{id}") + @RequiresPermissions("business:bizlingyang:delete") + public ApiResponse deleteById(@PathVariable Integer id) { + bizLingyangService.deleteById(id); + return ApiResponse.success(null); + } + + @ApiOperation("鎵归噺鍒犻櫎") + @GetMapping("/delete/batch") + @RequiresPermissions("business:bizlingyang:delete") + public ApiResponse deleteByIdInBatch(@RequestParam String ids) { + String [] idArray = ids.split(","); + List<Integer> idList = new ArrayList<>(); + for (String id : idArray) { + idList.add(Integer.valueOf(id)); + } + bizLingyangService.deleteByIdInBatch(idList); + return ApiResponse.success(null); + } + + @ApiOperation("鏍规嵁ID淇敼") + @PostMapping("/updateById") + @RequiresPermissions("business:bizlingyang:update") + public ApiResponse updateById(@RequestBody BizLingyang bizLingyang) { + bizLingyangService.updateById(bizLingyang); + return ApiResponse.success(null); + } + + @ApiOperation("鍒嗛〉鏌ヨ") + @PostMapping("/page") + @RequiresPermissions("business:bizlingyang:query") + public ApiResponse<PageData<BizLingyang>> findPage (@RequestBody PageWrap<BizLingyang> pageWrap) { + return ApiResponse.success(bizLingyangService.findPage(pageWrap)); + } + + @ApiOperation("瀵煎嚭Excel") + @PostMapping("/exportExcel") + @RequiresPermissions("business:bizlingyang:exportExcel") + public void exportExcel (@RequestBody PageWrap<BizLingyang> pageWrap, HttpServletResponse response) { + ExcelExporter.build(BizLingyang.class).export(bizLingyangService.findPage(pageWrap).getRecords(), "缇氱緤瀵规帴鏁版嵁鏄庣粏琛�", response); + } + + @ApiOperation("鏍规嵁ID鏌ヨ") + @GetMapping("/{id}") + @RequiresPermissions("business:bizlingyang:query") + public ApiResponse findById(@PathVariable Integer id) { + return ApiResponse.success(bizLingyangService.findById(id)); + } +} diff --git a/server/src/main/java/doumeemes/api/business/SalaryParamController.java b/server/src/main/java/doumeemes/api/business/SalaryParamController.java index 98dfe1b..65a2d20 100644 --- a/server/src/main/java/doumeemes/api/business/SalaryParamController.java +++ b/server/src/main/java/doumeemes/api/business/SalaryParamController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -37,6 +38,7 @@ */ @Api(tags = "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�") @RestController +@Trace(withRequestResult = false,withRequestParameters = false) @RequestMapping("/business/salaryParam") public class SalaryParamController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/business/SalesorderController.java b/server/src/main/java/doumeemes/api/business/SalesorderController.java index 05c91cf..7fb552c 100644 --- a/server/src/main/java/doumeemes/api/business/SalesorderController.java +++ b/server/src/main/java/doumeemes/api/business/SalesorderController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -24,6 +25,7 @@ */ @Api(tags = "璁㈠崟绫�-閿�鍞鍗曚俊鎭〃") @RestController +@Trace(withRequestResult = false,withRequestParameters = false) @RequestMapping("/business/salesorder") public class SalesorderController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/common/AntelopeController.java b/server/src/main/java/doumeemes/api/common/AntelopeController.java index 1303761..fd14fd3 100644 --- a/server/src/main/java/doumeemes/api/common/AntelopeController.java +++ b/server/src/main/java/doumeemes/api/common/AntelopeController.java @@ -29,7 +29,7 @@ * 閽夐拤鐩稿叧鎺ュ彛 */ @Api(tags = "缇氱緤骞冲彴鐩稿叧鎺ュ彛") -@Trace(exclude = true) +@Trace(withRequestResult = false,withRequestParameters = false) @RestController @RequestMapping("/lingyang") public class AntelopeController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/common/DingdingController.java b/server/src/main/java/doumeemes/api/common/DingdingController.java index 20b2b3b..9c8a990 100644 --- a/server/src/main/java/doumeemes/api/common/DingdingController.java +++ b/server/src/main/java/doumeemes/api/common/DingdingController.java @@ -32,7 +32,7 @@ * 閽夐拤鐩稿叧鎺ュ彛 */ @Api(tags = "閽夐拤鐩稿叧鎺ュ彛") -@Trace(exclude = true) +@Trace(withRequestResult = false,withRequestParameters = false) @RestController @RequestMapping("/dingding") public class DingdingController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/common/EdgpController.java b/server/src/main/java/doumeemes/api/common/EdgpController.java index 69c110c..dee6c6a 100644 --- a/server/src/main/java/doumeemes/api/common/EdgpController.java +++ b/server/src/main/java/doumeemes/api/common/EdgpController.java @@ -19,7 +19,7 @@ * 閽夐拤鐩稿叧鎺ュ彛 */ @Api(tags = "Edgp骞冲彴鐩稿叧鎺ュ彛") -@Trace(exclude = true) +@Trace(withRequestResult = false,withRequestParameters = false) @RestController @RequestMapping("/edgp") public class EdgpController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/ext/AdjustmentRecordExtController.java b/server/src/main/java/doumeemes/api/ext/AdjustmentRecordExtController.java index 22476d0..0d8f07c 100644 --- a/server/src/main/java/doumeemes/api/ext/AdjustmentRecordExtController.java +++ b/server/src/main/java/doumeemes/api/ext/AdjustmentRecordExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -27,6 +28,7 @@ * @date 2022/08/08 09:39 */ @RestController +@Trace(withRequestResult = false,withRequestParameters = false) @RequestMapping("/ext/adjustmentRecordExt") @Api(tags = "璋冩暣鍏ュ簱鍗� - 鏄庣粏璁板綍琛� EXT鎺ュ彛") public class AdjustmentRecordExtController extends BaseController { @@ -90,6 +92,7 @@ @ApiOperation("鏍规嵁ID鏌ヨ") @GetMapping("/{id}") + @Trace() @RequiresPermissions("ext:adjustmentrecordext:query") public ApiResponse findById(@PathVariable Integer id) { return ApiResponse.success(adjustmentRecordService.findById(id)); diff --git a/server/src/main/java/doumeemes/api/ext/ApplianceChangeController.java b/server/src/main/java/doumeemes/api/ext/ApplianceChangeController.java index e81bb44..ba85d9d 100644 --- a/server/src/main/java/doumeemes/api/ext/ApplianceChangeController.java +++ b/server/src/main/java/doumeemes/api/ext/ApplianceChangeController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -27,6 +28,7 @@ */ @Api(tags = "璁剧疆绫�-宸ヨ鍣ㄥ叿鏇存崲璁板綍琛�1") @RestController +@Trace(withRequestResult = false,withRequestParameters = false) @RequestMapping("/ext/applianceChange") public class ApplianceChangeController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/ext/AppliancesExtController.java b/server/src/main/java/doumeemes/api/ext/AppliancesExtController.java index 91a1e76..63a6e0a 100644 --- a/server/src/main/java/doumeemes/api/ext/AppliancesExtController.java +++ b/server/src/main/java/doumeemes/api/ext/AppliancesExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -40,6 +41,7 @@ @RestController @RequestMapping("/ext/appliancesExt") @Api(tags = "宸ヨ鍣ㄥ叿淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class AppliancesExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/BarcodeParamExtController.java b/server/src/main/java/doumeemes/api/ext/BarcodeParamExtController.java index 61752a2..41fbc94 100644 --- a/server/src/main/java/doumeemes/api/ext/BarcodeParamExtController.java +++ b/server/src/main/java/doumeemes/api/ext/BarcodeParamExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -33,6 +34,7 @@ @RestController @RequestMapping("/ext/barcodeParamExt") @Api(tags = "浜岀淮鐮佽缃帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class BarcodeParamExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/BarcodeSgExtController.java b/server/src/main/java/doumeemes/api/ext/BarcodeSgExtController.java index d27a367..f91540a 100644 --- a/server/src/main/java/doumeemes/api/ext/BarcodeSgExtController.java +++ b/server/src/main/java/doumeemes/api/ext/BarcodeSgExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/barcodeSgExt") @Api(tags = "鍥哄畾鎵爜鏋俊鎭帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class BarcodeSgExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/BeFinishedRecordExtController.java b/server/src/main/java/doumeemes/api/ext/BeFinishedRecordExtController.java index dac38eb..9055f4d 100644 --- a/server/src/main/java/doumeemes/api/ext/BeFinishedRecordExtController.java +++ b/server/src/main/java/doumeemes/api/ext/BeFinishedRecordExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/beFinishedRecordExt") @Api(tags = "瀹屽伐鍏ュ簱 - 鏁版嵁璁板綍 EXT鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class BeFinishedRecordExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/BomDetailExtController.java b/server/src/main/java/doumeemes/api/ext/BomDetailExtController.java index ade4ae0..33e59e0 100644 --- a/server/src/main/java/doumeemes/api/ext/BomDetailExtController.java +++ b/server/src/main/java/doumeemes/api/ext/BomDetailExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -30,6 +31,7 @@ @RestController @RequestMapping("/ext/bomDetailExt") @Api(tags = "鐗╂枡娓呭崟鏄庣粏鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class BomDetailExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/BomExtController.java b/server/src/main/java/doumeemes/api/ext/BomExtController.java index c5059f8..9bd762b 100644 --- a/server/src/main/java/doumeemes/api/ext/BomExtController.java +++ b/server/src/main/java/doumeemes/api/ext/BomExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -34,6 +35,7 @@ @RestController @RequestMapping("/ext/bomExt") @Api(tags = "鐗╂枡娓呭崟淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class BomExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/BomVersionExtController.java b/server/src/main/java/doumeemes/api/ext/BomVersionExtController.java index c5d122e..e02b781 100644 --- a/server/src/main/java/doumeemes/api/ext/BomVersionExtController.java +++ b/server/src/main/java/doumeemes/api/ext/BomVersionExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/bomVersionExt") @Api(tags = "鐗╂枡娓呭崟鐗堟湰鍘嗗彶淇℃伅琛ㄦ帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class BomVersionExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CategoryExtController.java b/server/src/main/java/doumeemes/api/ext/CategoryExtController.java index bfab39a..5d896d9 100644 --- a/server/src/main/java/doumeemes/api/ext/CategoryExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CategoryExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -38,6 +39,7 @@ */ @RestController @RequestMapping("/ext/categoryExt") +@Trace(withRequestResult = false,withRequestParameters = false) @Api(tags = "璁剧疆绫诲垎绫讳俊鎭〃鎺ュ彛") public class CategoryExtController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/ext/CategoryUnionExtController.java b/server/src/main/java/doumeemes/api/ext/CategoryUnionExtController.java index dfad633..98d072b 100644 --- a/server/src/main/java/doumeemes/api/ext/CategoryUnionExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CategoryUnionExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -33,6 +34,7 @@ @RestController @RequestMapping("/ext/categoryUnionExt") @Api(tags = "鍒嗙被缁勫悎淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class CategoryUnionExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CheckAttrExtController.java b/server/src/main/java/doumeemes/api/ext/CheckAttrExtController.java index e330c05..f735444 100644 --- a/server/src/main/java/doumeemes/api/ext/CheckAttrExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CheckAttrExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -30,6 +31,7 @@ @RestController @RequestMapping("/ext/checkAttrExt") @Api(tags = "璁剧疆绫�-妫�鐐瑰睘鎬т俊鎭〃鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class CheckAttrExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CompanyAuthExtController.java b/server/src/main/java/doumeemes/api/ext/CompanyAuthExtController.java index 673ddb5..02eaaef 100644 --- a/server/src/main/java/doumeemes/api/ext/CompanyAuthExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CompanyAuthExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/companyAuthExt") @Api(tags = "浼佷笟瀹炲悕璁よ瘉璁板綍鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class CompanyAuthExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CompanyExtController.java b/server/src/main/java/doumeemes/api/ext/CompanyExtController.java index f635cd5..f566df5 100644 --- a/server/src/main/java/doumeemes/api/ext/CompanyExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CompanyExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -35,6 +36,7 @@ @RestController @RequestMapping("/ext/companyExt") @Api(tags = "浼佷笟淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class CompanyExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CompanyLogController.java b/server/src/main/java/doumeemes/api/ext/CompanyLogController.java index 79d5e49..0672e71 100644 --- a/server/src/main/java/doumeemes/api/ext/CompanyLogController.java +++ b/server/src/main/java/doumeemes/api/ext/CompanyLogController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -24,6 +25,7 @@ */ @Api(tags = "浼佷笟淇℃伅鍙樻洿璁板綍") @RestController +@Trace(withRequestResult = false,withRequestParameters = false) @RequestMapping("/business/companyLog") public class CompanyLogController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/ext/CompanyOpenExtController.java b/server/src/main/java/doumeemes/api/ext/CompanyOpenExtController.java index 76140d8..6945ca9 100644 --- a/server/src/main/java/doumeemes/api/ext/CompanyOpenExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CompanyOpenExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/companyOpenExt") @Api(tags = "浼佷笟璐︽埛寮�閫氬巻鍙茶褰曟帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class CompanyOpenExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CompanyPositionExtController.java b/server/src/main/java/doumeemes/api/ext/CompanyPositionExtController.java index 324852d..3b96311 100644 --- a/server/src/main/java/doumeemes/api/ext/CompanyPositionExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CompanyPositionExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/companyPositionExt") @Api(tags = "浼佷笟宀椾綅淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class CompanyPositionExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CompanyUserExtController.java b/server/src/main/java/doumeemes/api/ext/CompanyUserExtController.java index 35e4843..d19a075 100644 --- a/server/src/main/java/doumeemes/api/ext/CompanyUserExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CompanyUserExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -30,6 +31,7 @@ @RestController @RequestMapping("/ext/companyUserExt") @Api(tags = "缁勭粐浜哄憳鍏宠仈淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class CompanyUserExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CustomerDistributeExtController.java b/server/src/main/java/doumeemes/api/ext/CustomerDistributeExtController.java index caafc59..fbc1862 100644 --- a/server/src/main/java/doumeemes/api/ext/CustomerDistributeExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CustomerDistributeExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/customerDistributeExt") @Api(tags = "瀹㈡埛鍒嗛厤淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class CustomerDistributeExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CustomerExtController.java b/server/src/main/java/doumeemes/api/ext/CustomerExtController.java index 4d2e504..911022c 100644 --- a/server/src/main/java/doumeemes/api/ext/CustomerExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CustomerExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/customerExt") @Api(tags = "瀹㈡埛淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class CustomerExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/CustomerLinkmanExtController.java b/server/src/main/java/doumeemes/api/ext/CustomerLinkmanExtController.java index 8ffdf01..db30796 100644 --- a/server/src/main/java/doumeemes/api/ext/CustomerLinkmanExtController.java +++ b/server/src/main/java/doumeemes/api/ext/CustomerLinkmanExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/customerLinkmanExt") @Api(tags = "瀹㈡埛鍒嗛厤鑱旂郴浜轰俊鎭帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class CustomerLinkmanExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/DepartmentExtController.java b/server/src/main/java/doumeemes/api/ext/DepartmentExtController.java index 408b56b..573b839 100644 --- a/server/src/main/java/doumeemes/api/ext/DepartmentExtController.java +++ b/server/src/main/java/doumeemes/api/ext/DepartmentExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/departmentExt") @Api(tags = "缁勭粐淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class DepartmentExtController extends BaseController { @Autowired @@ -36,6 +38,7 @@ @PreventRepeat @ApiOperation("鏂板缓") + @Trace(withRequestParameters = true,withRequestResult = false) @PostMapping("/create") @RequiresPermissions("ext:departmentext:create") public ApiResponse create(@RequestBody Department department) { diff --git a/server/src/main/java/doumeemes/api/ext/DeviceCheckExtController.java b/server/src/main/java/doumeemes/api/ext/DeviceCheckExtController.java index cf303c6..e85e4bd 100644 --- a/server/src/main/java/doumeemes/api/ext/DeviceCheckExtController.java +++ b/server/src/main/java/doumeemes/api/ext/DeviceCheckExtController.java @@ -2,6 +2,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -24,6 +25,7 @@ */ @RestController @RequestMapping("/ext/deviceCheckExt") +@Trace(withRequestResult = false,withRequestParameters = false) @Api(tags = "璁惧宸℃淇℃伅琛� EXT鎺ュ彛") public class DeviceCheckExtController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java index 39d5686..1338c29 100644 --- a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java +++ b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -40,6 +41,7 @@ @RestController @RequestMapping("/ext/deviceExt") @Api(tags = "鐢熶骇璁惧淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class DeviceExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/EndcheckDetailExtController.java b/server/src/main/java/doumeemes/api/ext/EndcheckDetailExtController.java index 5b0669b..b5ddbd8 100644 --- a/server/src/main/java/doumeemes/api/ext/EndcheckDetailExtController.java +++ b/server/src/main/java/doumeemes/api/ext/EndcheckDetailExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/endCheckDetailExt") @Api(tags = "宸ュ崟绫�-缁堟鏄庣粏琛� Ext鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class EndcheckDetailExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/EndcheckExtController.java b/server/src/main/java/doumeemes/api/ext/EndcheckExtController.java index f0429ac..edc7281 100644 --- a/server/src/main/java/doumeemes/api/ext/EndcheckExtController.java +++ b/server/src/main/java/doumeemes/api/ext/EndcheckExtController.java @@ -2,6 +2,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -27,6 +28,7 @@ @RestController @RequestMapping("/ext/endCheckExt") @Api(tags = "宸ュ崟绫�-缁堟妫�楠屼俊鎭〃Ext鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class EndcheckExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/FinishedWarehouseExtController.java b/server/src/main/java/doumeemes/api/ext/FinishedWarehouseExtController.java index 6d65d31..9e32224 100644 --- a/server/src/main/java/doumeemes/api/ext/FinishedWarehouseExtController.java +++ b/server/src/main/java/doumeemes/api/ext/FinishedWarehouseExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/finishedWarehouseExt") @Api(tags = "瀹屽伐鍏ュ簱璁板綍鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class FinishedWarehouseExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/MaterialCraftExtController.java b/server/src/main/java/doumeemes/api/ext/MaterialCraftExtController.java index 7a1a270..8df428a 100644 --- a/server/src/main/java/doumeemes/api/ext/MaterialCraftExtController.java +++ b/server/src/main/java/doumeemes/api/ext/MaterialCraftExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/materialCraftExt") @Api(tags = "鐗╂枡宸ヨ壓淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class MaterialCraftExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/MaterialDistributeExtController.java b/server/src/main/java/doumeemes/api/ext/MaterialDistributeExtController.java index e2ff917..ed388d8 100644 --- a/server/src/main/java/doumeemes/api/ext/MaterialDistributeExtController.java +++ b/server/src/main/java/doumeemes/api/ext/MaterialDistributeExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -33,6 +34,7 @@ @RestController @RequestMapping("/ext/materialDistributeExt") @Api(tags = "鐗╂枡鍒嗛厤淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class MaterialDistributeExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/MaterialExtController.java b/server/src/main/java/doumeemes/api/ext/MaterialExtController.java index 0c7caa6..56d46e5 100644 --- a/server/src/main/java/doumeemes/api/ext/MaterialExtController.java +++ b/server/src/main/java/doumeemes/api/ext/MaterialExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -48,6 +49,7 @@ @RestController @RequestMapping("/ext/materialExt") @Api(tags = "鐗╂枡鍩烘湰淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class MaterialExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/MultifilesExtController.java b/server/src/main/java/doumeemes/api/ext/MultifilesExtController.java index 43b6a94..4d34252 100644 --- a/server/src/main/java/doumeemes/api/ext/MultifilesExtController.java +++ b/server/src/main/java/doumeemes/api/ext/MultifilesExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/multifilesExt") @Api(tags = "澶氬獟浣撴枃浠跺叧鑱旇〃 EXT鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class MultifilesExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/NoticesExtController.java b/server/src/main/java/doumeemes/api/ext/NoticesExtController.java index 94e02bb..fe0cba9 100644 --- a/server/src/main/java/doumeemes/api/ext/NoticesExtController.java +++ b/server/src/main/java/doumeemes/api/ext/NoticesExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -32,6 +33,7 @@ @RestController @RequestMapping("/ext/noticesExt") @Api(tags = "绯荤粺寰呭姙閫氱煡鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class NoticesExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/PlanHistoryExtController.java b/server/src/main/java/doumeemes/api/ext/PlanHistoryExtController.java index 26c6d71..b3426cd 100644 --- a/server/src/main/java/doumeemes/api/ext/PlanHistoryExtController.java +++ b/server/src/main/java/doumeemes/api/ext/PlanHistoryExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/planHistoryExt") @Api(tags = "璁″垝鎵ц鍘嗗彶璁板綍鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class PlanHistoryExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/PlanImportExtController.java b/server/src/main/java/doumeemes/api/ext/PlanImportExtController.java index c3f2234..94ad6bd 100644 --- a/server/src/main/java/doumeemes/api/ext/PlanImportExtController.java +++ b/server/src/main/java/doumeemes/api/ext/PlanImportExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/planImportExt") @Api(tags = "璁″垝瀵煎叆璁板綍鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class PlanImportExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/PlansExtController.java b/server/src/main/java/doumeemes/api/ext/PlansExtController.java index 27cc2d0..0f7dd6c 100644 --- a/server/src/main/java/doumeemes/api/ext/PlansExtController.java +++ b/server/src/main/java/doumeemes/api/ext/PlansExtController.java @@ -2,6 +2,7 @@ import com.alibaba.fastjson.JSONObject; import doumeemes.config.rocketmq.MqConfig; import doumeemes.config.rocketmq.RocketMessageProducer; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.utils.DateUtil; import doumeemes.dao.business.dto.AutoWorkReportDTO; import doumeemes.dao.business.model.Workorder; @@ -47,6 +48,7 @@ @RestController @RequestMapping("/ext/plansExt") @Api(tags = "鐢熶骇璁″垝鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class PlansExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/ProceduresExtController.java b/server/src/main/java/doumeemes/api/ext/ProceduresExtController.java index 3d38d98..1ec77f8 100644 --- a/server/src/main/java/doumeemes/api/ext/ProceduresExtController.java +++ b/server/src/main/java/doumeemes/api/ext/ProceduresExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.LoginUserInfo; import doumeemes.core.model.PageData; @@ -35,6 +36,7 @@ @RestController @RequestMapping("/ext/proceduresExt") @Api(tags = "宸ュ簭淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class ProceduresExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/RouteCardExtController.java b/server/src/main/java/doumeemes/api/ext/RouteCardExtController.java index fb04da1..3ffdccd 100644 --- a/server/src/main/java/doumeemes/api/ext/RouteCardExtController.java +++ b/server/src/main/java/doumeemes/api/ext/RouteCardExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -35,6 +36,7 @@ @RestController @RequestMapping("/ext/routeCardExt") @Api(tags = "宸ヨ壓鍗$鐞嗘帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class RouteCardExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/RouteExtController.java b/server/src/main/java/doumeemes/api/ext/RouteExtController.java index 924d0d0..4cdd7b0 100644 --- a/server/src/main/java/doumeemes/api/ext/RouteExtController.java +++ b/server/src/main/java/doumeemes/api/ext/RouteExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -34,6 +35,7 @@ @RestController @RequestMapping("/ext/routeExt") @Api(tags = "宸ヨ壓璺嚎淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class RouteExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/RouteProcedureExtController.java b/server/src/main/java/doumeemes/api/ext/RouteProcedureExtController.java index 007b2a6..4edfadf 100644 --- a/server/src/main/java/doumeemes/api/ext/RouteProcedureExtController.java +++ b/server/src/main/java/doumeemes/api/ext/RouteProcedureExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/routeProcedureExt") @Api(tags = "宸ヨ壓璺嚎涓庡伐搴忓叧鑱旀帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class RouteProcedureExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java index fc22dd3..99c5dc9 100644 --- a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java +++ b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -34,6 +35,7 @@ @Api(tags = "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�") @RestController @RequestMapping("/ext/salaryParam") +@Trace(withRequestResult = false,withRequestParameters = false) public class SalaryParamExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/SalesorderDetailExtController.java b/server/src/main/java/doumeemes/api/ext/SalesorderDetailExtController.java index bad3528..54ba3fe 100644 --- a/server/src/main/java/doumeemes/api/ext/SalesorderDetailExtController.java +++ b/server/src/main/java/doumeemes/api/ext/SalesorderDetailExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/salesorderDetailExt") @Api(tags = "閿�鍞鍗曟槑缁嗘帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class SalesorderDetailExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/SalesorderStockupExtController.java b/server/src/main/java/doumeemes/api/ext/SalesorderStockupExtController.java index 675fe28..8450fdc 100644 --- a/server/src/main/java/doumeemes/api/ext/SalesorderStockupExtController.java +++ b/server/src/main/java/doumeemes/api/ext/SalesorderStockupExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/salesorderStockupExt") @Api(tags = "閿�鍞鍗曞璐т俊鎭帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class SalesorderStockupExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/StatisticsController.java b/server/src/main/java/doumeemes/api/ext/StatisticsController.java index 078144f..c25da89 100644 --- a/server/src/main/java/doumeemes/api/ext/StatisticsController.java +++ b/server/src/main/java/doumeemes/api/ext/StatisticsController.java @@ -1,6 +1,7 @@ package doumeemes.api.ext; import doumeemes.api.BaseController; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -28,6 +29,7 @@ @RestController @RequestMapping("/statistics") @Api(tags = "澶у睆鏁版嵁鐪嬫澘-缁熻鏁版嵁鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class StatisticsController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/SystemExternalExtController.java b/server/src/main/java/doumeemes/api/ext/SystemExternalExtController.java index 96198f4..f9172e5 100644 --- a/server/src/main/java/doumeemes/api/ext/SystemExternalExtController.java +++ b/server/src/main/java/doumeemes/api/ext/SystemExternalExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/systemExternalExt") @Api(tags = "澶栭儴绯荤粺淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class SystemExternalExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/SystemUserExternalExtController.java b/server/src/main/java/doumeemes/api/ext/SystemUserExternalExtController.java index 23d4861..a473064 100644 --- a/server/src/main/java/doumeemes/api/ext/SystemUserExternalExtController.java +++ b/server/src/main/java/doumeemes/api/ext/SystemUserExternalExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/systemUserExternalExt") @Api(tags = "鐢ㄦ埛澶栭儴绯荤粺璐﹀彿鍏宠仈鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class SystemUserExternalExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/UnitConversionExtController.java b/server/src/main/java/doumeemes/api/ext/UnitConversionExtController.java index 1a92a31..1c91e47 100644 --- a/server/src/main/java/doumeemes/api/ext/UnitConversionExtController.java +++ b/server/src/main/java/doumeemes/api/ext/UnitConversionExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -30,6 +31,7 @@ @RestController @RequestMapping("/ext/unitConversionExt") @Api(tags = "鐗╂枡鍗曚綅杞崲閰嶇疆鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class UnitConversionExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/UnitDistributeExtController.java b/server/src/main/java/doumeemes/api/ext/UnitDistributeExtController.java index 14e7a81..c4fc1a7 100644 --- a/server/src/main/java/doumeemes/api/ext/UnitDistributeExtController.java +++ b/server/src/main/java/doumeemes/api/ext/UnitDistributeExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/unitDistributeExt") @Api(tags = "鐗╂枡鍗曚綅鍒嗛厤淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class UnitDistributeExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/UnitExtController.java b/server/src/main/java/doumeemes/api/ext/UnitExtController.java index 0859f39..e3d75a0 100644 --- a/server/src/main/java/doumeemes/api/ext/UnitExtController.java +++ b/server/src/main/java/doumeemes/api/ext/UnitExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -33,6 +34,7 @@ @RestController @RequestMapping("/ext/unitExt") @Api(tags = "璁¢噺鍗曚綅淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class UnitExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java index dddd521..e0338ab 100644 --- a/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java +++ b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java @@ -2,6 +2,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -37,6 +38,7 @@ @RestController @RequestMapping("/business/unqualifiedRecord") @Api(tags = "宸ュ崟绫�-鎶ュ伐涓嶈壇璁板綍绫诲瀷琛�") +@Trace(withRequestResult = false,withRequestParameters = false) public class UnqualifiedRecordExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/UserDeviceExtController.java b/server/src/main/java/doumeemes/api/ext/UserDeviceExtController.java index c25c849..6d718e5 100644 --- a/server/src/main/java/doumeemes/api/ext/UserDeviceExtController.java +++ b/server/src/main/java/doumeemes/api/ext/UserDeviceExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -30,6 +31,7 @@ @RestController @RequestMapping("/ext/userDeviceExt") @Api(tags = "璁剧疆绫�-浜哄憳缁戝畾璁惧鍏宠仈琛ㄦ帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class UserDeviceExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WHistoryExtController.java b/server/src/main/java/doumeemes/api/ext/WHistoryExtController.java index b6dab80..bcc5181 100644 --- a/server/src/main/java/doumeemes/api/ext/WHistoryExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WHistoryExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/wHistoryExt") @Api(tags = "浠撳簱绠$悊鎿嶄綔娴佹按鍘嗗彶璁板綍鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WHistoryExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WInventoryDetailExtController.java b/server/src/main/java/doumeemes/api/ext/WInventoryDetailExtController.java index 0609d97..6cf6d4a 100644 --- a/server/src/main/java/doumeemes/api/ext/WInventoryDetailExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WInventoryDetailExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/wInventoryDetailExt") @Api(tags = "鐩樼偣鍗曟槑缁嗘帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class WInventoryDetailExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WInventoryExtController.java b/server/src/main/java/doumeemes/api/ext/WInventoryExtController.java index 3de1c2d..537392a 100644 --- a/server/src/main/java/doumeemes/api/ext/WInventoryExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WInventoryExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/wInventoryExt") @Api(tags = "鐩樼偣鍗曚俊鎭帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class WInventoryExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WOutboundDetailExtController.java b/server/src/main/java/doumeemes/api/ext/WOutboundDetailExtController.java index 50f08f4..c63ba63 100644 --- a/server/src/main/java/doumeemes/api/ext/WOutboundDetailExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WOutboundDetailExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/wOutboundDetailExt") @Api(tags = "鍑哄叆搴撳崟鏄庣粏鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WOutboundDetailExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WOutboundExtController.java b/server/src/main/java/doumeemes/api/ext/WOutboundExtController.java index d01b711..110771c 100644 --- a/server/src/main/java/doumeemes/api/ext/WOutboundExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WOutboundExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -40,6 +41,7 @@ @RestController @RequestMapping("/ext/wOutboundExt") @Api(tags = "鍑哄叆搴撳崟淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WOutboundExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WOutboundRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WOutboundRecordExtController.java index e2cd903..a797aee 100644 --- a/server/src/main/java/doumeemes/api/ext/WOutboundRecordExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WOutboundRecordExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -34,6 +35,7 @@ @RestController @RequestMapping("/ext/wOutboundRecordExt") @Api(tags = "鍑哄叆搴撳崟澶勭悊鏄庣粏鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WOutboundRecordExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WStockExtController.java b/server/src/main/java/doumeemes/api/ext/WStockExtController.java index 902dbc6..f5c14b6 100644 --- a/server/src/main/java/doumeemes/api/ext/WStockExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WStockExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -43,6 +44,7 @@ @RestController @RequestMapping("/ext/wStockExt") @Api(tags = "鐗╂枡搴撳瓨浣欓淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WStockExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WStockRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WStockRecordExtController.java index 3f815c8..55486fe 100644 --- a/server/src/main/java/doumeemes/api/ext/WStockRecordExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WStockRecordExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/wStockRecordExt") @Api(tags = "鐗╂枡搴撳瓨浣欓鍙樺姩璁板綍琛‥xt鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WStockRecordExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WTransferDetailExtController.java b/server/src/main/java/doumeemes/api/ext/WTransferDetailExtController.java index 8a9b590..220c234 100644 --- a/server/src/main/java/doumeemes/api/ext/WTransferDetailExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WTransferDetailExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/wTransferDetailExt") @Api(tags = "鎹㈠簱鍗曟槑缁嗕俊鎭帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class WTransferDetailExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WTransferExtController.java b/server/src/main/java/doumeemes/api/ext/WTransferExtController.java index 6f08ff0..e82ff0a 100644 --- a/server/src/main/java/doumeemes/api/ext/WTransferExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WTransferExtController.java @@ -2,6 +2,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -37,6 +38,7 @@ @RestController @RequestMapping("/ext/wTransferExt") @Api(tags = "鎹㈠簱鍗曚俊鎭帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class WTransferExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WarehouseExtController.java b/server/src/main/java/doumeemes/api/ext/WarehouseExtController.java index 674206c..876a859 100644 --- a/server/src/main/java/doumeemes/api/ext/WarehouseExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WarehouseExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.LoginUserInfo; import doumeemes.core.model.PageData; @@ -38,6 +39,7 @@ @RestController @RequestMapping("/ext/warehouseExt") @Api(tags = "浠撳簱淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WarehouseExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WarehouseLocationExtController.java b/server/src/main/java/doumeemes/api/ext/WarehouseLocationExtController.java index 17bb45f..3a570cb 100644 --- a/server/src/main/java/doumeemes/api/ext/WarehouseLocationExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WarehouseLocationExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -41,6 +42,7 @@ @RestController @RequestMapping("/ext/warehouseLocationExt") @Api(tags = "璐т綅淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WarehouseLocationExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WorkPlansExtController.java b/server/src/main/java/doumeemes/api/ext/WorkPlansExtController.java index 43fc86e..1e3fb7a 100644 --- a/server/src/main/java/doumeemes/api/ext/WorkPlansExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WorkPlansExtController.java @@ -4,6 +4,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -41,6 +42,7 @@ */ @Api(tags = "宸ュ崟绫�-鎴愬搧鐢熶骇璁″垝淇℃伅琛�") @RestController +@Trace(withRequestResult = false,withRequestParameters = false) @RequestMapping("/business/workPlans") public class WorkPlansExtController extends BaseController { diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderCheckAttrExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderCheckAttrExtController.java index 8025af8..f0f0abc 100644 --- a/server/src/main/java/doumeemes/api/ext/WorkorderCheckAttrExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WorkorderCheckAttrExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -30,6 +31,7 @@ @RestController @RequestMapping("/ext/workorderCheckAttrExt") @Api(tags = "宸ュ崟绫�-妫�鐐瑰睘鎬у叧鑱旇〃鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WorkorderCheckAttrExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderCheckExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderCheckExtController.java index 7a2ed44..ed88d74 100644 --- a/server/src/main/java/doumeemes/api/ext/WorkorderCheckExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WorkorderCheckExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -31,6 +32,7 @@ @RestController @RequestMapping("/ext/workorderCheckExt") @Api(tags = "妫�楠屼俊鎭帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class WorkorderCheckExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderExtController.java index 41af741..cc86164 100644 --- a/server/src/main/java/doumeemes/api/ext/WorkorderExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WorkorderExtController.java @@ -5,6 +5,7 @@ import doumeemes.config.rocketmq.RocketMessageProducer; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -45,6 +46,7 @@ @RestController @RequestMapping("/ext/workorderExt") @Api(tags = "宸ュ崟淇℃伅鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WorkorderExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderHistoryExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderHistoryExtController.java index bdc2693..4934fa9 100644 --- a/server/src/main/java/doumeemes/api/ext/WorkorderHistoryExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WorkorderHistoryExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/workorderHistoryExt") @Api(tags = "宸ュ崟鐘舵�佸巻鍙茶褰曟帴鍙�") +@Trace(withRequestResult = false,withRequestParameters = false) public class WorkorderHistoryExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java index 903c367..f295f87 100644 --- a/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WorkorderRecordExtController.java @@ -4,6 +4,7 @@ import doumeemes.api.BaseController; import doumeemes.config.rocketmq.RocketMessageProducer; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; @@ -43,6 +44,7 @@ @RestController @RequestMapping("/ext/workorderRecordExt") @Api(tags = "宸ュ崟鐢熶骇杩囩▼璁板綍鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WorkorderRecordExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/ext/WorkorderUserExtController.java b/server/src/main/java/doumeemes/api/ext/WorkorderUserExtController.java index 821bd7a..9956175 100644 --- a/server/src/main/java/doumeemes/api/ext/WorkorderUserExtController.java +++ b/server/src/main/java/doumeemes/api/ext/WorkorderUserExtController.java @@ -3,6 +3,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; import doumeemes.core.annotation.pr.PreventRepeat; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageWrap; import doumeemes.core.model.PageData; @@ -29,6 +30,7 @@ @RestController @RequestMapping("/ext/workorderUserExt") @Api(tags = "宸ュ崟浜哄憳鍒嗛厤璁板綍鎺ュ彛") +@Trace(withRequestResult = false,withRequestParameters = false) public class WorkorderUserExtController extends BaseController { @Autowired diff --git a/server/src/main/java/doumeemes/api/system/SystemDataPermissionController.java b/server/src/main/java/doumeemes/api/system/SystemDataPermissionController.java index da6b5c8..caed18a 100644 --- a/server/src/main/java/doumeemes/api/system/SystemDataPermissionController.java +++ b/server/src/main/java/doumeemes/api/system/SystemDataPermissionController.java @@ -96,15 +96,13 @@ return ApiResponse.success(systemDataPermissionService.findByRoleId(pageWrap)); } - @Trace(exclude = true) @ApiOperation("鏌ヨ鏁版嵁鏉冮檺绫诲瀷") @GetMapping("/types") public ApiResponse<List<Map<String, Object>>> findTypes () { return ApiResponse.success(DataPermissionConstants.Type.valueList()); } - @Trace(exclude = true) - @ApiOperation("鏌ヨ鏁版嵁鏉冮檺妯″潡") + @ApiOperation("鏌ヨ鏁版嵁鏉冮檺妯÷峰潡") @GetMapping("/modules") public ApiResponse<List<Map<String, Object>>> findModules () { return ApiResponse.success(DataPermissionConstants.Module.valueList()); diff --git a/server/src/main/java/doumeemes/api/system/SystemDepartmentController.java b/server/src/main/java/doumeemes/api/system/SystemDepartmentController.java index 77d8739..2e0b2f7 100644 --- a/server/src/main/java/doumeemes/api/system/SystemDepartmentController.java +++ b/server/src/main/java/doumeemes/api/system/SystemDepartmentController.java @@ -83,7 +83,6 @@ return ApiResponse.success(systemDepartmentBiz.findTree()); } - @Trace(exclude = true) @ApiOperation("鏌ヨ閮ㄩ棬浜哄憳") @PostMapping("/users") @RequiresPermissions("system:department:queryUsers") diff --git a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java index 00e7705..c170747 100644 --- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java +++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java @@ -2,6 +2,7 @@ import doumeemes.api.BaseController; import doumeemes.core.annotation.excel.ExcelExporter; +import doumeemes.core.annotation.trace.Trace; import doumeemes.core.model.ApiResponse; import doumeemes.core.model.PageData; import doumeemes.core.model.PageWrap; diff --git a/server/src/main/java/doumeemes/api/system/SystemPositionController.java b/server/src/main/java/doumeemes/api/system/SystemPositionController.java index 7a9c296..55f85b7 100644 --- a/server/src/main/java/doumeemes/api/system/SystemPositionController.java +++ b/server/src/main/java/doumeemes/api/system/SystemPositionController.java @@ -96,7 +96,6 @@ return ApiResponse.success(systemPositionService.findList(systemPosition)); } - @Trace(exclude = true) @ApiOperation("鏌ヨ宀椾綅浜哄憳") @PostMapping("/users") @RequiresPermissions("system:position:queryUsers") diff --git a/server/src/main/java/doumeemes/core/annotation/trace/TraceInterceptor.java b/server/src/main/java/doumeemes/core/annotation/trace/TraceInterceptor.java index 1e5745a..7c12213 100644 --- a/server/src/main/java/doumeemes/core/annotation/trace/TraceInterceptor.java +++ b/server/src/main/java/doumeemes/core/annotation/trace/TraceInterceptor.java @@ -89,6 +89,8 @@ traceLog.setUserRealname(userInfo.getRealname()); traceLog.setUserRoles(StringUtils.join(userInfo.getRoles(), ",")); traceLog.setUserPermissions(StringUtils.join(userInfo.getPermissions(), ",")); + traceLog.setCompanyId(userInfo.getCompanyUser()!=null?userInfo.getCompanyUser().getId():null); + traceLog.setCompanyId(userInfo.getCompany()!=null?userInfo.getCompany().getId():null); } // 鎿嶄綔淇℃伅 traceLog.setOperaModule(this.getModule(handler)); diff --git a/server/src/main/java/doumeemes/dao/business/BizLingyangMapper.java b/server/src/main/java/doumeemes/dao/business/BizLingyangMapper.java new file mode 100644 index 0000000..f54ad82 --- /dev/null +++ b/server/src/main/java/doumeemes/dao/business/BizLingyangMapper.java @@ -0,0 +1,12 @@ +package doumeemes.dao.business; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import doumeemes.dao.business.model.BizLingyang; + +/** + * @author 姹熻箘韫� + * @date 2023/10/25 18:17 + */ +public interface BizLingyangMapper extends BaseMapper<BizLingyang> { + +} diff --git a/server/src/main/java/doumeemes/dao/business/model/BizLingyang.java b/server/src/main/java/doumeemes/dao/business/model/BizLingyang.java new file mode 100644 index 0000000..34b2611 --- /dev/null +++ b/server/src/main/java/doumeemes/dao/business/model/BizLingyang.java @@ -0,0 +1,63 @@ +package doumeemes.dao.business.model; + +import doumeemes.core.annotation.excel.ExcelColumn; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; + +/** + * 缇氱緤瀵规帴鏁版嵁鏄庣粏琛� + * @author 姹熻箘韫� + * @date 2023/10/25 18:17 + */ +@Data +@ApiModel("缇氱緤瀵规帴鏁版嵁鏄庣粏琛�") +@TableName("`biz_lingyang`") +public class BizLingyang { + + @TableId(type = IdType.AUTO) + @ApiModelProperty(value = "涓婚敭", example = "1") + @ExcelColumn(name="涓婚敭") + private Integer id; + + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + @ExcelColumn(name="鍒涘缓鏃堕棿") + private Date createTime; + + @ApiModelProperty(value = "澶囨敞") + @ExcelColumn(name="澶囨敞") + private String remark; + + @ApiModelProperty(value = "浼佷笟缂栫爜", example = "1") + @ExcelColumn(name="浼佷笟缂栫爜") + private Integer companyId; + + @ApiModelProperty(value = "浼佷笟缁熶竴淇$敤浠g爜") + @ExcelColumn(name="浼佷笟缁熶竴淇$敤浠g爜") + private String creditCode; + + @ApiModelProperty(value = "搴旂敤鍞竴鏍囪瘑") + @ExcelColumn(name="搴旂敤鍞竴鏍囪瘑") + private String appKey; + + @ApiModelProperty(value = "缇氱緤鐢ㄦ埛鐨勬墜鏈哄彿") + @ExcelColumn(name="缇氱緤鐢ㄦ埛鐨勬墜鏈哄彿") + private String userPhone; + + @ApiModelProperty(value = "缇氱緤浜х敓鐨勭敤鎴稩D", example = "1") + @ExcelColumn(name="缇氱緤浜х敓鐨勭敤鎴稩D") + private Long userId; + + @ApiModelProperty(value = "鎿嶄綔娆℃暟", example = "1") + @ExcelColumn(name="鎿嶄綔娆℃暟") + private Integer actionTimes; + @ApiModelProperty(value = "鐧婚檰娆℃暟", example = "1") + @ExcelColumn(name="鐧婚檰娆℃暟") + private Integer loginTimes; + +} diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java index a21e31d..bbed668 100644 --- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java +++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java @@ -40,7 +40,19 @@ @ExcelColumn(name="浼佷笟鍚嶇О", width = 16) @TableField(exist = false) private String companyName; + @ApiModelProperty(value = "浼佷笟缁熶竴淇$敤浠g爜") + @TableField(exist = false) + private String companyCode; + @ApiModelProperty(value = "缇氱緤userID") + @TableField(exist = false) + private String lingyangUserid; + @ApiModelProperty(value = "鐧婚檰娆℃暟") + @TableField(exist = false) + private int num; + @ApiModelProperty(value = "鎿嶄綔娆℃暟") + @TableField(exist = false) + private int logNum; @ApiModelProperty(value = "浼佷笟鐢ㄦ埛鍚嶇О") @ExcelColumn(name="浼佷笟鐢ㄦ埛鍚嶇О", width = 16) @TableField(exist = false) diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemTraceLog.java b/server/src/main/java/doumeemes/dao/system/model/SystemTraceLog.java index bc8dede..e1b9dec 100644 --- a/server/src/main/java/doumeemes/dao/system/model/SystemTraceLog.java +++ b/server/src/main/java/doumeemes/dao/system/model/SystemTraceLog.java @@ -47,6 +47,12 @@ @ApiModelProperty(value = "鎿嶄綔绫诲瀷") @ExcelColumn(name="鎿嶄綔绫诲瀷") private String operaType; + @ApiModelProperty(value = "浼佷笟缂栫爜") + @ExcelColumn(name="浼佷笟缂栫爜") + private Integer companyId; + @ApiModelProperty(value = "浼佷笟鐢ㄦ埛缂栫爜") + @ExcelColumn(name="浼佷笟鐢ㄦ埛缂栫爜") + private Integer companyUserId; @ApiModelProperty(value = "鎿嶄綔澶囨敞") @ExcelColumn(name="澶囨敞", width = 5) diff --git a/server/src/main/java/doumeemes/service/business/BizLingyangService.java b/server/src/main/java/doumeemes/service/business/BizLingyangService.java new file mode 100644 index 0000000..9333920 --- /dev/null +++ b/server/src/main/java/doumeemes/service/business/BizLingyangService.java @@ -0,0 +1,98 @@ +package doumeemes.service.business; + +import doumeemes.core.model.PageData; +import doumeemes.core.model.PageWrap; +import doumeemes.dao.business.model.BizLingyang; +import java.util.List; + +/** + * 缇氱緤瀵规帴鏁版嵁鏄庣粏琛⊿ervice瀹氫箟 + * @author 姹熻箘韫� + * @date 2023/10/25 18:17 + */ +public interface BizLingyangService { + + /** + * 鍒涘缓 + * + * @param bizLingyang 瀹炰綋瀵硅薄 + * @return Integer + */ + Integer create(BizLingyang bizLingyang); + + /** + * 涓婚敭鍒犻櫎 + * + * @param id 涓婚敭 + */ + void deleteById(Integer id); + + /** + * 鍒犻櫎 + * + * @param bizLingyang 瀹炰綋瀵硅薄 + */ + void delete(BizLingyang bizLingyang); + + /** + * 鎵归噺涓婚敭鍒犻櫎 + * + * @param ids 涓婚敭闆� + */ + void deleteByIdInBatch(List<Integer> ids); + + /** + * 涓婚敭鏇存柊 + * + * @param bizLingyang 瀹炰綋瀵硅薄 + */ + void updateById(BizLingyang bizLingyang); + + /** + * 鎵归噺涓婚敭鏇存柊 + * + * @param bizLingyangs 瀹炰綋闆� + */ + void updateByIdInBatch(List<BizLingyang> bizLingyangs); + void syncLingData(); + + /** + * 涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return BizLingyang + */ + BizLingyang findById(Integer id); + + /** + * 鏉′欢鏌ヨ鍗曟潯璁板綍 + * + * @param bizLingyang 瀹炰綋瀵硅薄 + * @return BizLingyang + */ + BizLingyang findOne(BizLingyang bizLingyang); + + /** + * 鏉′欢鏌ヨ + * + * @param bizLingyang 瀹炰綋瀵硅薄 + * @return List<BizLingyang> + */ + List<BizLingyang> findList(BizLingyang bizLingyang); + + /** + * 鍒嗛〉鏌ヨ + * + * @param pageWrap 鍒嗛〉瀵硅薄 + * @return PageData<BizLingyang> + */ + PageData<BizLingyang> findPage(PageWrap<BizLingyang> pageWrap); + + /** + * 鏉′欢缁熻 + * + * @param bizLingyang 瀹炰綋瀵硅薄 + * @return long + */ + long count(BizLingyang bizLingyang); +} diff --git a/server/src/main/java/doumeemes/service/business/impl/BizLingyangServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/BizLingyangServiceImpl.java new file mode 100644 index 0000000..230f60a --- /dev/null +++ b/server/src/main/java/doumeemes/service/business/impl/BizLingyangServiceImpl.java @@ -0,0 +1,186 @@ +package doumeemes.service.business.impl; + +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import doumeemes.biz.system.SystemDictDataBiz; +import doumeemes.core.model.PageData; +import doumeemes.core.model.PageWrap; +import doumeemes.core.utils.Constants; +import doumeemes.core.utils.Utils; +import doumeemes.dao.business.BizLingyangMapper; +import doumeemes.dao.business.model.BizLingyang; +import doumeemes.dao.business.model.Company; +import doumeemes.dao.business.model.CompanyUser; +import doumeemes.dao.system.join.SystemLoginLogJoinMapper; +import doumeemes.dao.system.model.SystemLoginLog; +import doumeemes.service.business.BizLingyangService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import doumeemes.service.system.SystemLoginLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.Date; +import java.util.List; + +/** + * 缇氱緤瀵规帴鏁版嵁鏄庣粏琛⊿ervice瀹炵幇 + * @author 姹熻箘韫� + * @date 2023/10/25 18:17 + */ +@Service +public class BizLingyangServiceImpl implements BizLingyangService { + + @Autowired + private BizLingyangMapper bizLingyangMapper; + @Autowired + @Lazy + private SystemDictDataBiz systemDictDataBiz; + + @Autowired + private SystemLoginLogJoinMapper systemLoginLogJoinMapper; + + @Override + public Integer create(BizLingyang bizLingyang) { + bizLingyangMapper.insert(bizLingyang); + return bizLingyang.getId(); + } + + @Override + public void deleteById(Integer id) { + bizLingyangMapper.deleteById(id); + } + + @Override + public void delete(BizLingyang bizLingyang) { + UpdateWrapper<BizLingyang> deleteWrapper = new UpdateWrapper<>(bizLingyang); + bizLingyangMapper.delete(deleteWrapper); + } + + @Override + public void deleteByIdInBatch(List<Integer> ids) { + if (CollectionUtils.isEmpty(ids)) { + return; + } + bizLingyangMapper.deleteBatchIds(ids); + } + + @Override + public void updateById(BizLingyang bizLingyang) { + bizLingyangMapper.updateById(bizLingyang); + } + + @Override + public void updateByIdInBatch(List<BizLingyang> bizLingyangs) { + if (CollectionUtils.isEmpty(bizLingyangs)) { + return; + } + for (BizLingyang bizLingyang: bizLingyangs) { + this.updateById(bizLingyang); + } + } + @Override + @Transactional + public void syncLingData() { + Date date = new Date(); + QueryWrapper<SystemLoginLog> param = new QueryWrapper<>(); + MPJLambdaWrapper<SystemLoginLog> mpjLambdaWrapper = new MPJLambdaWrapper<>(); + mpjLambdaWrapper.selectAll(SystemLoginLog.class); + mpjLambdaWrapper.leftJoin(Company.class,Company::getId,SystemLoginLog::getCompanyId); + mpjLambdaWrapper.leftJoin(CompanyUser.class,CompanyUser::getId,SystemLoginLog::getCompanyUserId); + mpjLambdaWrapper.select("(select count(b.id) from system_trace_log b where b.company_id=t1.id and b.company_user_id=t2.id) as logNum"); + mpjLambdaWrapper.selectAs( CompanyUser::getLingyangUserid,SystemLoginLog::getLingyangUserid); + mpjLambdaWrapper.selectAs(Company::getCreditCode, SystemLoginLog::getCompanyCode); + mpjLambdaWrapper.eq(SystemLoginLog::getSuccess, Constants.ONE); + mpjLambdaWrapper.eq(SystemLoginLog::getOrgin, Constants.USER_LOGIN_ORIGIN.lingyang); + mpjLambdaWrapper.apply("to_days(login_time) =to_days(now())" ); + mpjLambdaWrapper.select("count(t.id) as num"); + mpjLambdaWrapper.groupBy(SystemLoginLog::getUserId); + List<SystemLoginLog> list = systemLoginLogJoinMapper.selectJoinList(SystemLoginLog.class,mpjLambdaWrapper); + if(list!=null && list.size()>0){ + for(SystemLoginLog log : list){ + BizLingyang model = new BizLingyang(); + model.setCompanyId(log.getCompanyId()); + model.setCreateTime(new Date()); + model.setUserPhone(log.getLoginUsername()); + model.setCreditCode(log.getCompanyCode()); + try { + model.setUserId(Long.parseLong(log.getLingyangUserid())); + }catch (Exception e){ + + } + model.setAppKey(systemDictDataBiz.queryByCode(Constants.LINGYANG_PARAM,Constants.LINGYANG_APPKEY ).getCode()); + model.setActionTimes(log.getLogNum()); + model.setLoginTimes(log.getNum()); + bizLingyangMapper.insert(model); + } + } + + } + + @Override + public BizLingyang findById(Integer id) { + return bizLingyangMapper.selectById(id); + } + + @Override + public BizLingyang findOne(BizLingyang bizLingyang) { + QueryWrapper<BizLingyang> wrapper = new QueryWrapper<>(bizLingyang); + return bizLingyangMapper.selectOne(wrapper); + } + + @Override + public List<BizLingyang> findList(BizLingyang bizLingyang) { + QueryWrapper<BizLingyang> wrapper = new QueryWrapper<>(bizLingyang); + return bizLingyangMapper.selectList(wrapper); + } + + @Override + public PageData<BizLingyang> findPage(PageWrap<BizLingyang> pageWrap) { + IPage<BizLingyang> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); + QueryWrapper<BizLingyang> queryWrapper = new QueryWrapper<>(); + Utils.MP.blankToNull(pageWrap.getModel()); + if (pageWrap.getModel().getId() != null) { + queryWrapper.lambda().eq(BizLingyang::getId, pageWrap.getModel().getId()); + } + if (pageWrap.getModel().getRemark() != null) { + queryWrapper.lambda().eq(BizLingyang::getRemark, pageWrap.getModel().getRemark()); + } + if (pageWrap.getModel().getCompanyId() != null) { + queryWrapper.lambda().eq(BizLingyang::getCompanyId, pageWrap.getModel().getCompanyId()); + } + if (pageWrap.getModel().getCreditCode() != null) { + queryWrapper.lambda().eq(BizLingyang::getCreditCode, pageWrap.getModel().getCreditCode()); + } + if (pageWrap.getModel().getAppKey() != null) { + queryWrapper.lambda().eq(BizLingyang::getAppKey, pageWrap.getModel().getAppKey()); + } + if (pageWrap.getModel().getUserPhone() != null) { + queryWrapper.lambda().eq(BizLingyang::getUserPhone, pageWrap.getModel().getUserPhone()); + } + if (pageWrap.getModel().getUserId() != null) { + queryWrapper.lambda().eq(BizLingyang::getUserId, pageWrap.getModel().getUserId()); + } + if (pageWrap.getModel().getActionTimes() != null) { + queryWrapper.lambda().eq(BizLingyang::getActionTimes, pageWrap.getModel().getActionTimes()); + } + for(PageWrap.SortData sortData: pageWrap.getSorts()) { + if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) { + queryWrapper.orderByDesc(sortData.getProperty()); + } else { + queryWrapper.orderByAsc(sortData.getProperty()); + } + } + return PageData.from(bizLingyangMapper.selectPage(page, queryWrapper)); + } + + @Override + public long count(BizLingyang bizLingyang) { + QueryWrapper<BizLingyang> wrapper = new QueryWrapper<>(bizLingyang); + return bizLingyangMapper.selectCount(wrapper); + } +} diff --git a/server/src/main/java/doumeemes/task/ScheduleTool.java b/server/src/main/java/doumeemes/task/ScheduleTool.java index 05b750d..66fca74 100644 --- a/server/src/main/java/doumeemes/task/ScheduleTool.java +++ b/server/src/main/java/doumeemes/task/ScheduleTool.java @@ -3,6 +3,7 @@ import doumeemes.biz.system.SystemDictDataBiz; import doumeemes.core.utils.DateUtil; +import doumeemes.service.business.BizLingyangService; import doumeemes.service.business.PlansService; import doumeemes.service.ext.*; import doumeemes.service.system.SystemDictService; @@ -24,6 +25,8 @@ public RabbitTemplate rabbitTemplate; @Autowired DepartmentExtService departmentExtService; + @Autowired + BizLingyangService bizLingyangService; @Autowired BarcodeParamExtService barcodeParamExtService; @Autowired @@ -95,6 +98,18 @@ departmentExtService.initCompnayCodes(); System.out.println("瀹氭椂鍔犺浇鏁版嵁code缂撳瓨淇℃伅--------end------"); } + /** + * 姣忓ぉ瀹氭椂缁熻缇氱緤鏁版嵁淇℃伅 + * @throws Exception + */ +// @Scheduled(cron="0 59 23 * * ?") + @Scheduled(fixedDelay = 1000 * 60 * 60 * 1) + public void syncLingData() throws Exception { + System.out.println("姣忓ぉ瀹氭椂缁熻缇氱緤鏁版嵁淇℃伅--------Begin------"); + //TODO--------------姣忓ぉ瀹氭椂缁熻缇氱緤鏁版嵁淇℃伅------------ + bizLingyangService.syncLingData(); + System.out.println("姣忓ぉ瀹氭椂缁熻缇氱緤鏁版嵁淇℃伅--------end------"); + } /** * 姣忓ぉ鍑屾櫒瀹氱偣鍏抽棴涓嶈兘鍏抽棴鐨勮鍒� diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index ae670ec..f8bd246 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -9,7 +9,7 @@ # application: # name: doumeemes profiles: - active: standardLingyang + active: standardPro # JSON杩斿洖閰嶇疆 jackson: # 榛樿鏃跺尯 -- Gitblit v1.9.3