打印机配置update

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, "打印机配置已存在,请不要重复添加");
 }

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<Integer> 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")

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;
+
 
 }

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;
 
 }

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;
 
 }

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<PrinterConfigDO> {
                 .eqIfPresent(PrinterConfigDO::getIsDefault, reqVO.getIsDefault())
                 .eqIfPresent(PrinterConfigDO::getIsEnabled, reqVO.getIsEnabled())
                 .eqIfPresent(PrinterConfigDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(PrinterConfigDO::getCreatedAt, reqVO.getCreatedAt())
+                .eqIfPresent(PrinterConfigDO::getCreator, reqVO.getCreatedAt())
-                .eqIfPresent(PrinterConfigDO::getUpdatedAt, reqVO.getUpdatedAt())
+                .eqIfPresent(PrinterConfigDO::getUpdater, reqVO.getUpdatedAt())
                 .orderByDesc(PrinterConfigDO::getId));
     }
 

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();
     }