From e08dc9324cb4b9125ff12bba246738eca2176156 Mon Sep 17 00:00:00 2001 From: yangsb Date: Wed, 3 Apr 2024 11:15:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BF=BD=E7=95=A5=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/infra/controller/admin/file/FileController.java | 1 + .../infra/service/logger/ApiErrorLogServiceImpl.java | 7 +------ .../system/controller/admin/label/LabelController.java | 2 ++ .../admin/labeltemplate/LabelTemplateController.java | 2 ++ .../system/controller/admin/machine/MachineController.java | 3 +++ .../admin/machine/MachineTemplateController.java | 3 +++ 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/FileController.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/FileController.java index 0720e8a44..d9c2f8c83 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/FileController.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/FileController.java @@ -63,6 +63,7 @@ public class FileController { @PermitAll @Operation(summary = "下载文件") @Parameter(name = "configId", description = "配置编号", required = true) + @OperateLog(enable = false) public void getFileContent(HttpServletRequest request, HttpServletResponse response, @PathVariable("configId") Long configId) throws Exception { diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java index 519cc58a4..2b05e270c 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java @@ -8,7 +8,6 @@ import com.cf.imes.module.infra.dal.dataobject.logger.ApiErrorLogDO; import com.cf.imes.module.infra.dal.mysql.logger.ApiErrorLogMapper; import com.cf.imes.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; import lombok.extern.slf4j.Slf4j; -import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -36,11 +35,7 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService { public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) { ApiErrorLogDO apiErrorLog = BeanUtils.toBean(createDTO, ApiErrorLogDO.class) .setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus()); - try { - apiErrorLogMapper.insert(apiErrorLog); - }catch (DataIntegrityViolationException e) { - log.error(apiErrorLog.toString()); - } + apiErrorLogMapper.insert(apiErrorLog); } @Override diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java index e7d5b7a6e..1aaaf0086 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java @@ -40,6 +40,7 @@ public class LabelController { @PostMapping("/create") @Operation(summary = "创建标签") @PreAuthorize("@ss.hasPermission('system:label:create')") + @OperateLog(logArgs = false) public CommonResult createLabel(@Valid @RequestBody LabelSaveReqVO createReqVO) { return success(labelService.createLabel(createReqVO)); } @@ -47,6 +48,7 @@ public class LabelController { @PutMapping("/update") @Operation(summary = "更新标签") @PreAuthorize("@ss.hasPermission('system:label:update')") + @OperateLog(logArgs = false) public CommonResult updateLabel(@Valid @RequestBody LabelSaveReqVO updateReqVO) { labelService.updateLabel(updateReqVO); return success(true); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java index 5e3f7d514..3117bc22e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java @@ -41,6 +41,7 @@ public class LabelTemplateController { @PostMapping("/create") @Operation(summary = "创建标签模板") @PreAuthorize("@ss.hasPermission('system:label-template:create')") + @OperateLog(logArgs = false) public CommonResult createLabelTemplate(@Valid @RequestBody LabelTemplateSaveReqVO createReqVO) { return success(labelTemplateService.createLabelTemplate(createReqVO)); } @@ -48,6 +49,7 @@ public class LabelTemplateController { @PutMapping("/update") @Operation(summary = "更新标签模板") @PreAuthorize("@ss.hasPermission('system:label-template:update')") + @OperateLog(logArgs = false) public CommonResult updateLabelTemplate(@Valid @RequestBody LabelTemplateSaveReqVO updateReqVO) { labelTemplateService.updateLabelTemplate(updateReqVO); return success(true); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java index 5d69c70ab..cde20529d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.controller.admin.machine; import com.cf.imes.framework.es.core.valid.UpdateGroup; +import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.service.machine.MachineService; @@ -38,6 +39,7 @@ public class MachineController { @PutMapping("/create-cutting") @Operation(summary = "创建机台") @PreAuthorize("@ss.hasPermission('machine::create')") + @OperateLog(logArgs = false) public CommonResult createCutting(@Valid @RequestBody CuttingSaveReqVO createReqVO) { return success(machineService.createCutting(createReqVO)); } @@ -45,6 +47,7 @@ public class MachineController { @PostMapping("/update-cutting") @Operation(summary = "更新机台") @PreAuthorize("@ss.hasPermission('machine::update')") + @OperateLog(logArgs = false) public CommonResult update( @RequestBody @Validated(UpdateGroup.class) CuttingSaveReqVO updateReqVO) { machineService.updateCutting(updateReqVO); return success(true); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index efb49df03..e6891eb9a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -4,6 +4,7 @@ import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; +import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; import com.cf.imes.module.system.service.machine.MachineTemplateService; @@ -52,6 +53,7 @@ public class MachineTemplateController { @PutMapping("cutting-machine") @Operation(summary = "新增机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::create')") + @OperateLog(logArgs = false) public CommonResult createCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) { return success(machineTemplateService.createCuttingTemplate(reqVO)); } @@ -59,6 +61,7 @@ public class MachineTemplateController { @PostMapping("cutting-machine") @Operation(summary = "修改机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::update')") + @OperateLog(logArgs = false) public CommonResult updateCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) { return success(machineTemplateService.updateCuttingTemplate(reqVO)); }