From e45dcb2945af5c1eda4bb08a867fe561a221145b Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Sat, 13 Jun 2026 10:42:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E9=85=8D=E7=BD=AEup?= =?UTF-8?q?date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/mes/enums/ErrorCodeConstants.java | 1 + .../admin/printconfig/PrinterConfigController.java | 7 ++++++- .../admin/printconfig/vo/PrinterConfigRespVO.java | 13 +++++++++++-- .../printconfig/vo/PrinterConfigSaveReqVO.java | 2 -- .../dal/dataobject/printconfig/PrinterConfigDO.java | 9 +++++++-- .../dal/mysql/printconfig/PrinterConfigMapper.java | 4 ++-- .../printconfig/PrinterConfigServiceImpl.java | 11 ++++++++++- 7 files changed, 37 insertions(+), 10 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java index 5373fb7ca..dad9a7d0e 100644 --- a/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java +++ b/yudao-module-mes/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java @@ -217,4 +217,5 @@ public interface ErrorCodeConstants { // ========== 打印机配置 TODO 补充编号 ========== ErrorCode CONFIG_NOT_EXISTS = new ErrorCode(100_601_0001, "打印机配置不存在"); + ErrorCode CONFIG_EXISTS = new ErrorCode(100_601_0001, "打印机配置已存在,请不要重复添加"); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java index 3073432f9..4b79dd2ce 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java @@ -25,6 +25,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; @@ -45,7 +46,11 @@ public class PrinterConfigController { @Operation(summary = "创建打印机配置") @PreAuthorize("@ss.hasPermission('printer:config:create')") public CommonResult createConfig(@Valid @RequestBody PrinterConfigSaveReqVO createReqVO) { - return success(configService.createConfig(createReqVO)); + Integer config = configService.createConfig(createReqVO); + if(config ==null){ + return error(500,"该主机名对应的打印机"); + } + return success(config); } @PutMapping("/update") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java index 41670ee11..45a45570e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java @@ -1,10 +1,14 @@ package cn.iocoder.yudao.module.mes.controller.admin.printconfig.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; +import org.springframework.format.annotation.DateTimeFormat; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @Schema(description = "管理后台 - 打印机配置 Response VO") @Data @@ -37,10 +41,15 @@ public class PrinterConfigRespVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") - private LocalDateTime createdAt; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("更新时间") - private LocalDateTime updatedAt; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java index 69d3f60ba..162bcfb34 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java @@ -33,11 +33,9 @@ public class PrinterConfigSaveReqVO { private String remark; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "创建时间不能为空") private LocalDateTime createdAt; @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "更新时间不能为空") private LocalDateTime updatedAt; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java index 7f5dbebe4..706801e33 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java @@ -6,6 +6,9 @@ import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import org.springframework.format.annotation.DateTimeFormat; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; /** * 打印机配置 DO @@ -50,10 +53,12 @@ public class PrinterConfigDO extends BaseDO { /** * 创建时间 */ - private LocalDateTime createdAt; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime createTime; /** * 更新时间 */ - private LocalDateTime updatedAt; + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime updateTime; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/printconfig/PrinterConfigMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/printconfig/PrinterConfigMapper.java index 90456a99e..aea69a754 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/printconfig/PrinterConfigMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/printconfig/PrinterConfigMapper.java @@ -25,8 +25,8 @@ public interface PrinterConfigMapper extends BaseMapperX { .eqIfPresent(PrinterConfigDO::getIsDefault, reqVO.getIsDefault()) .eqIfPresent(PrinterConfigDO::getIsEnabled, reqVO.getIsEnabled()) .eqIfPresent(PrinterConfigDO::getRemark, reqVO.getRemark()) - .eqIfPresent(PrinterConfigDO::getCreatedAt, reqVO.getCreatedAt()) - .eqIfPresent(PrinterConfigDO::getUpdatedAt, reqVO.getUpdatedAt()) + .eqIfPresent(PrinterConfigDO::getCreator, reqVO.getCreatedAt()) + .eqIfPresent(PrinterConfigDO::getUpdater, reqVO.getUpdatedAt()) .orderByDesc(PrinterConfigDO::getId)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java index 0b6361070..b5d67a3aa 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.mes.controller.admin.printconfig.vo.PrinterConfig import cn.iocoder.yudao.module.mes.controller.admin.printconfig.vo.PrinterConfigSaveReqVO; import cn.iocoder.yudao.module.mes.dal.dataobject.printconfig.PrinterConfigDO; import cn.iocoder.yudao.module.mes.dal.mysql.printconfig.PrinterConfigMapper; +import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -14,8 +15,10 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.CONFIG_NOT_EXISTS; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.CONFIG_EXISTS; /** * 打印机配置 Service 实现类 @@ -30,10 +33,16 @@ public class PrinterConfigServiceImpl implements PrinterConfigService { private PrinterConfigMapper printerConfigMapper; @Override + @Transactional(rollbackFor = Exception.class) public Integer createConfig(PrinterConfigSaveReqVO createReqVO) { // 插入 PrinterConfigDO config = BeanUtils.toBean(createReqVO, PrinterConfigDO.class); - printerConfigMapper.insert(config); + try { + printerConfigMapper.insert(config); + } catch (DuplicateKeyException e) { + // 唯一索引冲突 + throw exception(CONFIG_EXISTS); + } // 返回 return config.getId(); }