生产单板件-造型信息添加注解

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<PlateRespVO> getPlate(@RequestParam("id") Long id) {
         PlateDO plate = plateService.getPlate(id);

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;

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侧面)
+    @Schema(description = "打孔面(0正面, 1反面, 2侧面)")
-    private Integer holeType;// 孔类型(0大孔, 10小孔, 20木削, 21木削大孔, 30层板钉, 40通孔, 50连接杆, -10造型孔)
+    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;
 
 }

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<Point> pts; //点集(二维向量(x,y))
+
-    private Double[] buls; //凸度(0直线段 >0逆时针方向 <0顺时针方向)
+    @Schema(description = "点集(二维向量(x,y))")
+    private List<Point> pts; //
+    @Schema(description = "凸度(0直线段 >0逆时针方向 <0顺时针方向)")
+    private Double[] buls; //
 }

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;// 厚度
+    @Schema(description = "厚度")
-    private Integer dir;// 方向
+    private float thickness;
+    @Schema(description = "方向")
+    private Integer dir;
 
-    private IContourData outline; // 轮廓，造型最外围的轮廓数据
+    @Schema(description = "轮廓，造型最外围的轮廓数据")
-    private List<IContourData> holes; //孔轮廓
+    private IContourData outline;
+    @Schema(description = "孔轮廓")
+    private List<IContourData> holes;
 
 
-    private float addLen; // 槽加长
+    @Schema(description = "槽加长")
-    private float addWidth; // 槽加宽
+    private float addLen;
-    private float addDepth; // 槽加深
+    @Schema(description = "槽加宽")
+    private float addWidth;
+    @Schema(description = "槽加深")
+    private float addDepth;
 }

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; //造像使用刀具名称
+    @Schema(description = "造像使用刀具名称")
-    private Double knifeRadius; //刀半径
+    private String knifeName;
+    @Schema(description = "刀半径")
+    private Double knifeRadius;
 
 
-    private IOriginModelingData originModeling;//造型数据
+    @Schema(description = "造型数据")
-    private List<PointList> pointList; //点列表
+    private IOriginModelingData originModeling;
-    private List<OffSetList> offSetList; //偏移量列表 //模块偏移数据
+
+    @Schema(description = "点列表")
+    private List<PointList> pointList;
+
+    @Schema(description = "偏移量列表-模块偏移数据")
+    private List<OffSetList> offSetList;
 }

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; // 刀路的偏倚值
+    @Schema(description = "刀路的偏倚值")
-    private Double depth;//下刀的深度
+    private Double value;
-    private Double angle;//角度
+    @Schema(description = "下刀的深度")
+    private Double depth;
+    @Schema(description = "角度")
+    private Double angle;
 
 //     二维刀路的属性
-    private String name; //刀的名称
+    @Schema(description = "二维刀路的属性-刀的名称")
-    private Double radius;//刀的半径
+    private String name;
+    @Schema(description = "二维刀路的属性-刀的半径")
+    private Double radius;
 
-    private String faceType;// 面向类型(0正面, 1反面, 2侧面)
+    @Schema(description = "面向类型(0正面, 1反面, 2侧面)")
+    private String faceType;
 }

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> pointDetail ; //点明细，表示小板外围轮廓的几个转折点（不含封边）
     private List<PointDetail> rawPointDetail ; //原始点明细（含封边）
 

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;
 }

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
+    @Schema(description = "纹路Id")
-    private Integer pointId;//点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; // 曲线
+    @Schema(description = "曲线")
-    private Double depth; //曲线深度
+    private Double curve;
+    @Schema(description = "曲线深度")
+    private Double depth;
 
 }

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));
     }
 
-}
+}
+}
+ */