feat: 设备管理DO实体类主键改用雪花算法

yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.common.dal.dataobject.moldrepair;
 
 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;
@@ -26,7 +27,7 @@ public class MoldRepairDO extends BaseDO {
     /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 维修单编号

yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/dataobject/moldrepair/MoldRepairLineDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.common.dal.dataobject.moldrepair;
 
 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;
@@ -24,7 +25,7 @@ public class MoldRepairLineDO extends BaseDO {
     /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 维修单ID

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerPageReqVO.java

@@ -43,10 +43,10 @@ public class DeviceLedgerPageReqVO extends PageParam {
     private Long deviceType;
 
     @Schema(description = "设备产线", example = "1")
-    private Integer deviceLine;
+    private Long deviceLine;
 
     @Schema(description = "设备产线集合")
-    private List<Integer> deviceLineIds;
+    private List<Long> deviceLineIds;
 
     @Schema(description = "供应商")
     private String supplier;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java

@@ -45,7 +45,7 @@ public class DeviceLedgerRespVO extends BaseDO {
     private String deviceType;
 
     @Schema(description = "设备产线")
-    private Integer deviceLine;
+    private Long deviceLine;
 
     @Schema(description = "顶级分类 id")
     private Long topCategoryId;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerSaveReqVO.java

@@ -42,7 +42,7 @@ public class DeviceLedgerSaveReqVO {
     private String deviceType;
 
     @Schema(description = "设备产线", example = "1")
-    private Integer deviceLine;
+    private Long deviceLine;
 
     @Schema(description = "供应商")
     private String supplier;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/vo/MoldOperateSaveReqVO.java

@@ -22,7 +22,7 @@ public class MoldOperateSaveReqVO {
     private Integer operateType;
 
     @Schema(description = "关联模具id", example = "23041")
-    private Integer moldId;
+    private Long moldId;
 
     @Schema(description = "关联设备id", example = "5057")
     private Long deviceId;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/criticalcomponent/CriticalComponentDO.java

@@ -31,7 +31,7 @@ public class CriticalComponentDO 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/devicecriticalcomponent/DeviceCriticalComponentDO.java

@@ -25,7 +25,7 @@ public class DeviceCriticalComponentDO 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/deviceledger/DeviceLedgerComponentRelDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger;
 
 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;
@@ -21,7 +22,7 @@ import lombok.ToString;
 @AllArgsConstructor
 public class DeviceLedgerComponentRelDO extends BaseDO {
 
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     private Long deviceLedgerId;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java

@@ -34,7 +34,7 @@ public class DeviceLedgerDO extends BaseDO {
     /**
      * id
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
@@ -72,7 +72,7 @@ public class DeviceLedgerDO extends BaseDO {
     /**
      * 设备产线
      */
-    private Integer deviceLine;
+    private Long deviceLine;
 
     /**
      * 顶级分类 id

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerSpareRelDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.deviceledger;
 
 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;
@@ -21,7 +22,7 @@ import lombok.ToString;
 @AllArgsConstructor
 public class DeviceLedgerSpareRelDO extends BaseDO {
 
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     private Long deviceLedgerId;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceline/DeviceLineDO.java

@@ -25,7 +25,7 @@ public class DeviceLineDO 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/devicetype/DeviceTypeDO.java

@@ -26,7 +26,7 @@ public class DeviceTypeDO 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/dvcheck/DvCheckDO.java

@@ -29,7 +29,7 @@ public class DvCheckDO 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/dvcheck/DvCheckDeviceDO.java

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

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvcheck/DvCheckSubjectDO.java

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

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvrepair/DvRepairDO.java

@@ -34,7 +34,7 @@ public class DvRepairDO 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/dvrepair/DvRepairLineDO.java

@@ -25,7 +25,7 @@ public class DvRepairLineDO extends BaseDO {
     /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 维修单ID

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/dvsubject/DvSubjectDO.java

@@ -25,7 +25,7 @@ public class DvSubjectDO 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/machine/MachineComponentDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.machine;
 
 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;
@@ -28,7 +29,7 @@ public class MachineComponentDO extends BaseDO {
     /**
      * 装备id
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 
     //@ExcelProperty("编码")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/moldplanmaintenance/MoldPlanMaintenanceDO.java

@@ -26,7 +26,7 @@ public class MoldPlanMaintenanceDO 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/moldrepairtems/MoldRepairTemsDO.java

@@ -25,7 +25,7 @@ public class MoldRepairTemsDO 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/moldsubject/MoldSubjectDO.java

@@ -25,7 +25,7 @@ public class MoldSubjectDO 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/moldtaskmanagement/MoldTaskManagementDO.java

@@ -33,7 +33,7 @@ public class MoldTaskManagementDO 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/planlinechange/PlanLineChangeRecordDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.planlinechange;
 
 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;
@@ -24,7 +25,7 @@ public class PlanLineChangeRecordDO 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/planmaintenance/PlanMaintenanceDO.java

@@ -25,7 +25,7 @@ public class PlanMaintenanceDO 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/planrecord/PlanRecordDO.java

@@ -26,7 +26,7 @@ public class PlanRecordDO extends BaseDO {
     /**
      * ID
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 任务单ID

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/planroute/PlanProcessRouteItemDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.planroute;
 
 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 PlanProcessRouteItemDO 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/repairtems/RepairTemsDO.java

@@ -25,7 +25,7 @@ public class RepairTemsDO 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/subjectmoldplan/SubjectMoldPlanDO.java

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

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/subjectplan/SubjectPlanDO.java

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

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/taskmanagement/TaskManagementDO.java

@@ -33,7 +33,7 @@ public class TaskManagementDO 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/ticketmanagement/TicketManagementDO.java

@@ -32,7 +32,7 @@ public class TicketManagementDO extends BaseDO {
     /**
      * id
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 任务ID

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/ticketresults/TicketResultsDO.java

@@ -26,7 +26,7 @@ public class TicketResultsDO 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/workreportplan/WorkReportPlanDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.dal.dataobject.workreportplan;
 
 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;
@@ -26,7 +27,7 @@ public class WorkReportPlanDO extends BaseDO {
     /**
      * id
      */
-    @TableId
+    @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
      * 报工单id

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java

@@ -516,8 +516,8 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
             return true;
         }
         if (pageReqVO.getDeviceLine() != null) {
-            Set<Integer> deviceLineIds = new LinkedHashSet<>();
-            collectDeviceLineIds(Long.valueOf(pageReqVO.getDeviceLine()), deviceLineIds);
+            Set<Long> deviceLineIds = new LinkedHashSet<>();
+            collectDeviceLineIds(pageReqVO.getDeviceLine(), deviceLineIds);
             if (deviceLineIds.isEmpty()) {
                 return false;
             }
@@ -546,7 +546,7 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
         return true;
     }
 
-    private void collectDeviceLineIds(Long deviceLineId, Set<Integer> results) {
+    private void collectDeviceLineIds(Long deviceLineId, Set<Long> results) {
         if (deviceLineId == null) {
             return;
         }
@@ -554,7 +554,7 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
         if (deviceLine == null) {
             return;
         }
-        results.add(deviceLineId.intValue());
+        results.add(deviceLineId);
         List<DeviceLineDO> children = deviceLineService.getChildrenDeviceLines(deviceLineId);
         if (CollUtil.isEmpty(children)) {
             return;