From 24a49e2b9796cb33518d40d56f140234d06e1a84 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 14 May 2024 16:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95=E6=9D=BF=E4=BB=B6-?= =?UTF-8?q?=E9=80=A0=E5=9E=8B=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plate/PlateController.java | 2 +- .../admin/plate/vo/BodyPlateDetailVO.java | 1 + .../util/deviseData/dataTwo/HoleDetail.java | 24 ++++++++++++------ .../util/deviseData/dataTwo/IContourData.java | 8 ++++-- .../dataTwo/IOriginModelingData.java | 25 +++++++++++++------ .../util/deviseData/dataTwo/ModelDetail.java | 25 +++++++++++++------ .../util/deviseData/dataTwo/OffSetList.java | 19 +++++++++----- .../util/deviseData/dataTwo/PlateDetail.java | 1 + .../util/deviseData/dataTwo/PointDetail.java | 8 ++++-- .../util/deviseData/dataTwo/PointList.java | 16 ++++++++---- .../service/process/GroupServiceImplTest.java | 5 +++- 11 files changed, 94 insertions(+), 40 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java index 4f88f226b..8e4bfb876 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java @@ -66,7 +66,7 @@ public class PlateController { @GetMapping("/get") @Operation(summary = "获得生产单板件") - @Parameter(name = "id", description = "编号", required = true, example = "1024") + @Parameter(name = "id", description = "板件ID", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('executor:plate:query')") public CommonResult getPlate(@RequestParam("id") Long id) { PlateDO plate = plateService.getPlate(id); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/BodyPlateDetailVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/BodyPlateDetailVO.java index bf512b47f..59e736057 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/BodyPlateDetailVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/BodyPlateDetailVO.java @@ -17,6 +17,7 @@ import java.util.List; @Builder @AllArgsConstructor @NoArgsConstructor +@Schema(description = "管理后台 - 柜体对应的板件造型信息") public class BodyPlateDetailVO { @Schema(description = "模块id") private Long bodyId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/HoleDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/HoleDetail.java index 5d8db41bc..01b684a3c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/HoleDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/HoleDetail.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.util.deviseData.dataTwo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,25 +15,32 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class HoleDetail { - private String holeName;// 孔名称，用于类型相同的孔，进行分组区分，一组的孔名称相同 + @Schema(description = "孔名称，用于类型相同的孔，进行分组区分，一组的孔名称相同") + private String holeName; - private Integer faceType; // 打孔面(0正面, 1反面, 2侧面) - private Integer holeType;// 孔类型(0大孔, 10小孔, 20木削, 21木削大孔, 30层板钉, 40通孔, 50连接杆, -10造型孔) + @Schema(description = "打孔面(0正面, 1反面, 2侧面)") + private Integer faceType; + @Schema(description = "孔类型(0大孔, 10小孔, 20木削, 21木削大孔, 30层板钉, 40通孔, 50连接杆, -10造型孔)") + private Integer holeType; -// 孔的起点坐标 + + @Schema(description = "孔的起点坐标") private Double startX; private Double startY; private Double startZ; -// 打孔的半径 - private Double radius; //孔半径 -// 孔的终点坐标 + @Schema(description = " 打孔的半径-孔半径") + private Double radius; + + + @Schema(description = "孔的终点坐标") private Double endX; private Double endY; private Double endZ; - private Double depth; // 深度 + @Schema(description = "深度") + private Double depth; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/IContourData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/IContourData.java index 50ab11f31..6dc6a1e3b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/IContourData.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/IContourData.java @@ -1,6 +1,7 @@ package com.cf.imes.module.executor.util.deviseData.dataTwo; import com.cf.imes.module.executor.controller.admin.plan.dto.Point; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,6 +20,9 @@ import java.util.List; @NoArgsConstructor @Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 public class IContourData { - private List pts; //点集(二维向量(x,y)) - private Double[] buls; //凸度(0直线段 >0逆时针方向 <0顺时针方向) + + @Schema(description = "点集(二维向量(x,y))") + private List pts; // + @Schema(description = "凸度(0直线段 >0逆时针方向 <0顺时针方向)") + private Double[] buls; // } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/IOriginModelingData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/IOriginModelingData.java index f6dcef4b5..52e92633c 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/IOriginModelingData.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/IOriginModelingData.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.util.deviseData.dataTwo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -18,16 +19,24 @@ import java.util.List; @Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 public class IOriginModelingData { - private float knifeRadius; // 刀半径 + @Schema(description = "刀半径") + private float knifeRadius; - private float thickness;// 厚度 - private Integer dir;// 方向 + @Schema(description = "厚度") + private float thickness; + @Schema(description = "方向") + private Integer dir; - private IContourData outline; // 轮廓，造型最外围的轮廓数据 - private List holes; //孔轮廓 + @Schema(description = "轮廓，造型最外围的轮廓数据") + private IContourData outline; + @Schema(description = "孔轮廓") + private List holes; - private float addLen; // 槽加长 - private float addWidth; // 槽加宽 - private float addDepth; // 槽加深 + @Schema(description = "槽加长") + private float addLen; + @Schema(description = "槽加宽") + private float addWidth; + @Schema(description = "槽加深") + private float addDepth; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/ModelDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/ModelDetail.java index 7ebf2b101..ec5c9e293 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/ModelDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/ModelDetail.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.util.deviseData.dataTwo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -15,18 +16,28 @@ import java.util.List; @Builder @AllArgsConstructor @NoArgsConstructor +@Schema(description = "管理后台 - 造型信息") public class ModelDetail { - private Integer faceType; //使用字典进行解析 造型排版面 0正面, 1反面, 2侧面 + @Schema(description = "使用字典进行解析 造型排版面 0正面, 1反面, 2侧面") + private Integer faceType; - private Double depth; //造型深度 + @Schema(description = "造型深度") + private Double depth; - private String knifeName; //造像使用刀具名称 - private Double knifeRadius; //刀半径 + @Schema(description = "造像使用刀具名称") + private String knifeName; + @Schema(description = "刀半径") + private Double knifeRadius; - private IOriginModelingData originModeling;//造型数据 - private List pointList; //点列表 - private List offSetList; //偏移量列表 //模块偏移数据 + @Schema(description = "造型数据") + private IOriginModelingData originModeling; + + @Schema(description = "点列表") + private List pointList; + + @Schema(description = "偏移量列表-模块偏移数据") + private List offSetList; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/OffSetList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/OffSetList.java index 868cc82d7..7a3798f0d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/OffSetList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/OffSetList.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.util.deviseData.dataTwo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,13 +20,19 @@ import lombok.experimental.Accessors; public class OffSetList { // 刀路的偏移值 - private Double value; // 刀路的偏倚值 - private Double depth;//下刀的深度 - private Double angle;//角度 + @Schema(description = "刀路的偏倚值") + private Double value; + @Schema(description = "下刀的深度") + private Double depth; + @Schema(description = "角度") + private Double angle; // 二维刀路的属性 - private String name; //刀的名称 - private Double radius;//刀的半径 + @Schema(description = "二维刀路的属性-刀的名称") + private String name; + @Schema(description = "二维刀路的属性-刀的半径") + private Double radius; - private String faceType;// 面向类型(0正面, 1反面, 2侧面) + @Schema(description = "面向类型(0正面, 1反面, 2侧面)") + private String faceType; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PlateDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PlateDetail.java index 5b97dde83..2c65abb98 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PlateDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PlateDetail.java @@ -89,6 +89,7 @@ public class PlateDetail{ private Boolean has3DModel; // 是否有三维刀路 // 轮廓数据、造型数据 + private List pointDetail ; //点明细，表示小板外围轮廓的几个转折点（不含封边） private List rawPointDetail ; //原始点明细（含封边） diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointDetail.java index bec4aa651..99aefcbd6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointDetail.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.util.deviseData.dataTwo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -17,10 +18,13 @@ import lombok.experimental.Accessors; public class PointDetail { // 点的位置信息 + @Schema(description = "点的位置信息") private Double pointX; private Double pointY; - private Double curve;//曲线 + @Schema(description = "曲线-凸度") + private Double curve; // 点的封边尺寸 - private Double sealSize;//封边尺寸，封边的厚度，长同边长 + @Schema(description = "点的封边尺寸，封边尺寸，封边的厚度，长同边长") + private Double sealSize; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointList.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointList.java index 362909cdf..c84130058 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointList.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointList.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.util.deviseData.dataTwo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -16,16 +17,21 @@ import lombok.experimental.Accessors; @Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 public class PointList { - private Integer lineId;//纹路Id - private Integer pointId;//点Id + @Schema(description = "纹路Id") + private Integer lineId; + @Schema(description = "点Id") + private Integer pointId; -// 点的位置信息 +// + @Schema(description = "点的位置信息") private Double pointX; private Double pointY; private Double pointZ; private Double radius; - private Double curve; // 曲线 - private Double depth; //曲线深度 + @Schema(description = "曲线") + private Double curve; + @Schema(description = "曲线深度") + private Double depth; } diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java index 8f90fc9c9..7c16ae80d 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/process/GroupServiceImplTest.java @@ -55,6 +55,7 @@ public class GroupServiceImplTest extends BaseDbUnitTest { ProcessGroupDO group = groupMapper.selectById(groupId); assertPojoEquals(createReqVO, group, "id"); } +} /* @Test public void testUpdateGroup_success() { @@ -147,4 +148,6 @@ public class GroupServiceImplTest extends BaseDbUnitTest { assertPojoEquals(dbGroup, pageResult.getList().get(0)); } -} \ No newline at end of file +} +} + */ \ No newline at end of file