字段修改，添加字段

2026-08-12 12:52:07 +08:00 · 2024-03-29 14:02:07 +08:00
parent be6e4ba8ff
commit ca1994644d
10 changed files with 57 additions and 16 deletions
@@ -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 = "是否造型")
@@ -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<Point> pts; //点集(二维向量(x,y))
+    private Integer[] buls; //凸度(0直线段 >0逆时针方向 <0顺时针方向)
+}
@@ -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 = "预洗值")
@@ -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> pointList;
-    private List<OffSetList> offSetList;
+    @Schema(description = "造型轮廓")
+    private OriginModelingData originModeling;
+    private List<ModelPoint> modelPoint;
+    private List<ModelOffSet> modelOffSet;
 }
@@ -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")
@@ -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;
@@ -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<String, ContourData> 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;
+}
@@ -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> pointList;
-    private List<OffSetList> offSetList;
+    private OriginModelingData originModeling;
+    private List<ModelPoint> modelPoint;
+    private List<ModelOffSet> modelOffSet;
 }
@@ -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<AutoTemplateVO> authTemplateList;
 }
@@ -7,13 +7,14 @@
        <result property="organId" column="organ_id"/>
        <result property="userId" column="userId"/>
        <result property="organName" column="organName"/>
+        <result property="updateTime" column="updateTime"/>
        <collection property="authTemplateList" javaType="java.util.List" ofType="com.cf.imes.module.system.controller.admin.machine.vo.AutoTemplateVO"
                    select="selectAuthTemplateList" column="{userId=userId, templateName = templateName}" >
        </collection>
    </resultMap>

    <select id="selectAuthTemplatePage" resultMap="map" parameterType="com.cf.imes.module.system.controller.admin.machine.vo.AuthTemplatePage">
-        select a.id AS userId, a.nickname, a.organ_id, f.name as organName,
+        select a.id AS userId, a.nickname, a.organ_id, max(b.create_time) as updateTime, f.name as organName,
        case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName
        from system_users a, user_machine b, system_organization f
        <where>