From 04824155357b83bead29c834fcb899f53bb1e87a Mon Sep 17 00:00:00 2001 From: zxy Date: Mon, 13 Apr 2026 17:04:30 +0800 Subject: [PATCH] =?UTF-8?q?fix(machines):=20=E4=BF=AE=E5=A4=8D=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E6=9C=8D=E5=8A=A1=E4=B8=AD=E7=9A=84ID=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=98=A0=E5=B0=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/jnpf/service/impl/MachineServiceImpl.java | 4 ++-- .../src/main/java/jnpf/model/proc/ProcEntity.java | 2 +- .../src/main/java/jnpf/model/proline/ProLineEntity.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java index 3e21ac1..bafc23a 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java @@ -76,9 +76,9 @@ public class MachineServiceImpl extends ServiceImpl proLineList = proLineService.list(); List procList = procService.list(); - Map proLineMap = proLineList.stream() + Map proLineMap = proLineList.stream() .collect(Collectors.toMap(ProLineEntity::getId, ProLineEntity::getProLineName)); - Map procMap = procList.stream() + Map procMap = procList.stream() .collect(Collectors.toMap(ProcEntity::getId, ProcEntity::getProcName)); // 设置产线和工序名称 diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcEntity.java index a27f3fa..a5464f7 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcEntity.java @@ -13,7 +13,7 @@ import java.util.Date; @TableName("tba_proc") public class ProcEntity { @TableId(value = "id", type = IdType.AUTO) - private Long id; + private String id; @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) private String creatorUserId; @TableField(value = "f_creator_time", fill = FieldFill.INSERT) diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proline/ProLineEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proline/ProLineEntity.java index 397faff..a7afe96 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proline/ProLineEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proline/ProLineEntity.java @@ -13,7 +13,7 @@ import java.util.Date; @TableName("tba_pro_line") public class ProLineEntity { @TableId(value = "id", type = IdType.AUTO) - private Long id; + private String id; @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) private String creatorUserId; @TableField(value = "f_creator_time", fill = FieldFill.INSERT)