feat: 基础配置DO实体类主键改用雪花算法

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodePartDO.java

@@ -25,7 +25,7 @@ public class AutocodePartDO extends BaseDO {
     /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 规则ID

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRecordDO.java

@@ -25,7 +25,7 @@ public class AutocodeRecordDO extends BaseDO {
     /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 规则ID

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/autocode/AutocodeRuleDO.java

@@ -25,7 +25,7 @@ public class AutocodeRuleDO extends BaseDO {
     /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 规则编码

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/config/ConfigDO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.infra.dal.dataobject.config;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.infra.enums.config.ConfigTypeEnum;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -24,7 +25,7 @@ public class ConfigDO extends BaseDO {
     /**
      * 参数主键
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 参数分类

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java

@@ -45,8 +45,8 @@ public class PrinterConfigController {
     @PostMapping("/create")
     @Operation(summary = "创建打印机配置")
     @PreAuthorize("@ss.hasPermission('printer:config:create')")
-    public CommonResult<Integer> createConfig(@Valid @RequestBody PrinterConfigSaveReqVO createReqVO) {
+    public CommonResult<Long> createConfig(@Valid @RequestBody PrinterConfigSaveReqVO createReqVO) {
-        Integer config = configService.createConfig(createReqVO);
+        Long config = configService.createConfig(createReqVO);
         if(config ==null){
             return error(500,"该主机名对应的打印机");
         }
@@ -65,7 +65,7 @@ public class PrinterConfigController {
     @Operation(summary = "删除打印机配置")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('printer:config:delete')")
-    public CommonResult<Boolean> deleteConfig(@RequestParam("id") Integer id) {
+    public CommonResult<Boolean> deleteConfig(@RequestParam("id") Long id) {
         configService.deleteConfig(id);
         return success(true);
     }
@@ -74,7 +74,7 @@ public class PrinterConfigController {
     @Operation(summary = "获得打印机配置")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('printer:config:query')")
-    public CommonResult<PrinterConfigRespVO> getConfig(@RequestParam("id") Integer id) {
+    public CommonResult<PrinterConfigRespVO> getConfig(@RequestParam("id") Long id) {
         PrinterConfigDO config = configService.getConfig(id);
         return success(BeanUtils.toBean(config, PrinterConfigRespVO.class));
     }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigRespVO.java

@@ -17,7 +17,7 @@ public class PrinterConfigRespVO {
 
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14325")
     @ExcelProperty("主键ID")
-    private Integer id;
+    private Long id;
 
     @Schema(description = "主机名（如PACKING-PC-01），不可修改", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
     @ExcelProperty("主机名（如PACKING-PC-01），不可修改")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/vo/PrinterConfigSaveReqVO.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 public class PrinterConfigSaveReqVO {
 
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14325")
-    private Integer id;
+    private Long id;
 
     @Schema(description = "主机名（如PACKING-PC-01），不可修改", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
     @NotEmpty(message = "主机名（如PACKING-PC-01），不可修改不能为空")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/calholiday/CalHolidayDO.java

@@ -33,7 +33,7 @@ public class CalHolidayDO extends BaseDO {
     /**
      * 流水号
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long holidayId;
     /**
      * 日期

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/esopFile/EsopFileDO.java

@@ -26,7 +26,7 @@ public class EsopFileDO extends BaseDO {
     /**
      * id
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 配置编号

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printconfig/PrinterConfigDO.java

@@ -29,8 +29,8 @@ public class PrinterConfigDO extends BaseDO {
     /**
      * 主键ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
-    private Integer id;
+    private Long id;
     /**
      * 主机名（如PACKING-PC-01），不可修改
      */

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/printtemplate/PrintTemplateDO.java

@@ -25,7 +25,7 @@ public class PrintTemplateDO extends BaseDO {
     /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 模板编码

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processparameter/ProcessParameterDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.processparameter;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,7 @@ public class ProcessParameterDO extends BaseDO {
     /**
      * 编号
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 工艺参数编码

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.processroute;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,7 +23,7 @@ public class ProcessRouteDO extends BaseDO {
     /**
      * 编号
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 工艺路线编码

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/processroute/ProcessRouteItemDO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.processroute;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.processparameter.ProcessParameterDO;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -23,7 +24,7 @@ public class ProcessRouteItemDO extends BaseDO {
     /**
      * 编号
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 工艺路线编号

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigService.java

@@ -22,7 +22,7 @@ public interface PrinterConfigService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Integer createConfig(@Valid PrinterConfigSaveReqVO createReqVO);
+    Long createConfig(@Valid PrinterConfigSaveReqVO createReqVO);
 
     /**
      * 更新打印机配置
@@ -36,7 +36,7 @@ public interface PrinterConfigService {
      *
      * @param id 编号
      */
-    void deleteConfig(Integer id);
+    void deleteConfig(Long id);
 
     /**
      * 获得打印机配置
@@ -44,7 +44,7 @@ public interface PrinterConfigService {
      * @param id 编号
      * @return 打印机配置
      */
-    PrinterConfigDO getConfig(Integer id);
+    PrinterConfigDO getConfig(Long id);
 
     /**
      * 获得打印机配置分页

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/printconfig/PrinterConfigServiceImpl.java

@@ -34,7 +34,7 @@ public class PrinterConfigServiceImpl implements PrinterConfigService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Integer createConfig(PrinterConfigSaveReqVO createReqVO) {
+    public Long createConfig(PrinterConfigSaveReqVO createReqVO) {
         // 插入
         PrinterConfigDO config = BeanUtils.toBean(createReqVO, PrinterConfigDO.class);
         try {
@@ -57,21 +57,21 @@ public class PrinterConfigServiceImpl implements PrinterConfigService {
     }
 
     @Override
-    public void deleteConfig(Integer id) {
+    public void deleteConfig(Long id) {
         // 校验存在
         validateConfigExists(id);
         // 删除
         printerConfigMapper.deleteById(id);
     }
 
-    private void validateConfigExists(Integer id) {
+    private void validateConfigExists(Long id) {
         if (printerConfigMapper.selectById(id) == null) {
             throw exception(CONFIG_NOT_EXISTS);
         }
     }
 
     @Override
-    public PrinterConfigDO getConfig(Integer id) {
+    public PrinterConfigDO getConfig(Long id) {
         return printerConfigMapper.selectById(id);
     }