From ca1994644db3d8e770c9adb478a954247481bc91 Mon Sep 17 00:00:00 2001 From: yangsb Date: Fri, 29 Mar 2024 14:02:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/dto/BlockPlaceMessage.java | 2 +- .../admin/plan/dto/ContourData.java | 9 +++++++ .../controller/admin/plan/dto/Metrial.java | 8 +++---- .../admin/plan/dto/ModelDetail.java | 8 +++---- .../dto/{OffSetList.java => ModelOffSet.java} | 2 +- .../dto/{PointList.java => ModelPoint.java} | 2 +- .../admin/plan/dto/OriginModelingData.java | 24 +++++++++++++++++++ .../admin/plan/dto/SideModelDetail.java | 7 +++--- .../admin/machine/vo/AuthTemplateResp.java | 8 +++++++ .../mapper/process/MachineTemplateMapper.xml | 3 ++- 10 files changed, 57 insertions(+), 16 deletions(-) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ContourData.java rename cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/{OffSetList.java => ModelOffSet.java} (95%) rename cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/{PointList.java => ModelPoint.java} (93%) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OriginModelingData.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java index 563f84f50..53d5b287a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java @@ -34,7 +34,7 @@ public class BlockPlaceMessage { @Schema(description = "未移动") private Boolean ia; @Schema(description = "是否重叠isOverlap") - private Boolean iO; + private Boolean io; @Schema(description = "是否排钻") private Boolean dh; @Schema(description = "是否造型") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ContourData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ContourData.java new file mode 100644 index 000000000..0db985f4e --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ContourData.java @@ -0,0 +1,9 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import java.awt.Point; +import java.util.ArrayList; + +public class ContourData { + private ArrayList pts; //点集(二维向量(x,y)) + private Integer[] buls; //凸度(0直线段 >0逆时针方向 <0顺时针方向) +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java index 4ccf11c52..f3293a551 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java @@ -14,7 +14,7 @@ public class Metrial { @Schema(description = "生产单id") private String orderId; @Schema(description = "商品id") - private Integer goodsID; + private Integer goodsId; @Schema(description = "商品名称") private String goodsName; @Schema(description = "规范") @@ -42,9 +42,9 @@ public class Metrial { @Schema(description = "大板数") private Integer boardCount; @Schema(description = "最小大板ID") - private Integer minBoardID; + private Integer minBoardId; @Schema(description = "最大大板ID") - private Integer maxBoardID; + private Integer maxBoardId; @Schema(description = "平均利用率") private Double avgLyr_All; @Schema(description = "前N平均利用率") @@ -66,7 +66,7 @@ public class Metrial { @Schema(description = "板材原长") private Integer orgLength; @Schema(description = "余料板数") - private Integer boardCount_Remain; + private Integer boardCountRemain; @Schema(description = "余料板情况") private String remainBoardMessage; @Schema(description = "预洗值") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelDetail.java index 8a72812c9..2ebdc911d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelDetail.java @@ -1,6 +1,5 @@ package com.cf.imes.module.executor.controller.admin.plan.dto; -import com.cf.imes.module.executor.util.deviseData.IOriginModelingData; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -26,7 +25,8 @@ public class ModelDetail { private Integer knifeRadius; @Schema(description = "深度") private Integer depth; - private IOriginModelingData originModeling; - private List pointList; - private List offSetList; + @Schema(description = "造型轮廓") + private OriginModelingData originModeling; + private List modelPoint; + private List modelOffSet; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OffSetList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelOffSet.java similarity index 95% rename from cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OffSetList.java rename to cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelOffSet.java index 6e08ecead..24771acee 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OffSetList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelOffSet.java @@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema; * @author: 晨丰科技 * @date: 2024/3/22 16:51 */ -public class OffSetList { +public class ModelOffSet { private String name; @Schema(description = "面 正面 = 0, 反面 = 1, 侧面 = 2, 左侧面 = 21, 右侧面 = 22, 上侧面 = 23, 下侧面 = 24, 弧形侧面 = 29, 异形侧面 = 30") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelPoint.java similarity index 93% rename from cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointList.java rename to cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelPoint.java index 47ce2a517..17d265a1f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelPoint.java @@ -5,7 +5,7 @@ package com.cf.imes.module.executor.controller.admin.plan.dto; * @author: 晨丰科技 * @date: 2024/3/22 16:49 */ -public class PointList { +public class ModelPoint { private Integer lineId; private Integer pointId; private Integer pointX; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OriginModelingData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OriginModelingData.java new file mode 100644 index 000000000..d97ca273b --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OriginModelingData.java @@ -0,0 +1,24 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.Dictionary; + +public class OriginModelingData { + @Schema(description = "轮郭") + private ContourData outline; + @Schema(description = "孔轮廓") + private Dictionary holes; + @Schema(description ="厚度" ) + private Integer thickness; + @Schema(description = "0正面、1反面、2侧面") + private Integer dir; + @Schema(description = "刀半径") + private Integer knifeRadius; + @Schema(description = "槽加长") + private Integer addLen; + @Schema(description = "槽加宽") + private Integer addWidth; + @Schema(description = "槽加深") + private Integer addDepth; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideModelDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideModelDetail.java index 8a55b0d9f..3b66e2fc9 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideModelDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideModelDetail.java @@ -1,6 +1,5 @@ package com.cf.imes.module.executor.controller.admin.plan.dto; -import com.cf.imes.module.executor.util.deviseData.IOriginModelingData; import lombok.Data; import java.util.List; @@ -19,7 +18,7 @@ public class SideModelDetail { private String knifeName; private Integer knifeRadius; private Integer depth; - private IOriginModelingData originModeling; - private List pointList; - private List offSetList; + private OriginModelingData originModeling; + private List modelPoint; + private List modelOffSet; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplateResp.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplateResp.java index fe0708f3f..5a0c36851 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplateResp.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplateResp.java @@ -1,13 +1,18 @@ package com.cf.imes.module.system.controller.admin.machine.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; import java.util.List; +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; + /** * @author Beal */ @@ -24,6 +29,9 @@ public class AuthTemplateResp { private Long userId; @Schema(description = "用户昵称") private String nickname; + @Schema(description = "更新时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) + private Date updateTime; @Schema(description = "机台模板列表") private List authTemplateList; } diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml index 708307499..3949d575e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml @@ -7,13 +7,14 @@ +