From e462c496afa7ba6ae3def823b01721fabf1594c6 Mon Sep 17 00:00:00 2001 From: yangsb Date: Wed, 27 Mar 2024 16:22:53 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=8D=95=E5=8F=82=E6=95=B0=20(?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cf-module-prod-executor-biz/pom.xml | 4 + .../admin/plan/OptimizePlanController.java | 10 +- .../admin/plan/dto/BlockPlaceMessage.java | 52 +++++++ .../controller/admin/plan/dto/HoleDetail.java | 26 ++++ .../controller/admin/plan/dto/Metrial.java | 87 +++++++++++ .../admin/plan/dto/ModelDetail.java | 25 ++++ .../controller/admin/plan/dto/OffSetList.java | 16 ++ .../admin/plan/dto/OrgPointDetail.java | 24 +++ .../admin/plan/dto/OrgSizeOutOff.java | 19 +++ .../controller/admin/plan/dto/Point.java | 12 ++ .../admin/plan/dto/PointDetail.java | 24 +++ .../controller/admin/plan/dto/PointList.java | 16 ++ .../controller/admin/plan/dto/ScrapBlock.java | 30 ++++ .../controller/admin/plan/dto/ScrapPt.java | 13 ++ .../admin/plan/dto/SideHoleDetail.java | 25 ++++ .../admin/plan/dto/SideModelDetail.java | 25 ++++ .../controller/admin/plan/dto/SizeOutOff.java | 19 +++ .../admin/plan/dto/UsedBoardMessage.java | 37 +++++ .../admin/plan/vo/OptimizeParamRespVO.java | 10 +- .../admin/plate/vo/KaiLiaoSize.java | 12 ++ .../controller/admin/plate/vo/OffSet.java | 13 ++ .../admin/plate/vo/PlateDetailVO.java | 46 ++++++ .../admin/plate/vo/PlateRespVO.java | 7 + .../module/executor/util/RandomUtils.java | 137 ++++++++++++++++++ 24 files changed, 684 insertions(+), 5 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/BlockPlaceMessage.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelDetail.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OffSetList.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgPointDetail.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Point.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointDetail.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointList.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapPt.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideHoleDetail.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideModelDetail.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/KaiLiaoSize.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OffSet.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/RandomUtils.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml index 5af245e72..c04f646cb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/pom.xml @@ -125,6 +125,10 @@ com.cf.imes cf-spring-boot-starter-biz-data-permission + + uk.co.jemos.podam + podam + diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java index 937bc7051..1bd016630 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java @@ -1,10 +1,13 @@ package com.cf.imes.module.executor.controller.admin.plan; +import cn.hutool.core.util.RandomUtil; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.executor.controller.admin.plan.vo.*; import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService; +import com.cf.imes.module.executor.util.RandomUtils; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; @@ -76,9 +79,12 @@ public class OptimizePlanController { @GetMapping("/getOptimizePlanParam") @Operation(summary = "获取优化排单参数 (未完成)") @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") - public CommonResult getOptimizePlanParam (@RequestParam @Valid @NotNull(message = "排单id不能空") Long planId) { + @Parameter(name = "planId", description = "排单id", required = false) + public CommonResult getOptimizePlanParam (@RequestParam (required = false) Long planId) { + OptimizeParamRespVO data = RandomUtils.randomPojo(OptimizeParamRespVO.class); + return CommonResult.success(data); //todo - return CommonResult.success(optimizePlanService.getOptimizePlanParam(planId)); + //return CommonResult.success(optimizePlanService.getOptimizePlanParam(planId)); } } 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 new file mode 100644 index 000000000..2783e7db1 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/BlockPlaceMessage.java @@ -0,0 +1,52 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * @author Beal + */ +@Data +public class BlockPlaceMessage { + + @Schema(description = "zzInfo") + private String zzInfo; + @Schema(description = "Bi") + private Integer bi; + @Schema(description = "Bo") + private Long bo; + @Schema(description = "X") + private Double x; + @Schema(description = "Y") + private Double y; + @Schema(description = "Pi") + private Double pi; + @Schema(description = "Ps") + private Double ps; + @Schema(description = "Ci") + private Double ci; + @Schema(description = "Ca") + private Double ca; + @Schema(description = "CP") + private Double cP; + private Boolean iA; + private Boolean iO; + @Schema(description = "Dh") + private Boolean dh; + @Schema(description = "Dm") + private Boolean dm; + @Schema(description = "OF") + private Integer oF; + private Integer type; + private List pointList; + @Schema(description = "OrgSizeOutOff") + private OrgSizeOutOff orgSizeOutOff; + @Schema(description = "SizeOutOff") + private SizeOutOff sizeOutOff; + @Schema(description = "PlaceOffX") + private Double placeOffX; + @Schema(description = "PlaceOffY") + private Double placeOffY; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java new file mode 100644 index 000000000..fbb569bb3 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java @@ -0,0 +1,26 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import lombok.Data; + +/** + * @projectName: cf_imes_server + * @author: 晨丰科技 + * @date: 2024/3/22 16:58 + */ +@Data +public class HoleDetail { + + private Integer holeId; + private Integer holeType;// 请定义HoleType枚举类型 + private Integer face; // 请定义FaceType枚举类型 + private Integer pointX; + private Integer pointY; + private Integer pointZ; + private Integer radius; + private Integer depth; + private Integer endPoint; + private Integer pointX2; + private Integer pointY2; + private Integer angle; + +} 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 new file mode 100644 index 000000000..21ae3671e --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Metrial.java @@ -0,0 +1,87 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.util.Date; +import java.util.List; + +/** + * @author Beal + */ +@Data +public class Metrial { + + @Schema(description = "生产单id") + private String orderId; + @Schema(description = "商品id") + private Integer goodsID; + @Schema(description = "商品名称") + private String goodsName; + @Schema(description = "Specification") + private String specification; + @Schema(description = "材质") + private String metrial; + @Schema(description = "颜色") + private String color; + @Schema(description = "Brank") + private String brank; + @Schema(description = "宽") + private Integer width; + @Schema(description = "长") + private Integer length; + @Schema(description = "厚") + private Integer thickness; + @Schema(description = "Border") + private Integer border; + @Schema(description = "CutDia") + private Integer cutDia; + @Schema(description = "CutGap") + private Integer cutGap; + @Schema(description = "IsSorted") + private Boolean isSorted; + @Schema(description = "BoardCount") + private Integer boardCount; + @Schema(description = "MinBoardID") + private Integer minBoardID; + @Schema(description = "MaxBoardID") + private Integer maxBoardID; + @Schema(description = "AvgLyr_All") + private Double avgLyr_All; + @Schema(description = "AvgLyr_NoLastOne") + private Integer avgLyr_NoLastOne; + @Schema(description = "Lyr_LastOne") + private Double lyr_LastOne; + @Schema(description = "organId") + private Integer organId; + @Schema(description = "usedBoardMessageList") + private List usedBoardMessageList; + @Schema(description = "blockPlaceMessageList") + private List blockPlaceMessageList; + @Schema(description = "State") + private Integer state; + @Schema(description = "HasWave") + private Boolean hasWave; + @Schema(description = "OrgWidth") + private Integer orgWidth; + @Schema(description = "OrgLength") + private Integer orgLength; + @Schema(description = "BoardCount_Remain") + private Integer boardCount_Remain; + @Schema(description = "RemainBoardMessage") + private String remainBoardMessage; + @Schema(description = "PreCutValue") + private Integer preCutValue; + @Schema(description = "ScrapBoardList") + private List scrapBoardList; + @Schema(description = "HelpCut") + private Boolean helpCut; + @Schema(description = "SameKnifeHelpCutGap") + private Integer sameKnifeHelpCutGap; + @Schema(description = "CutKnifeID") + private Integer cutKnifeID; + @Schema(description = "HelpKnifeID") + private Integer helpKnifeID; + @Schema(description = "LastSaveDate") + private Date lastSaveDate; + +} 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 new file mode 100644 index 000000000..de16af87a --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ModelDetail.java @@ -0,0 +1,25 @@ +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; + +/** + * @projectName: cf_imes_server + * @author: 晨丰科技 + * @date: 2024/3/22 16:53 + */ +@Data +public class ModelDetail { + + private Integer modelId; + private Integer lineId; + private Integer face; + private String knifeName; + private Integer knifeRadius; + private Integer depth; + private IOriginModelingData originModeling; + private List pointList; + private List offSetList; +} 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/OffSetList.java new file mode 100644 index 000000000..3fd7d5b17 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OffSetList.java @@ -0,0 +1,16 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +/** + * @projectName: cf_imes_server + * @author: 晨丰科技 + * @date: 2024/3/22 16:51 + */ +public class OffSetList { + + private String name; + private Integer face;// 请定义FaceType枚举类型 + private Integer value; + private Integer radius; + private Integer deep; + private Integer angle; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgPointDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgPointDetail.java new file mode 100644 index 000000000..8502cc558 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgPointDetail.java @@ -0,0 +1,24 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @projectName: cf_imes_server + * @author: 晨丰科技 + * @date: 2024/3/22 17:00 + */ +@Data +public class OrgPointDetail { + @Schema(description = "点id") + private Long pointId; + @Schema(description = "x") + private Double pointX; + @Schema(description = "y") + private Double pointY; + @Schema(description = "曲线") + private Double curve; + @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/controller/admin/plan/dto/OrgSizeOutOff.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java new file mode 100644 index 000000000..38dfa8404 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java @@ -0,0 +1,19 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class OrgSizeOutOff { + private Integer left; + private Integer right; + private Integer upper; + private Integer under; + private Integer width; + private Integer length; + private Integer outWidth; + private Integer outLength; + private Boolean hasDone; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Point.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Point.java new file mode 100644 index 000000000..c8550b3ba --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/Point.java @@ -0,0 +1,12 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class Point { + private Double x; + private Double y; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointDetail.java new file mode 100644 index 000000000..50173769f --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointDetail.java @@ -0,0 +1,24 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @projectName: cf_imes_server + * @author: 晨丰科技 + * @date: 2024/3/22 16:57 + */ +@Data +public class PointDetail { + + @Schema(description = "点id") + private Long pointId; + @Schema(description = "x") + private Double pointX; + @Schema(description = "y") + private Double pointY; + @Schema(description = "曲线") + private Double curve; + @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/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/PointList.java new file mode 100644 index 000000000..47ce2a517 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/PointList.java @@ -0,0 +1,16 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +/** + * @projectName: cf_imes_server + * @author: 晨丰科技 + * @date: 2024/3/22 16:49 + */ +public class PointList { + private Integer lineId; + private Integer pointId; + private Integer pointX; + private Integer pointY; + private Integer radius; + private Integer depth; + private Integer curve; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java new file mode 100644 index 000000000..4993cae08 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java @@ -0,0 +1,30 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * @author Beal + */ +@Data +public class ScrapBlock { + @Schema(description = "ScrapNo") + private Long scrapNo; + @Schema(description = "IsUnRegular") + private Boolean isUnRegular; + @Schema(description = "IsOverlap") + private Boolean isOverlap; + private Boolean isInstored; + private List points; + private String remark; + @Schema(description = "PlaceX") + private Double placeX; + @Schema(description = "PlaceY") + private Double placeY; + @Schema(description = "PlaceWidth") + private Double placeWidth; + @Schema(description = "PlaceLength") + private Double placeLength; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapPt.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapPt.java new file mode 100644 index 000000000..895d77ab9 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapPt.java @@ -0,0 +1,13 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class ScrapPt { + private Double x; + private Double y; + private Double bul; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideHoleDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideHoleDetail.java new file mode 100644 index 000000000..cf2203bba --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideHoleDetail.java @@ -0,0 +1,25 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import lombok.Data; + +/** + * @projectName: cf_imes_server + * @author: 晨丰科技 + * @date: 2024/3/22 18:02 + */ +@Data +public class SideHoleDetail { + + private Integer holeID; + private Integer holeType; // 请定义HoleType枚举类型 + private Integer face; // 请定义FaceType枚举类型 + private Integer pointX; + private Integer pointY; + private Integer pointZ; + private Integer radius; + private Integer depth; + private String endPoint; + private Integer pointX2; + private Integer pointY2; + private Integer angle; +} 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 new file mode 100644 index 000000000..8a55b0d9f --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SideModelDetail.java @@ -0,0 +1,25 @@ +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; + +/** + * @projectName: cf_imes_server + * @author: 晨丰科技 + * @date: 2024/3/22 17:59 + */ +@Data +public class SideModelDetail { + + private Integer modelId; + private Integer lineId; + private int face; + private String knifeName; + private Integer knifeRadius; + private Integer depth; + private IOriginModelingData originModeling; + private List pointList; + private List offSetList; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java new file mode 100644 index 000000000..6ae8e9ee5 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java @@ -0,0 +1,19 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class SizeOutOff { + private Double left; + private Double right; + private Double upper; + private Double under; + private Double width; + private Double length; + private Double outWidth; + private Double outLength; + private Boolean hasDone; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java new file mode 100644 index 000000000..7c771fbdb --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java @@ -0,0 +1,37 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * @author Beal + */ +@Data +public class UsedBoardMessage { + @Schema(description = "Bi") + private Integer bi; + @Schema(description = "W") + private Integer w; + @Schema(description = "L") + private Integer l; + @Schema(description = "Si") + private Integer si; + @Schema(description = "So") + private String so; + @Schema(description = "No") + private String no; + @Schema(description = "RM") + private String rM; + @Schema(description = "LK") + private Boolean lK; + private List scrapPtList; + private List scrapBlocks; + @Schema(description = "LE") + private Boolean lE; + @Schema(description = "RE") + private Boolean rE; + @Schema(description = "WLs") + private List wLs; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java index 312ab43aa..b83513d50 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java @@ -1,6 +1,7 @@ package com.cf.imes.module.executor.controller.admin.plan.vo; import com.cf.imes.module.executor.controller.admin.goods.vo.GoodsRespVO; +import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -47,13 +48,16 @@ public class OptimizeParamRespVO { @Schema(description = "生产时间") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private Date produceTime; - @Schema(description = "生产单列表") private List orderList; - + @Schema(description = "MetrialList") + private List metrialList; @Schema(description = "商品列表") private List goodsList; - @Schema(description = "小板列表") private List plateList; + @Schema(description = "区域删除") + private Boolean areaDeleted; + @Schema(description = "源id") + private Long sourceNo; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/KaiLiaoSize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/KaiLiaoSize.java new file mode 100644 index 000000000..5140b947c --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/KaiLiaoSize.java @@ -0,0 +1,12 @@ +package com.cf.imes.module.executor.controller.admin.plate.vo; + +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class KaiLiaoSize { + private Double width; + private Double height; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OffSet.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OffSet.java new file mode 100644 index 000000000..9f5a7b8d5 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OffSet.java @@ -0,0 +1,13 @@ +package com.cf.imes.module.executor.controller.admin.plate.vo; + +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class OffSet { + private Integer x; + private Integer y; + private Integer z; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java new file mode 100644 index 000000000..a0e6eedfc --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java @@ -0,0 +1,46 @@ +package com.cf.imes.module.executor.controller.admin.plate.vo; + +import com.cf.imes.module.executor.controller.admin.plan.dto.*; +import com.cf.imes.module.executor.controller.admin.plan.vo.PlanOptimizeDataDTO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + +/** + * @author Beal + */ +@Data +public class PlateDetailVO { + + @Schema(description = "生产单id") + private Long orderId; + + @Schema(description = "点详情列表") + private List pointDetailList; + + @Schema(description = "孔详情列表") + private List holeDetailList; + + @Schema(description = "模型详情列表") + private List modelDetailList; + + @Schema(description = "偏移量") + private OffSet offSet; + + @Schema(description = "是否新版本") + private Boolean newVersion; + + @Schema(description = "org点详情列表") + private List orgPointDetailList; + + @Schema(description = "开料尺寸") + private KaiLiaoSize kaiLiaoSize; + + @Schema(description = "边模型详情列表") + private List sideModelDetails; + + @Schema(description = "边孔详情") + private List sideHoleDetailList; + +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java index a9d64c478..dac60e0ed 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateRespVO.java @@ -9,6 +9,9 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; +/** + * @author Beal + */ @Schema(description = "管理后台 - 生产单板件 Response VO") @Data @ExcelIgnoreUnannotated @@ -158,4 +161,8 @@ public class PlateRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "小板详情列表") + private List plateDetailList; + + } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/RandomUtils.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/RandomUtils.java new file mode 100644 index 000000000..0968fcb99 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/RandomUtils.java @@ -0,0 +1,137 @@ +package com.cf.imes.module.executor.util; + +import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; +import com.cf.imes.framework.common.enums.CommonStatusEnum; +import uk.co.jemos.podam.api.PodamFactory; +import uk.co.jemos.podam.api.PodamFactoryImpl; + +import java.lang.reflect.Type; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Set; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * 随机工具类 + * + * @author 晨丰科技 + */ +public class RandomUtils { + + private static final int RANDOM_STRING_LENGTH = 10; + + private static final int TINYINT_MAX = 127; + + private static final int RANDOM_DATE_MAX = 30; + + private static final int RANDOM_COLLECTION_LENGTH = 5; + + private static final PodamFactory PODAM_FACTORY = new PodamFactoryImpl(); + + static { + // 字符串 + PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(String.class, + (dataProviderStrategy, attributeMetadata, map) -> randomString()); + // Integer + PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Integer.class, (dataProviderStrategy, attributeMetadata, map) -> { + // 如果是 status 的字段，返回 0 或 1 + if ("status".equals(attributeMetadata.getAttributeName())) { + return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus(); + } + // 如果是 type、status 结尾的字段，返回 tinyint 范围 + if (StrUtil.endWithAnyIgnoreCase(attributeMetadata.getAttributeName(), + "type", "status", "category", "scope", "result")) { + return RandomUtil.randomInt(0, TINYINT_MAX + 1); + } + return RandomUtil.randomInt(); + }); + // LocalDateTime + PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(LocalDateTime.class, + (dataProviderStrategy, attributeMetadata, map) -> randomLocalDateTime()); + // Boolean + PODAM_FACTORY.getStrategy().addOrReplaceTypeManufacturer(Boolean.class, (dataProviderStrategy, attributeMetadata, map) -> { + // 如果是 deleted 的字段，返回非删除 + if ("deleted".equals(attributeMetadata.getAttributeName())) { + return false; + } + return RandomUtil.randomBoolean(); + }); + } + + public static String randomString() { + return RandomUtil.randomString(RANDOM_STRING_LENGTH); + } + + public static Long randomLongId() { + return RandomUtil.randomLong(0, Long.MAX_VALUE); + } + + public static Integer randomInteger() { + return RandomUtil.randomInt(0, Integer.MAX_VALUE); + } + + public static Date randomDate() { + return RandomUtil.randomDay(0, RANDOM_DATE_MAX); + } + + public static LocalDateTime randomLocalDateTime() { + // 设置 Nano 为零的原因，避免 MySQL、H2 存储不到时间戳 + return LocalDateTimeUtil.of(randomDate()).withNano(0); + } + + public static Short randomShort() { + return (short) RandomUtil.randomInt(0, Short.MAX_VALUE); + } + + public static Set randomSet(Class clazz) { + return Stream.iterate(0, i -> i).limit(RandomUtil.randomInt(1, RANDOM_COLLECTION_LENGTH)) + .map(i -> randomPojo(clazz)).collect(Collectors.toSet()); + } + + public static Integer randomCommonStatus() { + return RandomUtil.randomEle(CommonStatusEnum.values()).getStatus(); + } + + public static String randomEmail() { + return randomString() + "@qq.com"; + } + + public static String randomURL() { + return "https://www.cf.com/" + randomString(); + } + + @SafeVarargs + public static T randomPojo(Class clazz, Consumer... consumers) { + T pojo = PODAM_FACTORY.manufacturePojo(clazz); + // 非空时，回调逻辑。通过它，可以实现 Pojo 的进一步处理 + if (ArrayUtil.isNotEmpty(consumers)) { + Arrays.stream(consumers).forEach(consumer -> consumer.accept(pojo)); + } + return pojo; + } + + @SafeVarargs + public static T randomPojo(Class clazz, Type type, Consumer... consumers) { + T pojo = PODAM_FACTORY.manufacturePojo(clazz, type); + // 非空时，回调逻辑。通过它，可以实现 Pojo 的进一步处理 + if (ArrayUtil.isNotEmpty(consumers)) { + Arrays.stream(consumers).forEach(consumer -> consumer.accept(pojo)); + } + return pojo; + } + + @SafeVarargs + public static List randomPojoList(Class clazz, Consumer... consumers) { + int size = RandomUtil.randomInt(1, RANDOM_COLLECTION_LENGTH); + return Stream.iterate(0, i -> i).limit(size).map(o -> randomPojo(clazz, consumers)) + .collect(Collectors.toList()); + } + +} From c5d8ba231396aa4d10ede3cf2e3fe7c31350bf5e Mon Sep 17 00:00:00 2001 From: yangsb Date: Wed, 27 Mar 2024 17:04:44 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/dto/Metrial.java | 16 +++---- .../controller/admin/plan/dto/ScrapBoard.java | 43 +++++++++++++++++++ .../admin/plan/vo/OptimizeParamRespVO.java | 9 ++-- 3 files changed, 56 insertions(+), 12 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/ScrapBoard.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/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 21ae3671e..25a2d9aa9 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 @@ -51,15 +51,15 @@ public class Metrial { private Integer avgLyr_NoLastOne; @Schema(description = "Lyr_LastOne") private Double lyr_LastOne; - @Schema(description = "organId") + @Schema(description = "组织id") private Integer organId; - @Schema(description = "usedBoardMessageList") + @Schema(description = "使用板信息列表") private List usedBoardMessageList; - @Schema(description = "blockPlaceMessageList") + @Schema(description = "小板信息列表") private List blockPlaceMessageList; - @Schema(description = "State") + @Schema(description = "状态") private Integer state; - @Schema(description = "HasWave") + @Schema(description = "有波纹") private Boolean hasWave; @Schema(description = "OrgWidth") private Integer orgWidth; @@ -71,8 +71,8 @@ public class Metrial { private String remainBoardMessage; @Schema(description = "PreCutValue") private Integer preCutValue; - @Schema(description = "ScrapBoardList") - private List scrapBoardList; + @Schema(description = "废料板列表") + private List scrapBoardList; @Schema(description = "HelpCut") private Boolean helpCut; @Schema(description = "SameKnifeHelpCutGap") @@ -81,7 +81,7 @@ public class Metrial { private Integer cutKnifeID; @Schema(description = "HelpKnifeID") private Integer helpKnifeID; - @Schema(description = "LastSaveDate") + @Schema(description = "最后保存时间") private Date lastSaveDate; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java new file mode 100644 index 000000000..7338cd805 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java @@ -0,0 +1,43 @@ +package com.cf.imes.module.executor.controller.admin.plan.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Beal + */ +@NoArgsConstructor +@Data +public class ScrapBoard { + + @Schema(description ="PlanCode") + private String planCode; + @Schema(description ="UsedPlanCode") + private String usedPlanCode; + @Schema(description ="ID") + private Long id; + @Schema(description ="PlanID") + private Long planId; + @Schema(description ="OrgPlanID") + private Long orgPlanId; + @Schema(description ="Status") + private Integer status; + @Schema(description ="PlacedStyle") + private Integer placedStyle; + @Schema(description ="StoreHouse") + private String storeHouse; + @Schema(description ="Count") + private Integer count; + @Schema(description ="Remark") + private String remark; + @Schema(description ="OutLineJson") + private String outLineJson; + @Schema(description ="组织id") + private Integer organId; + @Schema(description ="BasePolyline") + private Object basePolyline; + @Schema(description ="PlacedPolyline") + private Object placedPolyline; + private Boolean isUsed; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java index b83513d50..b97d75159 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java @@ -34,7 +34,8 @@ public class OptimizeParamRespVO { @Schema(description = "机台 ID") private Long machineId; @Schema(description = "计划时间") - private LocalDateTime planTime; + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) + private Date planTime; @Schema(description = "生产单号") private String orderNos; @Schema(description = "排单优化文件地址") @@ -50,10 +51,10 @@ public class OptimizeParamRespVO { private Date produceTime; @Schema(description = "生产单列表") private List orderList; - @Schema(description = "MetrialList") + @Schema(description = "大板使用信息列表") private List metrialList; - @Schema(description = "商品列表") - private List goodsList; + /*@Schema(description = "商品列表") + private List goodsList;*/ @Schema(description = "小板列表") private List plateList; @Schema(description = "区域删除") From 496440f1d446c32ecae4ad6c7d851202ff80e7c3 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 28 Mar 2024 10:17:31 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8E=92=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/dto/BlockPlaceMessage.java | 46 ++++++++++--------- .../controller/admin/plan/dto/HoleDetail.java | 15 +++++- .../controller/admin/plan/dto/Metrial.java | 40 ++++++++-------- .../admin/plan/dto/ModelDetail.java | 7 +++ .../controller/admin/plan/dto/OffSetList.java | 5 +- .../admin/plan/dto/OrgSizeOutOff.java | 5 ++ .../controller/admin/plan/dto/ScrapBlock.java | 15 +++--- .../controller/admin/plan/dto/ScrapBoard.java | 26 ++++++----- .../controller/admin/plan/dto/SizeOutOff.java | 5 ++ .../admin/plan/dto/UsedBoardMessage.java | 26 ++++++----- .../admin/plan/vo/OptimizeParamRespVO.java | 4 +- .../admin/plate/vo/PlateDetailVO.java | 2 +- .../optimizeplan/OptimizePlanServiceImpl.java | 5 +- .../util/deviseData/IOriginModelingData.java | 26 +++++++---- 14 files changed, 140 insertions(+), 87 deletions(-) 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 2783e7db1..563f84f50 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 @@ -11,42 +11,46 @@ import java.util.List; @Data public class BlockPlaceMessage { - @Schema(description = "zzInfo") + @Schema(description = "自增板信息") private String zzInfo; - @Schema(description = "Bi") + @Schema(description = "大板ID") private Integer bi; - @Schema(description = "Bo") + @Schema(description = "小板号") private Long bo; - @Schema(description = "X") + @Schema(description = "位置X") private Double x; - @Schema(description = "Y") + @Schema(description = "位置Y") private Double y; - @Schema(description = "Pi") + @Schema(description = "优化顺序") private Double pi; - @Schema(description = "Ps") + @Schema(description = "放置方式") private Double ps; - @Schema(description = "Ci") + @Schema(description = "开料顺序") private Double ci; - @Schema(description = "Ca") + @Schema(description = "下刀点位置") private Double ca; - @Schema(description = "CP") - private Double cP; - private Boolean iA; + @Schema(description = "下刀点") + private Double cp; + @Schema(description = "未移动") + private Boolean ia; + @Schema(description = "是否重叠isOverlap") private Boolean iO; - @Schema(description = "Dh") + @Schema(description = "是否排钻") private Boolean dh; - @Schema(description = "Dm") + @Schema(description = "是否造型") private Boolean dm; - @Schema(description = "OF") - private Integer oF; + @Schema(description = "超限板 标识") + private Integer of; + @Schema(description = "板类型 普通=0 自增=1 ,余料=2(失效)") private Integer type; - private List pointList; - @Schema(description = "OrgSizeOutOff") + @Schema(description = "点阵") + private List points; + @Schema(description = "原造型偏移信息") private OrgSizeOutOff orgSizeOutOff; - @Schema(description = "SizeOutOff") + @Schema(description = "尺寸扩展信息(造型)") private SizeOutOff sizeOutOff; - @Schema(description = "PlaceOffX") + @Schema(description = "跟优化位置 漂移多少?X") private Double placeOffX; - @Schema(description = "PlaceOffY") + @Schema(description = "跟优化位置 漂移多少?Y") private Double placeOffY; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java index fbb569bb3..a71ec0607 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/HoleDetail.java @@ -1,7 +1,10 @@ package com.cf.imes.module.executor.controller.admin.plan.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.swing.*; + /** * @projectName: cf_imes_server * @author: 晨丰科技 @@ -11,13 +14,21 @@ import lombok.Data; public class HoleDetail { private Integer holeId; - private Integer holeType;// 请定义HoleType枚举类型 - private Integer face; // 请定义FaceType枚举类型 + @Schema(description = "孔类别 大孔 = 0, 小孔 = 10, 木削 = 20, 木削大孔 = 21, 层板钉 = 30, 通孔 = 40, 造型孔 = -10, 连接杆 = 50") + private Integer holeType; + @Schema(description = "面 正面 = 0, 反面 = 1, 侧面 = 2, 左侧面 = 21, 右侧面 = 22, 上侧面 = 23, 下侧面 = 24, 弧形侧面 = 29, 异形侧面 = 30") + private Integer face; + @Schema(description = "坐标x") private Integer pointX; + @Schema(description = "坐标y") private Integer pointY; + @Schema(description = "坐标z") private Integer pointZ; + @Schema(description = "半径") private Integer radius; + @Schema(description = "深度") private Integer depth; + @Schema(description = "起点坐标") private Integer endPoint; private Integer pointX2; private Integer pointY2; 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 25a2d9aa9..4ccf11c52 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 @@ -17,13 +17,13 @@ public class Metrial { private Integer goodsID; @Schema(description = "商品名称") private String goodsName; - @Schema(description = "Specification") + @Schema(description = "规范") private String specification; @Schema(description = "材质") private String metrial; @Schema(description = "颜色") private String color; - @Schema(description = "Brank") + @Schema(description = "品牌") private String brank; @Schema(description = "宽") private Integer width; @@ -31,25 +31,25 @@ public class Metrial { private Integer length; @Schema(description = "厚") private Integer thickness; - @Schema(description = "Border") + @Schema(description = "修边值") private Integer border; - @Schema(description = "CutDia") + @Schema(description = "开料刀直径") private Integer cutDia; - @Schema(description = "CutGap") + @Schema(description = "开料间隙") private Integer cutGap; @Schema(description = "IsSorted") private Boolean isSorted; - @Schema(description = "BoardCount") + @Schema(description = "大板数") private Integer boardCount; - @Schema(description = "MinBoardID") + @Schema(description = "最小大板ID") private Integer minBoardID; - @Schema(description = "MaxBoardID") + @Schema(description = "最大大板ID") private Integer maxBoardID; - @Schema(description = "AvgLyr_All") + @Schema(description = "平均利用率") private Double avgLyr_All; - @Schema(description = "AvgLyr_NoLastOne") + @Schema(description = "前N平均利用率") private Integer avgLyr_NoLastOne; - @Schema(description = "Lyr_LastOne") + @Schema(description = "尾张利用率") private Double lyr_LastOne; @Schema(description = "组织id") private Integer organId; @@ -61,25 +61,25 @@ public class Metrial { private Integer state; @Schema(description = "有波纹") private Boolean hasWave; - @Schema(description = "OrgWidth") + @Schema(description = "板材原宽") private Integer orgWidth; - @Schema(description = "OrgLength") + @Schema(description = "板材原长") private Integer orgLength; - @Schema(description = "BoardCount_Remain") + @Schema(description = "余料板数") private Integer boardCount_Remain; - @Schema(description = "RemainBoardMessage") + @Schema(description = "余料板情况") private String remainBoardMessage; - @Schema(description = "PreCutValue") + @Schema(description = "预洗值") private Integer preCutValue; @Schema(description = "废料板列表") private List scrapBoardList; - @Schema(description = "HelpCut") + @Schema(description = "是否辅助开料") private Boolean helpCut; - @Schema(description = "SameKnifeHelpCutGap") + @Schema(description = "同刀辅助 厚度") private Integer sameKnifeHelpCutGap; - @Schema(description = "CutKnifeID") + @Schema(description = "开料刀ID") private Integer cutKnifeID; - @Schema(description = "HelpKnifeID") + @Schema(description = "辅助刀ID") private Integer helpKnifeID; @Schema(description = "最后保存时间") private Date lastSaveDate; 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 de16af87a..8a72812c9 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,7 @@ 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; import java.util.List; @@ -13,11 +14,17 @@ import java.util.List; @Data public class ModelDetail { + @Schema(description = "造型ID") private Integer modelId; + @Schema(description = "线ID") private Integer lineId; + @Schema(description = "面 正面 = 0, 反面 = 1, 侧面 = 2, 左侧面 = 21, 右侧面 = 22, 上侧面 = 23, 下侧面 = 24, 弧形侧面 = 29, 异形侧面 = 30") private Integer face; + @Schema(description = "刀号") private String knifeName; + @Schema(description = "刀半径") private Integer knifeRadius; + @Schema(description = "深度") private Integer depth; private IOriginModelingData originModeling; private List pointList; 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/OffSetList.java index 3fd7d5b17..6e08ecead 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/OffSetList.java @@ -1,5 +1,7 @@ package com.cf.imes.module.executor.controller.admin.plan.dto; +import io.swagger.v3.oas.annotations.media.Schema; + /** * @projectName: cf_imes_server * @author: 晨丰科技 @@ -8,7 +10,8 @@ package com.cf.imes.module.executor.controller.admin.plan.dto; public class OffSetList { private String name; - private Integer face;// 请定义FaceType枚举类型 + @Schema(description = "面 正面 = 0, 反面 = 1, 侧面 = 2, 左侧面 = 21, 右侧面 = 22, 上侧面 = 23, 下侧面 = 24, 弧形侧面 = 29, 异形侧面 = 30") + private Integer face; private Integer value; private Integer radius; private Integer deep; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java index 38dfa8404..c708de9a2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/OrgSizeOutOff.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.controller.admin.plan.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -11,9 +12,13 @@ public class OrgSizeOutOff { private Integer right; private Integer upper; private Integer under; + @Schema(description = "板外扩宽") private Integer width; + @Schema(description = "板外扩长") private Integer length; + @Schema(description = "排版外扩宽") private Integer outWidth; + @Schema(description = "排版外扩长") private Integer outLength; private Boolean hasDone; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java index 4993cae08..b9d7b3702 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBlock.java @@ -10,21 +10,22 @@ import java.util.List; */ @Data public class ScrapBlock { - @Schema(description = "ScrapNo") + @Schema(description = "余料号") private Long scrapNo; - @Schema(description = "IsUnRegular") + @Schema(description = "是否异形") private Boolean isUnRegular; - @Schema(description = "IsOverlap") + @Schema(description = "是否重叠") private Boolean isOverlap; + @Schema(description = "是否已录入") private Boolean isInstored; private List points; private String remark; - @Schema(description = "PlaceX") + @Schema(description = "坐标X") private Double placeX; - @Schema(description = "PlaceY") + @Schema(description = "坐标Y") private Double placeY; - @Schema(description = "PlaceWidth") + @Schema(description = "开料宽") private Double placeWidth; - @Schema(description = "PlaceLength") + @Schema(description = "开料长") private Double placeLength; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java index 7338cd805..0bef0954b 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/ScrapBoard.java @@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @author Beal */ @@ -11,33 +13,33 @@ import lombok.NoArgsConstructor; @Data public class ScrapBoard { - @Schema(description ="PlanCode") + @Schema(description ="源排单号") private String planCode; - @Schema(description ="UsedPlanCode") + @Schema(description ="使用排单号") private String usedPlanCode; @Schema(description ="ID") private Long id; - @Schema(description ="PlanID") + @Schema(description ="排单ID") private Long planId; - @Schema(description ="OrgPlanID") + @Schema(description ="源排单ID") private Long orgPlanId; - @Schema(description ="Status") + @Schema(description ="未使用 = 0, 已使用 = 1") private Integer status; - @Schema(description ="PlacedStyle") + @Schema(description ="正面 = 0, 正面右转 = 1, 正面后转 = 2, 正面左转 = 3, 反面 = 4, 反面右转 = 5, 反面后转 = 6, 反面左转 = 7") private Integer placedStyle; - @Schema(description ="StoreHouse") + @Schema(description ="仓库") private String storeHouse; @Schema(description ="Count") private Integer count; - @Schema(description ="Remark") + @Schema(description ="备注") private String remark; @Schema(description ="OutLineJson") private String outLineJson; @Schema(description ="组织id") private Integer organId; - @Schema(description ="BasePolyline") - private Object basePolyline; - @Schema(description ="PlacedPolyline") - private Object placedPolyline; + @Schema(description ="原始多段线") + private List basePolyline; + @Schema(description ="放置的多段线") + private List placedPolyline; private Boolean isUsed; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java index 6ae8e9ee5..bdbc82a67 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/SizeOutOff.java @@ -1,5 +1,6 @@ package com.cf.imes.module.executor.controller.admin.plan.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -11,9 +12,13 @@ public class SizeOutOff { private Double right; private Double upper; private Double under; + @Schema(description = "板外扩宽") private Double width; + @Schema(description = "板外扩长") private Double length; + @Schema(description = "排版外扩 宽") private Double outWidth; + @Schema(description = "排版外扩 长") private Double outLength; private Boolean hasDone; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java index 7c771fbdb..c3d865300 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/dto/UsedBoardMessage.java @@ -10,28 +10,30 @@ import java.util.List; */ @Data public class UsedBoardMessage { - @Schema(description = "Bi") + @Schema(description = "大板id") private Integer bi; - @Schema(description = "W") + @Schema(description = "宽") private Integer w; - @Schema(description = "L") + @Schema(description = "长度") private Integer l; - @Schema(description = "Si") + @Schema(description = "余料板ID") private Integer si; - @Schema(description = "So") + @Schema(description = "仓库号") private String so; - @Schema(description = "No") + @Schema(description = "余料板号,大板为空") private String no; @Schema(description = "RM") - private String rM; - @Schema(description = "LK") + private String rm; + @Schema(description = "是否锁定") private Boolean lK; + @Schema(description = "余料母板") private List scrapPtList; + @Schema(description = "余料空间") private List scrapBlocks; - @Schema(description = "LE") - private Boolean lE; - @Schema(description = "RE") - private Boolean rE; + @Schema(description = "左边不能加工区域，有造型") + private Boolean le; + @Schema(description = "右边不能加工区域，有造型") + private Boolean re; @Schema(description = "WLs") private List wLs; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java index b97d75159..6a4400764 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java @@ -5,6 +5,7 @@ import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; import lombok.Data; import java.time.LocalDateTime; @@ -18,6 +19,7 @@ import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT * @author Beal */ @Data +@Builder public class OptimizeParamRespVO { @Schema(description = "排单id") private Long planId; @@ -29,8 +31,6 @@ public class OptimizeParamRespVO { private Integer type; @Schema(description = "排单状态 0 新单，1 板材已申请，2 开料中，3 已开料") private Integer status; - @Schema(description = "是否支付") - private Boolean isPay; @Schema(description = "机台 ID") private Long machineId; @Schema(description = "计划时间") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java index a0e6eedfc..43c6780cd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlateDetailVO.java @@ -22,7 +22,7 @@ public class PlateDetailVO { @Schema(description = "孔详情列表") private List holeDetailList; - @Schema(description = "模型详情列表") + @Schema(description = "造型列表") private List modelDetailList; @Schema(description = "偏移量") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index e762b82dd..5228276a4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -202,7 +202,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Override public OptimizeParamRespVO getOptimizePlanParam(Long planId) { - return planMapper.getOptimizePlanParam(planId); + + OptimizeParamRespVO optimizePlanParam = planMapper.getOptimizePlanParam(planId); + + return optimizePlanParam; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IOriginModelingData.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IOriginModelingData.java index dbe1d05d6..1312a3d81 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IOriginModelingData.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/IOriginModelingData.java @@ -1,11 +1,13 @@ package com.cf.imes.module.executor.util.deviseData; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import javax.swing.*; import java.util.Dictionary; /** @@ -18,12 +20,20 @@ import java.util.Dictionary; @Accessors(chain = false) // 设置 chain = false，避免生产单导入有问 public class IOriginModelingData { - private IContourData outline; //轮郭 - private Dictionary holes; //孔轮廓 - private Integer thickness; //厚度 - private Integer dir; // 0正面、1反面、2侧面 - private Integer knifeRadius; //刀半径 - private Integer addLen; //槽加长 - private Integer addWidth; //槽加宽 - private Integer addDepth; //槽加深 + @Schema(description = "轮郭") + private IContourData 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; } From f25652e88a5bbbbd999f548492861401997d84f7 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 28 Mar 2024 11:28:44 +0800 Subject: [PATCH 04/25] =?UTF-8?q?preStartEnabled=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/dal/dataobject/machine/CuttingSettingDO.java | 2 +- .../dataobject/machinetemplate/CuttingTemplateMachineDO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java index 9e4cf7c1e..8fbfd5e13 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java @@ -553,7 +553,7 @@ public class CuttingSettingDO extends ESDocument { @Schema(description = "轴停止指令") private String axisStopInstruction; @Schema(description = "是否预启动") - private String preStartEnabled; + private Boolean preStartEnabled; @Schema(description = "高级加工") private Boolean advancedProcessingEnabled; @Schema(description = "集合加工") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java index fe3fa3540..39558335b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java @@ -557,7 +557,7 @@ public class CuttingTemplateMachineDO extends ESDocument { @Schema(description = "轴停止指令") private String axisStopInstruction; @Schema(description = "是否预启动") - private String preStartEnabled; + private Boolean preStartEnabled; @Schema(description = "高级加工") private Boolean advancedProcessingEnabled; @Schema(description = "集合加工") From 0f67ea72cbc660f3bfeeae8728adad785284a441 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 28 Mar 2024 11:45:44 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/dataobject/machine/CuttingSettingDO.java | 14 +++++++------- .../machinetemplate/CuttingTemplateMachineDO.java | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java index 8fbfd5e13..e324352b0 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/CuttingSettingDO.java @@ -26,7 +26,7 @@ public class CuttingSettingDO extends ESDocument { @Schema(description = "默认0，工位1原点位置") private Integer originPoIntegerPosition; @Schema(description = "工作原点Z0基准面") - private String originZ0Position; + private Integer originZ0Position; @Schema(description = "排版基准点") private String layoutBenchmark; @Schema(description = "排版基准点跟随大板定位") @@ -249,17 +249,17 @@ public class CuttingSettingDO extends ESDocument { @Schema(description = "默认{0}_{1}_{2}，导出zip文件名") private List exportOrderPathName; @Schema(description = "大板NC正(A)面文件名") - private String largePlateNcPositiveFileName; + private List largePlateNcPositiveFileName; @Schema(description = "大板NC反(B)面文件名") - private String largePlateNcNegativeFileName; + private List largePlateNcNegativeFileName; @Schema(description = "小板NC正(A)面文件名") - private String smallPlateNcPositiveFileName; + private List smallPlateNcPositiveFileName; @Schema(description = "小板NC反(B)面文件名") - private String smallPlateNcNegativeFileName; + private List smallPlateNcNegativeFileName; @Schema(description = "大板DXF(排版图)文件名") - private String largePlateDxfLayoutFileName; + private List largePlateDxfLayoutFileName; @Schema(description = "小板DXF(孔槽加工图)文件名") - private String smallPlateDxfProcessingFileName; + private List smallPlateDxfProcessingFileName; @Schema(description = "导出大板NC反(B)面文件") private String exportLargePlateNcNegativeFile; @Schema(description = "合并大板NC正反(AB)面文件") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java index 39558335b..b16b85039 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/CuttingTemplateMachineDO.java @@ -30,7 +30,7 @@ public class CuttingTemplateMachineDO extends ESDocument { @Schema(description = "默认0，工位1原点位置") private Integer originPoIntegerPosition; @Schema(description = "工作原点Z0基准面") - private String originZ0Position; + private Integer originZ0Position; @Schema(description = "排版基准点") private String layoutBenchmark; @Schema(description = "排版基准点跟随大板定位") @@ -253,17 +253,17 @@ public class CuttingTemplateMachineDO extends ESDocument { @Schema(description = "默认{0}_{1}_{2}，导出zip文件名") private List exportOrderPathName; @Schema(description = "大板NC正(A)面文件名") - private String largePlateNcPositiveFileName; + private List largePlateNcPositiveFileName; @Schema(description = "大板NC反(B)面文件名") - private String largePlateNcNegativeFileName; + private List largePlateNcNegativeFileName; @Schema(description = "小板NC正(A)面文件名") - private String smallPlateNcPositiveFileName; + private List smallPlateNcPositiveFileName; @Schema(description = "小板NC反(B)面文件名") - private String smallPlateNcNegativeFileName; + private List smallPlateNcNegativeFileName; @Schema(description = "大板DXF(排版图)文件名") - private String largePlateDxfLayoutFileName; + private List largePlateDxfLayoutFileName; @Schema(description = "小板DXF(孔槽加工图)文件名") - private String smallPlateDxfProcessingFileName; + private List smallPlateDxfProcessingFileName; @Schema(description = "导出大板NC反(B)面文件") private String exportLargePlateNcNegativeFile; @Schema(description = "合并大板NC正反(AB)面文件") From 6f4e8938d6b91083d8ef6da1af63e7174f2cf536 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 28 Mar 2024 17:03:42 +0800 Subject: [PATCH 06/25] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8E=88=E6=9D=83=E5=88=86=E9=A1=B5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C2.mock=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=92=E5=8D=95=E5=8F=82=E6=95=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/OptimizePlanController.java | 11 ++- .../admin/plan/vo/OptimizeParamRespVO.java | 4 + .../optimizeplan/OptimizePlanServiceImpl.java | 19 +++++ .../main/resources/mapper/plan/PlanMapper.xml | 78 +++++++++++++------ .../machine/MachineTemplateController.java | 8 ++ .../admin/machine/vo/AuthTemplatePage.java | 19 +++++ .../admin/machine/vo/AuthTemplateResp.java | 29 +++++++ .../admin/machine/vo/AutoTemplateVO.java | 19 +++++ .../admin/machine/vo/MachineAuthVO.java | 1 - .../dal/dataobject/machine/UserMachineDO.java | 1 - .../MachineTemplateMapper.java | 11 +++ .../machine/MachineTemplateService.java | 2 + .../machine/MachineTemplateServiceImpl.java | 28 +++++-- .../mapper/process/MachineTemplateMapper.xml | 45 +++++++++++ 14 files changed, 237 insertions(+), 38 deletions(-) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplatePage.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplateResp.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AutoTemplateVO.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java index 1bd016630..54ba2ffc0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java @@ -3,6 +3,7 @@ package com.cf.imes.module.executor.controller.admin.plan; import cn.hutool.core.util.RandomUtil; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; +import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial; import com.cf.imes.module.executor.controller.admin.plan.vo.*; import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService; import com.cf.imes.module.executor.util.RandomUtils; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import javax.validation.constraints.NotNull; +import java.util.ArrayList; import java.util.List; /** @@ -77,14 +79,15 @@ public class OptimizePlanController { } @GetMapping("/getOptimizePlanParam") - @Operation(summary = "获取优化排单参数 (未完成)") + @Operation(summary = "获取优化排单参数 (mock)") @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") @Parameter(name = "planId", description = "排单id", required = false) public CommonResult getOptimizePlanParam (@RequestParam (required = false) Long planId) { - OptimizeParamRespVO data = RandomUtils.randomPojo(OptimizeParamRespVO.class); - return CommonResult.success(data); + /* OptimizeParamRespVO data = RandomUtils.randomPojo(OptimizeParamRespVO.class); + return CommonResult.success(data);*/ //todo - //return CommonResult.success(optimizePlanService.getOptimizePlanParam(planId)); + OptimizeParamRespVO optimizePlanParam = optimizePlanService.getOptimizePlanParam(planId); + return CommonResult.success(optimizePlanParam); } } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java index 6a4400764..c3b9349cc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizeParamRespVO.java @@ -5,8 +5,10 @@ import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial; import com.cf.imes.module.executor.controller.admin.plate.vo.PlateRespVO; 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.time.LocalDateTime; import java.util.Date; @@ -20,6 +22,8 @@ import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT */ @Data @Builder +@AllArgsConstructor +@NoArgsConstructor public class OptimizeParamRespVO { @Schema(description = "排单id") private Long planId; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index 5228276a4..e90c10493 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -1,11 +1,14 @@ package com.cf.imes.module.executor.service.optimizeplan; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX; +import com.cf.imes.module.executor.controller.admin.plan.dto.Metrial; import com.cf.imes.module.executor.controller.admin.plan.vo.*; +import com.cf.imes.module.executor.controller.admin.plate.vo.PlateDetailVO; import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.executor.dal.dataobject.orderItem.OrderItemDO; import com.cf.imes.module.executor.dal.dataobject.plan.PlanDO; @@ -18,6 +21,7 @@ import com.cf.imes.module.executor.dal.mysql.goods.GoodsMapper; import com.cf.imes.module.executor.dal.mysql.plan.PlanMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; import com.cf.imes.module.executor.dal.mysql.remainplaten.RemainPlateMapper; +import com.cf.imes.module.executor.util.RandomUtils; import com.cf.imes.module.executor.util.RectangleChecker; import com.cf.imes.module.infra.api.file.FileApi; import com.cf.imes.module.infra.api.file.dto.FileCreateReqDTO; @@ -205,6 +209,21 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { OptimizeParamRespVO optimizePlanParam = planMapper.getOptimizePlanParam(planId); + if(Objects.isNull(optimizePlanParam)) { + return RandomUtils.randomPojo(OptimizeParamRespVO.class); + } + //暂时先mock + ArrayList list = new ArrayList<>(); + list.add(RandomUtils.randomPojo(Metrial.class)); + list.add(RandomUtils.randomPojo(Metrial.class)); + ArrayList plateDetailVOS = new ArrayList<>(); + plateDetailVOS.add(RandomUtils.randomPojo(PlateDetailVO.class)); + plateDetailVOS.add(RandomUtils.randomPojo(PlateDetailVO.class)); + plateDetailVOS.add(RandomUtils.randomPojo(PlateDetailVO.class)); + if( CollectionUtil.isNotEmpty(optimizePlanParam.getPlateList())) { + optimizePlanParam.getPlateList().get(0).setPlateDetailList(plateDetailVOS); + } + optimizePlanParam.setMetrialList(list); return optimizePlanParam; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml index 46ab15c25..3dc647fc5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml @@ -20,25 +20,26 @@ - + - - - + + - - - + + + - - - - - + + + + + + + @@ -54,21 +55,58 @@ + - - + - + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index e22bcdc3b..c14922b09 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -125,4 +125,12 @@ public class MachineTemplateController { return success(machineTemplateService.auth(vo)); } + @GetMapping("auth-template-page") + @Operation(summary = "用户模板授权分页列表") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + public CommonResult> authTemplatePage(AuthTemplatePage page) { + return success(machineTemplateService.authTemplatePage(page)); + } + + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplatePage.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplatePage.java new file mode 100644 index 000000000..d96f2dedf --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplatePage.java @@ -0,0 +1,19 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import com.cf.imes.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + + +/** + * @author Beal + */ +@Data +public class AuthTemplatePage extends PageParam { + @Schema(description = "组织id") + private Long organId; + @Schema(description = "用户昵称") + private String nickname; + @Schema(description = "机台模板名称") + private String templateName; +} 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 new file mode 100644 index 000000000..fe0708f3f --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AuthTemplateResp.java @@ -0,0 +1,29 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author Beal + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class AuthTemplateResp { + @Schema(description = "组织id") + private Long organId; + @Schema(description = "组织名称") + private String organName; + @Schema(description = "用户id") + private Long userId; + @Schema(description = "用户昵称") + private String nickname; + @Schema(description = "机台模板列表") + private List authTemplateList; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AutoTemplateVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AutoTemplateVO.java new file mode 100644 index 000000000..d6a2a409d --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/AutoTemplateVO.java @@ -0,0 +1,19 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class AutoTemplateVO { + @Schema(description = "机台模板id") + private Long templateId; + @Schema(description = "机台模板名称") + private String templateName; + + @JsonIgnore + private Long userId; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineAuthVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineAuthVO.java index 0e6280468..f133c287f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineAuthVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineAuthVO.java @@ -14,6 +14,5 @@ public class MachineAuthVO { @NotNull(message = "用户id不能空") private Long userId; - @NotEmpty(message = "机台配置id不能空") private List machinesIds; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/UserMachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/UserMachineDO.java index c1b5a58d4..a6c6b2153 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/UserMachineDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/UserMachineDO.java @@ -20,5 +20,4 @@ public class UserMachineDO { private Long id; private Long userId; private Long machineId; - private Long organId; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java index 791983eb7..34b63e578 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java @@ -1,14 +1,21 @@ package com.cf.imes.module.system.dal.mysql.machinetemplate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.module.system.controller.admin.machine.vo.AuthTemplatePage; +import com.cf.imes.module.system.controller.admin.machine.vo.AuthTemplateResp; +import com.cf.imes.module.system.controller.admin.machine.vo.AutoTemplateVO; import com.cf.imes.module.system.controller.admin.machine.vo.MachinePageReqVO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.Collection; import java.util.List; +import java.util.Map; /** * @author there @@ -24,4 +31,8 @@ public interface MachineTemplateMapper extends BaseMapperX { .betweenIfPresent(MachineTemplateDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(MachineTemplateDO::getCreateTime)); } + + Page selectAuthTemplatePage(@Param("page") IPage authTemplateRespPage, @Param("vo") AuthTemplatePage page); + + List selectAuthTemplateList(Map map); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java index e3276d6c2..60949aadc 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java @@ -44,4 +44,6 @@ public interface MachineTemplateService { DrillTemplateRespVO getDefaultDrill(); Map> getMachineTemplateTree(); + + PageResult authTemplatePage(AuthTemplatePage page); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index 667efd6db..5c5ff3fcb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -10,6 +10,9 @@ import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; import co.elastic.clients.elasticsearch.core.SearchRequest; import co.elastic.clients.elasticsearch.core.SearchResponse; import co.elastic.clients.elasticsearch.core.search.Hit; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.es.core.dal.ESDocument; @@ -23,8 +26,10 @@ import com.cf.imes.module.system.dal.dataobject.machine.UserMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.CuttingTemplateMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.DrillTemplateMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; +import com.cf.imes.module.system.dal.dataobject.user.AdminUserDO; import com.cf.imes.module.system.dal.mysql.machine.UserMachineMapper; import com.cf.imes.module.system.dal.mysql.machinetemplate.MachineTemplateMapper; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -257,6 +262,13 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { return map; } + @Override + public PageResult authTemplatePage(AuthTemplatePage page) { + Page respPage = new Page<>(page.getPageNo(), page.getPageSize()); + Page pageRes = machineTemplateMapper.selectAuthTemplatePage(respPage, page); + return new PageResult<>(pageRes.getRecords(),pageRes.getTotal()); + } + @Override public Boolean deleteCuttingTemplate(Long id) { MachineTemplateDO templateDO = machineTemplateMapper.selectById(id); @@ -301,14 +313,16 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Transactional(rollbackFor = Exception.class) public Boolean auth(MachineAuthVO vo) { userMachineMapper.delete(new LambdaQueryWrapperX().eq(UserMachineDO::getUserId, vo.getUserId())); - ArrayList userMachineDOS = new ArrayList<>(); - for (Long machinesId : vo.getMachinesIds()) { - userMachineDOS.add(UserMachineDO.builder() - .userId(vo.getUserId()) - .machineId(machinesId) - .build()); + if(CollectionUtil.isNotEmpty(vo.getMachinesIds())) { + ArrayList userMachineDOS = new ArrayList<>(); + for (Long machinesId : vo.getMachinesIds()) { + userMachineDOS.add(UserMachineDO.builder() + .userId(vo.getUserId()) + .machineId(machinesId) + .build()); + } + userMachineMapper.insertBatch(userMachineDOS); } - userMachineMapper.insertBatch(userMachineDOS); return Boolean.TRUE; } 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 new file mode 100644 index 000000000..00991ffdf --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file From be6e4ba8fff4b973d07f34e9a9f9118ffc5d3d16 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 28 Mar 2024 17:21:40 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8E=88=E6=9D=83=E5=88=86=E9=A1=B5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/process/MachineTemplateMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 00991ffdf..708307499 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 @@ -34,9 +34,9 @@ resultType="com.cf.imes.module.system.controller.admin.machine.vo.AutoTemplateVO" parameterType="java.util.Map"> select b.user_id, c.name AS templateName, c.id AS templateId from user_machine b - inner join system_machine_template c on b.machine_id = c.id + inner join system_machine_template c on b.machine_id = c.id and c.deleted = 0 - c.deleted = 0 + b.user_id = #{userId} and c.name like concat('%',#{templateName},'%') From ca1994644db3d8e770c9adb478a954247481bc91 Mon Sep 17 00:00:00 2001 From: yangsb Date: Fri, 29 Mar 2024 14:02:07 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=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 @@ + 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 @@ -43,4 +65,60 @@ + + + + + \ No newline at end of file From 64c004384437cc66143f10742d6650594e388553 Mon Sep 17 00:00:00 2001 From: yangsb Date: Mon, 1 Apr 2024 17:19:53 +0800 Subject: [PATCH 12/25] =?UTF-8?q?url=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/machine/MachineTemplateController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index a34aa9c99..0c1883996 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -132,7 +132,7 @@ public class MachineTemplateController { return success(machineTemplateService.authTemplatePage(page)); } - @PostMapping("org-auth-template") + @PostMapping("organ-auth-template") @Operation(summary = "组织模板授权") @PreAuthorize("@ss.hasPermission('machine-template::query')") public CommonResult auth(@RequestBody MachineOrgAuthReq vo) { From 6e9032241ee9d075f0051be69382b33c014aabbc Mon Sep 17 00:00:00 2001 From: yangsb Date: Mon, 1 Apr 2024 17:37:53 +0800 Subject: [PATCH 13/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=BB=84=E7=BB=87id=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8E=88=E6=9D=83=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/MachineTemplateController.java | 8 ++++++++ .../machinetemplate/MachineTemplateMapper.java | 6 ++++-- .../machine/MachineTemplateService.java | 2 ++ .../machine/MachineTemplateServiceImpl.java | 7 ++++++- .../mapper/process/MachineTemplateMapper.xml | 18 +++++++++++++++--- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index 0c1883996..f0b3b8500 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -146,5 +146,13 @@ public class MachineTemplateController { return success(machineTemplateService.organTemplatePage(page)); } + @GetMapping("organ-template-by-organId") + @Operation(summary = "根据组织id查询组织模板授权") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + @Parameter(name = "organId", description = "组织id", required = true, example = "1") + public CommonResult organTemplateByOrganId(@RequestParam Long organId ) { + return success(machineTemplateService.organTemplateByOrganId(organId)); + } + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java index a732c8cb3..bb4b56d91 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java @@ -33,9 +33,11 @@ public interface MachineTemplateMapper extends BaseMapperX { List selectAuthTemplateList(Map map); - Page selectOrganTemplatePage(@Param("page") Page respPage, @Param("vo") OrganTemplatePage page); + //Page selectOrganTemplatePage(@Param("page") Page respPage, @Param("vo") OrganTemplatePage page); List selectOrganTemplateList(Map map); - Page xxselectOrganTemplatePage(@Param("page") Page respPage, @Param("vo") OrganTemplatePage page); + Page selectOrganTemplatePage(@Param("page") Page respPage, @Param("vo") OrganTemplatePage page); + + OrganTemplateResp selectOrganTemplate(Long organId); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java index 5285daea8..3deafa95d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java @@ -50,4 +50,6 @@ public interface MachineTemplateService { Boolean auth(MachineOrgAuthReq vo); PageResult organTemplatePage(OrganTemplatePage page); + + OrganTemplateResp organTemplateByOrganId(Long organId); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index ec1edf7aa..aea72587b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -278,10 +278,15 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override public PageResult organTemplatePage(OrganTemplatePage page) { Page respPage = new Page<>(page.getPageNo(), page.getPageSize()); - Page pageRes = machineTemplateMapper.xxselectOrganTemplatePage(respPage, page); + Page pageRes = machineTemplateMapper.selectOrganTemplatePage(respPage, page); return new PageResult<>(pageRes.getRecords(), pageRes.getTotal()); } + @Override + public OrganTemplateResp organTemplateByOrganId(Long organId) { + return machineTemplateMapper.selectOrganTemplate(organId); + } + @Override public Boolean deleteCuttingTemplate(Long id) { 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 6ed2b29d2..e0c8d77aa 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 @@ -18,7 +18,7 @@ + select="selectOrganTemplateList" column="{organId=organId}" > @@ -66,7 +66,7 @@ - @@ -94,6 +94,7 @@ + + + \ No newline at end of file From c58e2b7b027b88eee3f101ce690a111315fc6324 Mon Sep 17 00:00:00 2001 From: yangsb Date: Mon, 1 Apr 2024 17:58:55 +0800 Subject: [PATCH 14/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E6=A8=A1=E6=9D=BF=E5=88=86=E9=A1=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machine/MachineTemplateController.java | 10 ++++++ .../admin/machine/vo/TemplateAutoResp.java | 34 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index f0b3b8500..d3bddac40 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.machine; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; import com.cf.imes.module.system.service.machine.MachineTemplateService; @@ -154,5 +155,14 @@ public class MachineTemplateController { return success(machineTemplateService.organTemplateByOrganId(organId)); } + @GetMapping("page-template-machine-auth") + @Operation(summary = "授权机台模板分页") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + public CommonResult> pageTemplateAuth(MachinePageReqVO pageParam) { + PageResult page = machineTemplateService.page(pageParam); + List list = BeanUtils.toBean(page.getList(), TemplateAutoResp.class); + return success(new PageResult(list, page.getTotal())); + } + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java new file mode 100644 index 000000000..3a01e3bab --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java @@ -0,0 +1,34 @@ +package com.cf.imes.module.system.controller.admin.machine.vo; + +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @author Beal + */ +@Data +public class TemplateAutoResp { + @Schema(description = "机台模板id") + private Long id; + /** + * 名称 + */ + @Schema(description = "机台模板名称") + private String name; + /** + * 1机台设备 2CNC设备 + */ + @Schema(description = "机台模板类别") + private Integer machineType; + /** + * 是否默认模板 + */ + private Boolean isDefault; + @Schema(description ="加工模式 开料机加工模式 默认true，显示开料机工作模式(是否排钻/造型，sc)配置") + private Boolean showPriorFacing = false; + @Schema(description = "双工位") + private Boolean showDualWorkstation = false; + @Schema(description = "自动贴标") + private Boolean showAutoNotePrinter = false; +} From 3001f44e6f4eb27514122750e9b5526227f0839b Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 2 Apr 2024 09:45:04 +0800 Subject: [PATCH 15/25] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E6=8E=88=E6=9D=83=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=BD=92=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/DataSourceController.java | 4 +- .../admin/datasource/vo/DataSourceRespVO.java | 4 ++ .../admin/machine/MachineAuthController.java | 60 +++++++++++++++++++ .../machine/MachineTemplateController.java | 42 ------------- .../datasource/DataSourceFiledDO.java | 21 +++++++ 5 files changed, 87 insertions(+), 44 deletions(-) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceFiledDO.java diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java index 84dcb628d..b9678d428 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java @@ -39,7 +39,7 @@ public class DataSourceController { @Resource private DataSourceService dataSourceService; - @PostMapping("/create") + /* @PostMapping("/create") @Operation(summary = "创建系统数据源") @PreAuthorize("@ss.hasPermission('system:data-source:create')") public CommonResult createDataSource(@Valid @RequestBody DataSourceSaveReqVO createReqVO) { @@ -78,7 +78,7 @@ public class DataSourceController { public CommonResult> getDataSourcePage(@Valid DataSourcePageReqVO pageReqVO) { PageResult pageResult = dataSourceService.getDataSourcePage(pageReqVO); return success(BeanUtils.toBean(pageResult, DataSourceRespVO.class)); - } + }*/ @GetMapping("/list") @Operation(summary = "获得系统数据源列表") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java index 5e797cf0c..2362e2eb3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.datasource.vo; +import com.cf.imes.module.system.dal.dataobject.datasource.DataSourceFiledDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -33,4 +34,7 @@ public class DataSourceRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "字段列表") + private List filedList; + } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java new file mode 100644 index 000000000..dece72d7e --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java @@ -0,0 +1,60 @@ +package com.cf.imes.module.system.controller.admin.machine; + +import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.framework.common.util.object.BeanUtils; +import com.cf.imes.module.system.controller.admin.machine.vo.*; +import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; +import com.cf.imes.module.system.service.machine.MachineTemplateService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +import static com.cf.imes.framework.common.pojo.CommonResult.success; + +/** + * @author Beal + */ +@RestController +@Tag(name = "机台模板授权") +public class MachineAuthController { + + @Resource + private MachineTemplateService machineTemplateService; + + @PostMapping("organ-auth-template") + @Operation(summary = "组织模板授权") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + public CommonResult auth(@RequestBody MachineOrgAuthReq vo) { + return success(machineTemplateService.auth(vo)); + } + + @GetMapping("organ-template-page") + @Operation(summary = "组织模板授权分页列表") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + public CommonResult> organTemplatePage(OrganTemplatePage page) { + return success(machineTemplateService.organTemplatePage(page)); + } + + @GetMapping("organ-template-by-organId") + @Operation(summary = "根据组织id查询组织模板授权") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + @Parameter(name = "organId", description = "组织id", required = true, example = "1") + public CommonResult organTemplateByOrganId(@RequestParam Long organId ) { + return success(machineTemplateService.organTemplateByOrganId(organId)); + } + + @GetMapping("page-template-machine-auth") + @Operation(summary = "授权机台模板分页") + @PreAuthorize("@ss.hasPermission('machine-template::query')") + public CommonResult> pageTemplateAuth(MachinePageReqVO pageParam) { + PageResult page = machineTemplateService.page(pageParam); + List list = BeanUtils.toBean(page.getList(), TemplateAutoResp.class); + return success(new PageResult(list, page.getTotal())); + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index d3bddac40..0960bb937 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -119,50 +119,8 @@ public class MachineTemplateController { } - @PostMapping("auth-template") - @Operation(summary = "用户模板授权") - @PreAuthorize("@ss.hasPermission('machine-template::query')") - public CommonResult auth(@RequestBody MachineAuthVO vo) { - return success(machineTemplateService.auth(vo)); - } - @GetMapping("auth-template-page") - @Operation(summary = "用户模板授权分页列表") - @PreAuthorize("@ss.hasPermission('machine-template::query')") - public CommonResult> authTemplatePage(AuthTemplatePage page) { - return success(machineTemplateService.authTemplatePage(page)); - } - @PostMapping("organ-auth-template") - @Operation(summary = "组织模板授权") - @PreAuthorize("@ss.hasPermission('machine-template::query')") - public CommonResult auth(@RequestBody MachineOrgAuthReq vo) { - return success(machineTemplateService.auth(vo)); - } - - @GetMapping("organ-template-page") - @Operation(summary = "组织模板授权分页列表") - @PreAuthorize("@ss.hasPermission('machine-template::query')") - public CommonResult> organTemplatePage(OrganTemplatePage page) { - return success(machineTemplateService.organTemplatePage(page)); - } - - @GetMapping("organ-template-by-organId") - @Operation(summary = "根据组织id查询组织模板授权") - @PreAuthorize("@ss.hasPermission('machine-template::query')") - @Parameter(name = "organId", description = "组织id", required = true, example = "1") - public CommonResult organTemplateByOrganId(@RequestParam Long organId ) { - return success(machineTemplateService.organTemplateByOrganId(organId)); - } - - @GetMapping("page-template-machine-auth") - @Operation(summary = "授权机台模板分页") - @PreAuthorize("@ss.hasPermission('machine-template::query')") - public CommonResult> pageTemplateAuth(MachinePageReqVO pageParam) { - PageResult page = machineTemplateService.page(pageParam); - List list = BeanUtils.toBean(page.getList(), TemplateAutoResp.class); - return success(new PageResult(list, page.getTotal())); - } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceFiledDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceFiledDO.java new file mode 100644 index 000000000..76d339d26 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceFiledDO.java @@ -0,0 +1,21 @@ +package com.cf.imes.module.system.dal.dataobject.datasource; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @author Beal + */ +@Data +@TableName("system_data_source_field") +public class DataSourceFiledDO { + @TableId + private Long id; + + private Long sourceId; + + private String name; + + private String key; +} From 0d9fd5292d2c559cf4176665448e55b8a0888cc7 Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 2 Apr 2024 10:12:41 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/machine/MachineAuthController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java index dece72d7e..7ac1d82a5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java @@ -22,6 +22,7 @@ import static com.cf.imes.framework.common.pojo.CommonResult.success; */ @RestController @Tag(name = "机台模板授权") +@RequestMapping("/system/machine-template-auth") public class MachineAuthController { @Resource From 4b70938da81dd3f1014b3b82e4aef512c860cb8a Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 2 Apr 2024 14:59:21 +0800 Subject: [PATCH 17/25] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C2.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE=E3=80=81=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=AD=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/DataSourceController.java | 9 ++- .../admin/label/vo/LabelElementRespVO.java | 11 ++- .../admin/label/vo/LabelElementSaveReqVO.java | 5 +- .../vo/LabelElementTemplateRespVO.java | 15 +++- .../vo/LabelElementTemplateSaveReqVO.java | 10 ++- .../admin/machine/MachineAuthController.java | 10 ++- .../admin/machine/vo/TemplateAutoResp.java | 8 +- .../admin/organ/OrganController.java | 11 +++ .../system/convert/label/LabelConvert.java | 16 ++++ .../convert/label/LabelConvertImpl.java | 52 +++++++++++++ .../labletemplate/LabelTemplateConvert.java | 16 ++++ .../LabelTemplateConvertImpl.java | 77 +++++++++++++++++++ .../labeltemplate/LabelElementTemplateDO.java | 6 ++ .../dal/dataobject/lable/LabelElementDO.java | 4 + .../mysql/datasource/DataSourceMapper.java | 1 + .../service/datasource/DataSourceService.java | 2 + .../datasource/DataSourceServiceImpl.java | 5 ++ .../LabelTemplateServiceImpl.java | 61 +++++++++------ .../service/lable/LabelServiceImpl.java | 60 +++++++++------ .../system/service/organ/OrganService.java | 3 + .../service/organ/OrganServiceImpl.java | 11 +++ .../mapper/process/DataSourceMapper.xml | 23 ++++++ .../mapper/process/MachineTemplateMapper.xml | 2 +- 23 files changed, 358 insertions(+), 60 deletions(-) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java index b9678d428..1eb6a5633 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java @@ -82,11 +82,12 @@ public class DataSourceController { @GetMapping("/list") @Operation(summary = "获得系统数据源列表") - @Parameter(name = "type", description = "类型", required = false) @PreAuthorize("@ss.hasPermission('system:data-source:query')") - public CommonResult> list( @RequestParam(value = "type", required = false) Integer type) { - List list = dataSourceService.list(type); - return success(BeanUtils.toBean(list, DataSourceRespVO.class)); + public CommonResult> list( ) { + return success(dataSourceService.list()); + + /*List list = + return success(BeanUtils.toBean(list, DataSourceRespVO.class));*/ } @GetMapping("/export-excel") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java index 2a06f2a56..341693176 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java @@ -1,10 +1,17 @@ package com.cf.imes.module.system.controller.admin.label.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class LabelElementRespVO { @Schema(description = "主键") @@ -17,6 +24,8 @@ public class LabelElementRespVO { private String type; @Schema(description = "数据源id") private Long sourceId; + /*@Schema(description = "标签元素属性") + private LabelElementPropertyDO propertyDO;*/ @Schema(description = "标签元素属性") - private LabelElementPropertyDO propertyDO; + private JSONObject propertyDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java index 7e8c5be07..0b71ea7ed 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.label.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -19,6 +20,8 @@ public class LabelElementSaveReqVO { private String type; @Schema(description = "数据源id") private Long sourceId; + /*@Schema(description = "标签元素属性") + private LabelElementPropertyDO propertyDO;*/ @Schema(description = "标签元素属性") - private LabelElementPropertyDO propertyDO; + private JSONObject propertyDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java index 7ad8da3aa..b2ef20a14 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java @@ -1,10 +1,19 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class LabelElementTemplateRespVO { @Schema(description = "主键") @@ -17,6 +26,10 @@ public class LabelElementTemplateRespVO { private String type; @Schema(description = "数据源id") private Long sourceId; + /*@Schema(description = "标签元素属性") + private LabelElementPropertyDO propertyDO;*/ + /*@Schema(description = "标签元素属性") + private Map propertyDO;*/ @Schema(description = "标签元素属性") - private LabelElementPropertyDO propertyDO; + private JSONObject propertyDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java index 4a851c3c2..d0b53d881 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java @@ -1,9 +1,12 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.Map; + /** * @author there */ @@ -19,6 +22,11 @@ public class LabelElementTemplateSaveReqVO { private String type; @Schema(description = "数据源id") private Long sourceId; + /*@Schema(description = "标签元素属性") + private LabelElementPropertyDO propertyDO;*/ + /*@Schema(description = "标签元素属性") + + private Map propertyDO;*/ @Schema(description = "标签元素属性") - private LabelElementPropertyDO propertyDO; + private JSONObject propertyDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java index 7ac1d82a5..0b4242bf2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; import static com.cf.imes.framework.common.pojo.CommonResult.success; @@ -55,7 +56,14 @@ public class MachineAuthController { @PreAuthorize("@ss.hasPermission('machine-template::query')") public CommonResult> pageTemplateAuth(MachinePageReqVO pageParam) { PageResult page = machineTemplateService.page(pageParam); - List list = BeanUtils.toBean(page.getList(), TemplateAutoResp.class); + List list = page.getList().stream().map(e->TemplateAutoResp.builder() + .id(e.getId()) + .machineType(e.getMachineType()) + .templateName(e.getName()) + .isDefault(e.getIsDefault()) + .build() + ).collect(Collectors.toList()); + return success(new PageResult(list, page.getTotal())); } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java index 3a01e3bab..fc355bf43 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java @@ -2,12 +2,18 @@ package com.cf.imes.module.system.controller.admin.machine.vo; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * @author Beal */ @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class TemplateAutoResp { @Schema(description = "机台模板id") private Long id; @@ -15,7 +21,7 @@ public class TemplateAutoResp { * 名称 */ @Schema(description = "机台模板名称") - private String name; + private String templateName; /** * 1机台设备 2CNC设备 */ diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java index 02fc4c207..d4140754d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.organ; +import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; @@ -25,8 +26,10 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.util.List; +import java.util.Map; import static com.cf.imes.framework.common.pojo.CommonResult.success; +import static com.cf.imes.framework.common.util.collection.CollectionUtils.convertList; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 组织") @@ -109,4 +112,12 @@ public class OrganController { BeanUtils.toBean(list, OrganRespVO.class)); } + + @GetMapping({"/list-all-simple", "/simple-list"}) + @Operation(summary = "获取组织精简信息列表", description = "主要用于前端的下拉选项") + @Parameter(name = "name", description = "组织名称", required = false, example = "xxx") + public CommonResult> getSimpleOrganList(@RequestParam(required = false, value = "name") String name) { + return success(organService.getSimpleOrganList(name)); + } + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java new file mode 100644 index 000000000..df9095219 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java @@ -0,0 +1,16 @@ +package com.cf.imes.module.system.convert.label; + +import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; +import com.cf.imes.module.system.controller.admin.label.vo.LabelElementSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; + +import java.util.List; + +public interface LabelConvert { + + List convert1 (List labelElementDOS); + + List convert2 (List labelElementRespVOS); + + LabelElementDO convert(LabelElementSaveReqVO vo); +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java new file mode 100644 index 000000000..cb4cbb784 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java @@ -0,0 +1,52 @@ +package com.cf.imes.module.system.convert.label; + +import com.alibaba.fastjson.JSON; +import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; +import com.cf.imes.module.system.controller.admin.label.vo.LabelElementSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class LabelConvertImpl implements LabelConvert{ + @Override + public List convert1(List labelElementDOS) { + return labelElementDOS.stream().map( + e-> LabelElementRespVO.builder() + .labelId(e.getLabelId()) + .name(e.getName()) + .id(e.getId()) + .type(e.getType()) + .sourceId(e.getSourceId()) + .propertyDO(JSON.parseObject(e.getConfig())) + .build() + ).collect(Collectors.toList()); + } + + @Override + public List convert2(List labelElementRespVOS) { + return labelElementRespVOS.stream().map(e-> LabelElementDO.builder() + .labelId(e.getLabelId()) + .type(e.getType()) + .name(e.getName()) + .sourceId(e.getSourceId()) + .id(e.getId()) + .config(e.getPropertyDO().toJSONString()) + .build() + ).collect(Collectors.toList()); + } + + @Override + public LabelElementDO convert(LabelElementSaveReqVO vo) { + return LabelElementDO.builder() + .config(vo.getPropertyDO().toJSONString()) + .labelId(vo.getLabelId()) + .type(vo.getType()) + .sourceId(vo.getSourceId()) + .id(vo.getId()) + .name(vo.getName()) + .build(); + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java new file mode 100644 index 000000000..d92884514 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java @@ -0,0 +1,16 @@ +package com.cf.imes.module.system.convert.labletemplate; + +import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateRespVO; +import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; +import java.util.List; + +public interface LabelTemplateConvert { + + List convert1 (List labelElementTemplateDOS); + + List convert2 (List labelElementTemplateRespVOS); + + LabelElementTemplateDO convert(LabelElementTemplateSaveReqVO vo); + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java new file mode 100644 index 000000000..423ff1c8a --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java @@ -0,0 +1,77 @@ +package com.cf.imes.module.system.convert.labletemplate; + +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import com.alibaba.fastjson.JSON; +import com.cf.imes.framework.common.util.collection.MapUtils; +import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateRespVO; +import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; +import com.google.common.reflect.TypeToken; +import com.google.gson.Gson; +import org.springframework.stereotype.Service; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * @author Beal + */ +@Service +public class LabelTemplateConvertImpl implements LabelTemplateConvert { + + @Override + public List convert1 (List labelElementTemplateDOS) { + return labelElementTemplateDOS.stream().map(e -> { + Gson gson = new Gson(); + Type type = new TypeToken>() { + }.getType(); + return LabelElementTemplateRespVO.builder() + .labelTemplateId(e.getLabelTemplateId()) + .id(e.getId()) + .type(e.getType()) + .name(e.getName()) + .propertyDO(JSON.parseObject(e.getConfig())) + // .propertyDO(StrUtil.isBlank(e.getPropertyDO()) ? new HashMap(): gson.fromJson(e.getPropertyDO(), type)) + //{extra=, x=100, y=100, width=100, height=100, value=, html=, isRepeat=false, borderWidth=1, fontSize=1, divHeight=1, colNum=1, enableSourceExpress=false, sourceExpress=, visible=true, isScrapBlock=false, visibleExpression=, isVertical=false, dataText=, dataExpression=, displayType=1, barcodeType=, fontWeight=1, fontFamily=, textAlign=, textBaseline=, qrcodeErrorRate=, showSideHole=false} + .sourceId(e.getSourceId()) + .build(); + } + + ).collect(Collectors.toList()); + } + + @Override + public List convert2(List labelElementTemplateRespVOS) { + + return labelElementTemplateRespVOS.stream().map(e-> + LabelElementTemplateDO.builder() + .config(e.getPropertyDO().toJSONString()) + .labelTemplateId(e.getLabelTemplateId()) + .type(e.getType()) + .id(e.getId()) + .name(e.getName()) + .sourceId(e.getSourceId()) + .build() + ).collect(Collectors.toList()); + } + + @Override + public LabelElementTemplateDO convert(LabelElementTemplateSaveReqVO vo) { + return LabelElementTemplateDO.builder() + .name(vo.getName()) + .config(vo.getPropertyDO().toJSONString()) + .labelTemplateId(vo.getLabelTemplateId()) + .sourceId(vo.getSourceId()) + .id(vo.getId()) + .type(vo.getType()) + .build() + ; + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java index e588d8b5b..26ee407b8 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java @@ -1,11 +1,13 @@ package com.cf.imes.module.system.dal.dataobject.labeltemplate; +import com.alibaba.fastjson.JSONObject; import lombok.*; import java.util.*; import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; +import org.apache.ibatis.type.JdbcType; /** * 标签元素模板 DO @@ -43,5 +45,9 @@ public class LabelElementTemplateDO extends BaseDO { * 数据源id */ private Long sourceId; + /** + * 元素配置 + */ + private String config; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java index ce660f568..48faa2bb8 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java @@ -43,5 +43,9 @@ public class LabelElementDO extends OrganBaseDO { * 数据源id */ private Long sourceId; + /** + * 元素配置 + */ + private String config; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java index dbc007c5c..098e7dc7a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java @@ -26,4 +26,5 @@ public interface DataSourceMapper extends BaseMapperX { .orderByDesc(DataSourceDO::getId)); } + List selectListVO(); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceService.java index 357191da4..ef479826c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceService.java @@ -54,4 +54,6 @@ public interface DataSourceService { PageResult getDataSourcePage(DataSourcePageReqVO pageReqVO); List list(Integer type); + + List list(); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java index 71b84518d..1cb9c58cf 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java @@ -75,4 +75,9 @@ public class DataSourceServiceImpl implements DataSourceService { return dataSourceMapper.selectList(new LambdaQueryWrapperX().eqIfPresent(DataSourceDO::getType, type)); } + @Override + public List list() { + return dataSourceMapper.selectListVO(); + } + } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index 9e189d2cb..7f9d729ae 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java @@ -3,15 +3,19 @@ package com.cf.imes.module.system.service.labeltemplate; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.TypeReference; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.FieldValue; import co.elastic.clients.elasticsearch._types.query_dsl.TermsQuery; import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; import co.elastic.clients.elasticsearch.core.SearchResponse; import co.elastic.clients.elasticsearch.core.search.Hit; +import com.alibaba.fastjson.JSON; import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.cf.imes.module.system.convert.labletemplate.LabelTemplateConvert; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; @@ -55,6 +59,8 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { private ESDocumentService esDocumentService; @Resource private ElasticsearchClient elasticsearchClient; + @Resource + private LabelTemplateConvert labelTemplateConvert; private static final String LABEL_TEMPLATE_ELEMENT_PROPERTY_INX = "label_template_element_property"; @@ -71,19 +77,19 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { List labelElementPropertyDOS = new ArrayList<>(); createReqVOElements.forEach(e -> { e.setLabelTemplateId(labelTemplate.getId()); - LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); + LabelElementTemplateDO elementTemplateDO = labelTemplateConvert.convert(e); labelElementTemplateMapper.insert(elementTemplateDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); + /*LabelElementPropertyDO propertyDO = e.getPropertyDO(); propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO); + labelElementPropertyDOS.add(propertyDO);*/ }); //插入索引 - try { + /* try { esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ } // 返回 return labelTemplate.getId(); @@ -97,12 +103,13 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { // 更新 LabelTemplateDO updateObj = BeanUtils.toBean(updateReqVO, LabelTemplateDO.class); labelTemplateMapper.updateById(updateObj); + labelElementTemplateMapper.delete(new LambdaQueryWrapperX().eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId())); - List labelElementTemplateDOS = labelElementTemplateMapper.selectList(new LambdaQueryWrapperX() + /* List labelElementTemplateDOS = labelElementTemplateMapper.selectList(new LambdaQueryWrapperX() .select(LabelElementTemplateDO::getId) - .eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId())); + .eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId()));*/ //删除旧的元素 - DeleteByQueryRequest.Builder builder = null; + /*DeleteByQueryRequest.Builder builder = null; if(CollectionUtil.isNotEmpty(labelElementTemplateDOS)) { List templateIds = labelElementTemplateDOS.stream() .map(LabelElementTemplateDO::getId) @@ -112,7 +119,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { builder = new DeleteByQueryRequest.Builder() .index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - } + }*/ //新增新的元素 @@ -120,14 +127,15 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { List labelElementPropertyDOS = new ArrayList<>(); createReqVOElements.forEach(e -> { e.setLabelTemplateId(updateObj.getId()); - LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); + LabelElementTemplateDO elementTemplateDO = labelTemplateConvert.convert(e); + //LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); labelElementTemplateMapper.insert(elementTemplateDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); + /*LabelElementPropertyDO propertyDO = e.getPropertyDO(); propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO); + labelElementPropertyDOS.add(propertyDO);*/ }); //插入索引 - try { + /*try { if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); } @@ -137,7 +145,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ /*updateLabelElementTemplateList(updateReqVO.getId(), Convert.convert(new TypeReference>() { @@ -163,7 +171,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { throw exception(LABEL_TEMPLATE_NOT_EXISTS); } List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(id); - List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + /*List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); // 删除索引 DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() .index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) @@ -173,7 +181,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ // 删除标签模板表 labelTemplateMapper.deleteById(id); // 删除标签元素模板表 @@ -192,8 +200,10 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectById(id); List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateDO.getId()); LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); - List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); + //List labelElementTemplateRespVOS = Convert.convert(new TypeReference>() {}, labelElementTemplateDOS); + //List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); + /*List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); SearchResponse searchSetting = null; try { SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) @@ -212,7 +222,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS); return labelTemplateRespVO; @@ -229,7 +239,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { public List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId) { List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateId); List respVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + /* List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); try { SearchResponse response = elasticsearchClient.search(b -> b.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) .from(0) @@ -246,7 +256,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ return respVOS; } @@ -256,8 +266,10 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { List labelTemplateRespVOS = BeanUtils.toBean(labelTemplateDOS, LabelTemplateRespVO.class); Set ids = labelTemplateRespVOS.stream().map(e -> e.getId()).collect(Collectors.toSet()); List labelElementTemplateDOS = labelElementTemplateMapper.selectList(new LambdaQueryWrapperX().in(LabelElementTemplateDO::getLabelTemplateId, ids)); - List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - List fieldValues = labelElementTemplateRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); + //List labelElementTemplateRespVOS = Convert.convert(new TypeReference>() {}, labelTemplateDOS); + //List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); + /*List fieldValues = labelElementTemplateRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); try { SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) .query(TermsQuery.of(e -> e.field("elementId") @@ -276,7 +288,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ for (LabelTemplateRespVO labelTemplateRespVO : labelTemplateRespVOS) { labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS.stream().filter(e -> Objects.equals(e.getLabelTemplateId(), labelTemplateRespVO.getId())).toList()); } @@ -298,4 +310,5 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { labelElementTemplateMapper.deleteByLabelTemplateId(labelTemplateId); } + } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index b7cc29423..07b5e380c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -16,6 +16,7 @@ import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.controller.admin.label.vo.*; import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; +import com.cf.imes.module.system.convert.label.LabelConvert; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; @@ -55,6 +56,8 @@ public class LabelServiceImpl implements LabelService { private ESDocumentService esDocumentService; @Resource private ElasticsearchClient elasticsearchClient; + @Resource + private LabelConvert labelConvert; private static final String LABEL_ELEMENT_PROPERTY_INX = "label_element_property"; @@ -71,19 +74,20 @@ public class LabelServiceImpl implements LabelService { List labelElementPropertyDOS = new ArrayList<>(); createReqVOElements.forEach(e -> { e.setLabelId(Label.getId()); - LabelElementDO elementDO = Convert.convert(LabelElementDO.class, e); + //LabelElementDO elementDO = Convert.convert(LabelElementDO.class, e); + LabelElementDO elementDO = labelConvert.convert(e); labelElementMapper.insert(elementDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); + /* LabelElementPropertyDO propertyDO = e.getPropertyDO(); propertyDO.setElementId(elementDO.getId()); - labelElementPropertyDOS.add(propertyDO); + labelElementPropertyDOS.add(propertyDO);*/ }); //插入索引 - try { + /* try { esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ } // 返回 return Label.getId(); @@ -98,21 +102,23 @@ public class LabelServiceImpl implements LabelService { LabelDO updateObj = BeanUtils.toBean(updateReqVO, LabelDO.class); LabelMapper.updateById(updateObj); - List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX() + labelElementMapper.delete(new LambdaQueryWrapperX().eq(LabelElementDO::getLabelId, updateReqVO.getId())); + + /*List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX() .select(LabelElementDO::getId) - .eq(LabelElementDO::getLabelId, updateReqVO.getId())); + .eq(LabelElementDO::getLabelId, updateReqVO.getId()));*/ //删除旧的元素 - DeleteByQueryRequest.Builder builder = null; + /*DeleteByQueryRequest.Builder builder = null; if(CollectionUtil.isNotEmpty(labelElementDOS)) { List templateIds = labelElementDOS.stream() .map(LabelElementDO::getId) .toList(); labelElementMapper.deleteBatchIds(templateIds); - List fieldValues = templateIds.stream().map(FieldValue::of).collect(Collectors.toList()); + *//*List fieldValues = templateIds.stream().map(FieldValue::of).collect(Collectors.toList()); builder = new DeleteByQueryRequest.Builder() .index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - } + .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery());*//* + }*/ //新增新的元素 @@ -120,14 +126,15 @@ public class LabelServiceImpl implements LabelService { List labelElementPropertyDOS = new ArrayList<>(); createReqVOElements.forEach(e -> { e.setLabelId(updateObj.getId()); - LabelElementDO labelElementDO = Convert.convert(LabelElementDO.class, e); + LabelElementDO labelElementDO = labelConvert.convert(e); + //LabelElementDO labelElementDO = Convert.convert(LabelElementDO.class, e); labelElementMapper.insert(labelElementDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); + /* LabelElementPropertyDO propertyDO = e.getPropertyDO(); propertyDO.setElementId(labelElementDO.getId()); - labelElementPropertyDOS.add(propertyDO); + labelElementPropertyDOS.add(propertyDO);*/ }); //插入索引 - try { + /* try { if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); } @@ -137,7 +144,7 @@ public class LabelServiceImpl implements LabelService { } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ /* List elements = updateReqVO.getElements(); *//*updateLabelElementList(updateReqVO.getId(), Convert.convert(new TypeReference>() { @@ -192,8 +199,9 @@ public class LabelServiceImpl implements LabelService { LabelDO LabelDO = LabelMapper.selectById(id); List labelElementDOS = labelElementMapper.selectListByLabelId(LabelDO.getId()); LabelRespVO LabelRespVO = BeanUtils.toBean(LabelDO, LabelRespVO.class); - List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + List labelElementRespVOS = labelConvert.convert1(labelElementDOS); + //List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); + /* List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); SearchResponse searchSetting = null; try { SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_ELEMENT_PROPERTY_INX) @@ -212,7 +220,7 @@ public class LabelServiceImpl implements LabelService { } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ LabelRespVO.setLabelElements(labelElementRespVOS); return LabelRespVO; @@ -228,8 +236,9 @@ public class LabelServiceImpl implements LabelService { @Override public List getLabelElementListByLabelId(Long LabelId) { List labelElementDOS = labelElementMapper.selectListByLabelId(LabelId); - List respVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + List respVOS = labelConvert.convert1(labelElementDOS); + //List respVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); + /* List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); try { SearchResponse response = elasticsearchClient.search(b -> b.index(LABEL_ELEMENT_PROPERTY_INX) .from(0) @@ -246,7 +255,7 @@ public class LabelServiceImpl implements LabelService { } catch (IOException e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ return respVOS; } @@ -256,8 +265,9 @@ public class LabelServiceImpl implements LabelService { List LabelRespVOS = BeanUtils.toBean(LabelDOS, LabelRespVO.class); Set ids = LabelRespVOS.stream().map(e -> e.getId()).collect(Collectors.toSet()); List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX().in(LabelElementDO::getLabelId, ids)); - List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - List fieldValues = labelElementRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + List labelElementRespVOS = labelConvert.convert1(labelElementDOS); + //List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); + /*List fieldValues = labelElementRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); try { SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_ELEMENT_PROPERTY_INX) .query(TermsQuery.of(e -> e.field("elementId") @@ -276,7 +286,7 @@ public class LabelServiceImpl implements LabelService { } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ for (LabelRespVO LabelRespVO : LabelRespVOS) { LabelRespVO.setLabelElements(labelElementRespVOS.stream().filter(e -> Objects.equals(e.getLabelId(), LabelRespVO.getId())).toList()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java index bfd3080e9..5d4190d55 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java @@ -4,6 +4,8 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganPageReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSaveReqVO; +import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSimpleRespVO; +import com.cf.imes.module.system.controller.admin.user.vo.user.UserSimpleRespVO; import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO; import com.cf.imes.module.system.service.organ.handler.OrganInfoHandler; import com.cf.imes.module.system.service.organ.handler.OrganMenuHandler; @@ -127,4 +129,5 @@ public interface OrganService { */ void validOrgan(Long id); + List getSimpleOrganList(String name); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index b81752091..292889911 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -10,13 +10,16 @@ import com.cf.imes.framework.common.util.collection.CollectionUtils; import com.cf.imes.framework.common.util.date.DateUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.common.util.pinyin.PinYinUtils; +import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.config.OrganProperties; import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.framework.organ.core.util.OrganUtils; +import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSimpleRespVO; import com.cf.imes.module.system.controller.admin.permission.vo.role.RoleSaveReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganPageReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSaveReqVO; import com.cf.imes.module.system.controller.admin.user.vo.user.UserSaveReqVO; +import com.cf.imes.module.system.controller.admin.user.vo.user.UserSimpleRespVO; import com.cf.imes.module.system.convert.organ.OrganConvert; import com.cf.imes.module.system.dal.dataobject.permission.MenuDO; import com.cf.imes.module.system.dal.dataobject.permission.RoleDO; @@ -96,6 +99,14 @@ public class OrganServiceImpl implements OrganService { } } + @Override + public List getSimpleOrganList(String name) { + List organizationDOS = organMapper.selectList(new LambdaQueryWrapperX() + .likeIfPresent(OrganizationDO::getName, name) + .select(OrganizationDO::getId, OrganizationDO::getName)); + return BeanUtils.toBean(organizationDOS, OrganSimpleRespVO.class); + } + @Override @DSTransactional // 多数据源，使用 @DSTransactional 保证本地事务，以及数据源的切换 public Long createOrgan(OrganSaveReqVO createReqVO) { diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml new file mode 100644 index 000000000..cb81e1ca9 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 e0c8d77aa..40ef4e568 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 @@ -95,7 +95,7 @@ - select * from ( select a.id as organId, a.name as organName, max(b.create_time) as updateTime, case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName From 9ccf3f98b7bd7ff46acd78a419a3f1003f392926 Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 2 Apr 2024 16:40:06 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E6=9C=BA=E5=8F=B0=E3=80=81=E6=9C=BA?= =?UTF-8?q?=E5=8F=B0=E6=A8=A1=E6=9D=BF=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/machine/MachineController.java | 52 +++---------------- .../machine/MachineTemplateController.java | 34 ------------ .../admin/machine/vo/CuttingRespVO.java | 9 +++- .../admin/machine/vo/CuttingSaveReqVO.java | 9 +++- .../machine/vo/CuttingTemplateRespVO.java | 6 ++- .../machine/vo/CuttingTemplateSaveReqVO.java | 7 ++- .../LabelTemplateConvertImpl.java | 5 +- .../convert/machine/MachineConvert.java | 36 +++++++++++++ .../machine/MachineTemplateConvert.java | 43 +++++++++++++++ .../dal/dataobject/machine/MachineDO.java | 6 ++- .../machinetemplate/MachineTemplateDO.java | 4 ++ .../LabelTemplateServiceImpl.java | 3 +- .../service/machine/MachineServiceImpl.java | 35 ++++++++----- .../machine/MachineTemplateService.java | 2 +- .../machine/MachineTemplateServiceImpl.java | 42 ++++++++------- 15 files changed, 170 insertions(+), 123 deletions(-) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineTemplateConvert.java diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java index e4abf82e5..1f2f0bd34 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java @@ -86,18 +86,19 @@ public class MachineController { } @GetMapping("getDefaultCutting") - @Operation(summary = "获得默认开料机台模板") + @Operation(summary = "获得默认机台模板") + @Parameter(name = "type", description = "机台类型", required = true, example = "1") @PreAuthorize("@ss.hasPermission('machine::query')") - public CommonResult getDefaultCutting() { - return success(machineTemplateService.getDefaultCutting()); + public CommonResult getDefaultCutting(@RequestParam Integer machineType) { + return success(machineTemplateService.getDefaultCutting(machineType)); } - @GetMapping("getDefaultDrill") + /* @GetMapping("getDefaultDrill") @Operation(summary = "获得默认钻孔机台模板") @PreAuthorize("@ss.hasPermission('machine::query')") public CommonResult getDefaultDrill() { return success(machineTemplateService.getDefaultDrill()); - } + }*/ /*@GetMapping("/export-excel") @Operation(summary = "导出机台 Excel") @@ -112,47 +113,6 @@ public class MachineController { BeanUtils.toBean(list, MachineRespVO.class)); }*/ - @PutMapping("/create-drill") - @Operation(summary = "创建钻孔机台") - @PreAuthorize("@ss.hasPermission('machine::create')") - public CommonResult createDrill(@Valid @RequestBody DrillSaveReqVO createReqVO) { - return success(machineService.createDrill(createReqVO)); - } - - @PostMapping("/update-drill") - @Operation(summary = "更新钻孔机台") - @PreAuthorize("@ss.hasPermission('machine::update')") - public CommonResult updateDrill( @RequestBody @Validated(UpdateGroup.class) DrillSaveReqVO updateReqVO) { - machineService.updateDrill(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete-drill") - @Operation(summary = "删除钻孔机台") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('machine::delete')") - public CommonResult deleteDrill(@RequestParam("id") Long id) { - machineService.deleteDrill(id); - return success(true); - } - - @DeleteMapping("/batch-delete-drill") - @Operation(summary = "批量删除钻孔机台") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('machine::delete')") - public CommonResult batchDeleteDrill(@RequestParam("ids") List ids) { - machineService.batchDeleteDrill(ids); - return success(true); - } - - @GetMapping("/get-drill") - @Operation(summary = "获得钻孔机台") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('machine::query')") - public CommonResult getDrill(@RequestParam("id") Long id) { - DrillRespVO respVO = machineService.getDrill(id); - return success(respVO); - } @GetMapping("getMachineTree") @Operation(summary = "获得机台树") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index 0960bb937..19c233f37 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -48,40 +48,6 @@ public class MachineTemplateController { return success(machineTemplateService.page(pageParam)); } - @PutMapping("drill-machine") - @Operation(summary = "新增钻孔机台模板配置") - @PreAuthorize("@ss.hasPermission('machine-template::create')") - public CommonResult createDrillTemplate(@RequestBody DrillTemplateSaveReqVO reqVO) { - return success(machineTemplateService.createDrillTemplate(reqVO)); - } - - @PostMapping("drill-machine") - @Operation(summary = "修改钻孔机台模板配置") - @PreAuthorize("@ss.hasPermission('machine-template::update')") - public CommonResult updateDrillTemplate(@RequestBody DrillTemplateSaveReqVO reqVO) { - return success(machineTemplateService.updateDrillTemplate(reqVO)); - } - - @GetMapping("drill-machine") - @Operation(summary = "获取钻孔机台模板配置") - @PreAuthorize("@ss.hasPermission('machine-template::query')") - public CommonResult getDrillTemplateById(@RequestParam("id") Long id) { - return success(machineTemplateService.getDirllTemplateById(id)); - } - - @DeleteMapping("drill-machine") - @Operation(summary = "删除钻孔机台模板配置") - @PreAuthorize("@ss.hasPermission('machine-template::delete')") - public CommonResult deleteDrillTemplate(@RequestParam("id") Long id) { - return success(machineTemplateService.deleteDrillTemplate(id)); - } - - @DeleteMapping("batch-delete-drill") - @Operation(summary = "批量删除钻孔机台模板配置") - @PreAuthorize("@ss.hasPermission('machine-template::delete')") - public CommonResult batchDeleteDrillTemplate(@RequestParam("ids") List ids) { - return success(machineTemplateService.batchDeleteDrillTemplate(ids)); - } @PutMapping("cutting-machine") @Operation(summary = "新增开料机台模板配置") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java index 35742e551..afee00671 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingRespVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.machine.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -10,6 +11,9 @@ import com.alibaba.excel.annotation.*; @Schema(description = "管理后台 - 机台 Response VO") @Data @ExcelIgnoreUnannotated +@Builder +@NoArgsConstructor +@AllArgsConstructor public class CuttingRespVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14092") @@ -31,8 +35,11 @@ public class CuttingRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + /* @Schema(description = "机台配置") + private CuttingSettingDO machineSettingDO;*/ + @Schema(description = "机台配置") - private CuttingSettingDO machineSettingDO; + private JSONObject machineSettingDO; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java index e66651ca6..050b58128 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingSaveReqVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.machine.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.framework.es.core.valid.UpdateGroup; import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; import io.swagger.v3.oas.annotations.media.Schema; @@ -32,9 +33,13 @@ public class CuttingSaveReqVO { @NotNull(message = "标签id不能空") private Long labelId; - @Schema(description = "机台配置") + /* @Schema(description = "机台配置") @Valid - private CuttingSettingDO machineSettingDO; + private CuttingSettingDO machineSettingDO;*/ + + @Schema(description = "机台配置") + private JSONObject machineSettingDO; + /* @Schema(description = "样式配置") @Valid diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateRespVO.java index 5ffb142a4..ebca14e90 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateRespVO.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.controller.admin.machine.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.machinetemplate.CuttingTemplateMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.DrillTemplateMachineDO; import io.swagger.v3.oas.annotations.media.Schema; @@ -35,6 +36,9 @@ public class CuttingTemplateRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + /*@Schema(description = "开料机台模板配置") + private CuttingTemplateMachineDO cuttingTemplateMachineDO;*/ + @Schema(description = "开料机台模板配置") - private CuttingTemplateMachineDO cuttingTemplateMachineDO; + private JSONObject cuttingTemplateMachineDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java index ea6d9be87..33c3c6701 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/CuttingTemplateSaveReqVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.machine.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.framework.es.core.valid.UpdateGroup; import com.cf.imes.module.system.dal.dataobject.machinetemplate.CuttingTemplateMachineDO; import io.swagger.v3.oas.annotations.media.Schema; @@ -29,7 +30,11 @@ public class CuttingTemplateSaveReqVO { @NotNull(message = "标签id不能空") private Long labelId;*/ + /* @Schema(description = "管理理后台 - 开料机台模板新增/修改 Request VO") + @NotNull(message = "开料机台配置不能空") + private CuttingTemplateMachineDO setting;*/ + @Schema(description = "管理理后台 - 开料机台模板新增/修改 Request VO") @NotNull(message = "开料机台配置不能空") - private CuttingTemplateMachineDO setting; + private JSONObject setting; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java index 423ff1c8a..d108f5479 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java @@ -29,9 +29,9 @@ public class LabelTemplateConvertImpl implements LabelTemplateConvert { @Override public List convert1 (List labelElementTemplateDOS) { return labelElementTemplateDOS.stream().map(e -> { - Gson gson = new Gson(); + /*Gson gson = new Gson(); Type type = new TypeToken>() { - }.getType(); + }.getType();*/ return LabelElementTemplateRespVO.builder() .labelTemplateId(e.getLabelTemplateId()) .id(e.getId()) @@ -39,7 +39,6 @@ public class LabelTemplateConvertImpl implements LabelTemplateConvert { .name(e.getName()) .propertyDO(JSON.parseObject(e.getConfig())) // .propertyDO(StrUtil.isBlank(e.getPropertyDO()) ? new HashMap(): gson.fromJson(e.getPropertyDO(), type)) - //{extra=, x=100, y=100, width=100, height=100, value=, html=, isRepeat=false, borderWidth=1, fontSize=1, divHeight=1, colNum=1, enableSourceExpress=false, sourceExpress=, visible=true, isScrapBlock=false, visibleExpression=, isVertical=false, dataText=, dataExpression=, displayType=1, barcodeType=, fontWeight=1, fontFamily=, textAlign=, textBaseline=, qrcodeErrorRate=, showSideHole=false} .sourceId(e.getSourceId()) .build(); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java new file mode 100644 index 000000000..2045eee11 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineConvert.java @@ -0,0 +1,36 @@ +package com.cf.imes.module.system.convert.machine; + +import com.alibaba.fastjson.JSON; +import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO; +import com.cf.imes.module.system.controller.admin.machine.vo.CuttingSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; + +/** + * @author Beal + */ +public class MachineConvert { + + public static MachineDO convert(CuttingSaveReqVO createReqVO) { + return MachineDO.builder() + .machineType(createReqVO.getMachineType()) + .name(createReqVO.getName()) + .id(createReqVO.getId()) + .labelId(createReqVO.getLabelId()) + .setting(createReqVO.getMachineSettingDO().toJSONString()) + .build(); + + } + + public static CuttingRespVO convert(MachineDO machineDO) { + return CuttingRespVO.builder() + .id(machineDO.getId()) + .machineSettingDO(JSON.parseObject(machineDO.getSetting())) + .createTime(machineDO.getCreateTime()) + .labelId(machineDO.getLabelId()) + .name(machineDO.getName()) + .machineType(machineDO.getMachineType()) + .labelId(machineDO.getLabelId()) + .build(); + + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineTemplateConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineTemplateConvert.java new file mode 100644 index 000000000..3b79adb59 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/machine/MachineTemplateConvert.java @@ -0,0 +1,43 @@ +package com.cf.imes.module.system.convert.machine; + +import com.alibaba.fastjson.JSON; +import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO; +import com.cf.imes.module.system.controller.admin.machine.vo.CuttingTemplateRespVO; +import com.cf.imes.module.system.controller.admin.machine.vo.CuttingTemplateSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; + +/** + * @author Beal + */ +public class MachineTemplateConvert { + + public static CuttingRespVO convert(MachineTemplateDO templateDO) { + return CuttingRespVO.builder() + .labelId(templateDO.getId()) + .machineType(templateDO.getMachineType()) + .id(templateDO.getId()) + .name(templateDO.getName()) + .createTime(templateDO.getCreateTime()) + .machineSettingDO(JSON.parseObject(templateDO.getSetting())) + .build(); + } + + public static MachineTemplateDO convert(CuttingTemplateSaveReqVO reqVO) { + return MachineTemplateDO.builder() + .machineType(reqVO.getMachineType()) + .id(reqVO.getId()) + .name(reqVO.getName()) + .setting(reqVO.getSetting().toJSONString()) + .build(); + } + + public static CuttingTemplateRespVO convert1(MachineTemplateDO templateDO) { + return CuttingTemplateRespVO.builder() + .machineType(templateDO.getMachineType()) + .id(templateDO.getId()) + .name(templateDO.getName()) + .createTime(templateDO.getCreateTime()) + .cuttingTemplateMachineDO(JSON.parseObject(templateDO.getSetting())) + .build(); + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/MachineDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/MachineDO.java index 9fae2468d..21bbdde38 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/MachineDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machine/MachineDO.java @@ -35,10 +35,14 @@ public class MachineDO extends OrganBaseDO { /** * 1机台设备 2CNC设备 */ - private Long machineType; + private Integer machineType; /** * 标签id */ private Long labelId; + /** + * 配置 + */ + private String setting; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateDO.java index b78d3e711..05a0a8454 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/machinetemplate/MachineTemplateDO.java @@ -32,6 +32,10 @@ public class MachineTemplateDO extends BaseDO { * 是否默认模板 */ private Boolean isDefault; + /** + * 机台模板配置 + */ + private String setting; /** * 标签id diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index 7f9d729ae..47a7504d9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java @@ -238,7 +238,8 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { @Override public List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId) { List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateId); - List respVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); + List respVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); + //List respVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); /* List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); try { SearchResponse response = elasticsearchClient.search(b -> b.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java index fedb1a053..7d33637ba 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java @@ -12,7 +12,9 @@ import co.elastic.clients.elasticsearch.core.SearchResponse; import co.elastic.clients.elasticsearch.core.search.Hit; import com.cf.imes.framework.es.core.dal.ESDocument; import com.cf.imes.framework.es.core.service.ESDocumentService; +import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.controller.admin.machine.vo.*; +import com.cf.imes.module.system.convert.machine.MachineConvert; import com.cf.imes.module.system.dal.dataobject.machine.DrillSettingDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; @@ -59,16 +61,17 @@ public class MachineServiceImpl implements MachineService { @Transactional(rollbackFor = Exception.class) public Long createCutting(CuttingSaveReqVO createReqVO) { // 插入 - MachineDO machineDO = Convert.convert(MachineDO.class, createReqVO); + MachineDO machineDO = MachineConvert.convert(createReqVO); + //MachineDO machineDO = Convert.convert(MachineDO.class, createReqVO); machineMapper.insert(machineDO); - CuttingSettingDO machineSettingDO = createReqVO.getMachineSettingDO(); + /* CuttingSettingDO machineSettingDO = createReqVO.getMachineSettingDO(); machineSettingDO.setMachineId(machineDO.getId()); try { esDocumentService.createByFluentDSL(CUTTING_MACHINE_SETTING, machineSettingDO.getId(), machineSettingDO); } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ // 返回 return machineDO.getId(); } @@ -77,15 +80,16 @@ public class MachineServiceImpl implements MachineService { public void updateCutting(CuttingSaveReqVO updateReqVO){ // 校验存在 validateExists(updateReqVO.getId()); - updateReqVO.getMachineSettingDO().setMachineId(updateReqVO.getId()); + /* updateReqVO.getMachineSettingDO().setMachineId(updateReqVO.getId()); try { esDocumentService.createByFluentDSL(CUTTING_MACHINE_SETTING, updateReqVO.getMachineSettingDO().getId(), updateReqVO.getMachineSettingDO()); } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ // 更新 - MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class); + MachineDO updateObj = MachineConvert.convert(updateReqVO); + //MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class); machineMapper.updateById(updateObj); } @@ -96,7 +100,7 @@ public class MachineServiceImpl implements MachineService { if (machineMapper.selectById(id) == null) { throw exception(MACHINE_NOT_EXISTS); } - // 删除 + /* // 删除 DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() .index(CUTTING_MACHINE_SETTING) .query(b->b.term(t->t.field("machineId").value(machineDO.getId()))); @@ -105,7 +109,7 @@ public class MachineServiceImpl implements MachineService { } catch (IOException e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ machineMapper.deleteById(id); } @@ -115,7 +119,7 @@ public class MachineServiceImpl implements MachineService { if(CollectionUtil.isEmpty(machineDOS)){ throw exception(MACHINE_NOT_EXISTS); } - List fieldValues = machineDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + /* List fieldValues = machineDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() .index(CUTTING_MACHINE_SETTING) .query(TermsQuery.of(e-> e.field("machineId").terms(b->b.value(fieldValues)))._toQuery()); @@ -124,7 +128,7 @@ public class MachineServiceImpl implements MachineService { } catch (IOException e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ machineMapper.deleteBatchIds(ids); } @@ -134,9 +138,10 @@ public class MachineServiceImpl implements MachineService { if(Objects.isNull(machineDO)) { throw exception(MACHINE_NOT_EXISTS); } - CuttingRespVO respVO = Convert.convert(CuttingRespVO.class, machineDO); - Object o1 = buildResp(machineDO.getId(), CUTTING_MACHINE_SETTING, CuttingSettingDO.class); - respVO.setMachineSettingDO((CuttingSettingDO) o1); + CuttingRespVO respVO = MachineConvert.convert(machineDO); + //CuttingRespVO respVO = Convert.convert(CuttingRespVO.class, machineDO); + /*Object o1 = buildResp(machineDO.getId(), CUTTING_MACHINE_SETTING, CuttingSettingDO.class); + respVO.setMachineSettingDO((CuttingSettingDO) o1);*/ return respVO; } @@ -231,7 +236,9 @@ public class MachineServiceImpl implements MachineService { @Override public Map> getMachineTree() { - List machineDOS = machineMapper.selectList(); + List machineDOS = machineMapper.selectList(new LambdaQueryWrapperX() + .select(MachineDO::getName, MachineDO::getMachineType, MachineDO::getId, MachineDO::getLabelId, MachineDO::getCreateTime) + ); List machineVOS = BeanUtils.toBean(machineDOS, MachineVO.class); Map> map = machineVOS.stream().collect(Collectors.groupingBy(MachineVO::getMachineType)); return map; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java index 3deafa95d..7a7f71c22 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateService.java @@ -39,7 +39,7 @@ public interface MachineTemplateService { Boolean batchDeleteCuttingTemplate(List ids); - CuttingTemplateRespVO getDefaultCutting(); + CuttingRespVO getDefaultCutting(Integer machineType); DrillTemplateRespVO getDefaultDrill(); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index aea72587b..4fc648829 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -21,7 +21,10 @@ import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.system.controller.admin.machine.vo.*; +import com.cf.imes.module.system.convert.machine.MachineConvert; +import com.cf.imes.module.system.convert.machine.MachineTemplateConvert; import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; +import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.dal.dataobject.machine.UserMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.CuttingTemplateMachineDO; import com.cf.imes.module.system.dal.dataobject.machinetemplate.DrillTemplateMachineDO; @@ -162,31 +165,33 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Override @Transactional(rollbackFor = Exception.class) public Long createCuttingTemplate(CuttingTemplateSaveReqVO reqVO) { - MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO); + MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO); + //MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO); machineTemplateMapper.insert(templateDO); - CuttingTemplateMachineDO setting = reqVO.getSetting(); + /*CuttingTemplateMachineDO setting = reqVO.getSetting(); setting.setTemplateId(templateDO.getId()); try { esDocumentService.createByFluentDSL(CUTTING_MACHINE_INX, setting.getId(), setting); } catch (Exception e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ return templateDO.getId(); } @Override public Boolean updateCuttingTemplate(CuttingTemplateSaveReqVO reqVO) { - MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO); + MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO); + //MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO); machineTemplateMapper.updateById(templateDO); - CuttingTemplateMachineDO setting = reqVO.getSetting(); + /*CuttingTemplateMachineDO setting = reqVO.getSetting(); Map map = BeanUtil.beanToMap(setting); try { esDocumentService.updateById(CUTTING_MACHINE_INX, setting.getId(), CuttingTemplateMachineDO.class, map); } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ return Boolean.TRUE; } @@ -196,9 +201,10 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { if (Objects.isNull(templateDO)) { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } - CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); + CuttingTemplateRespVO respVO = MachineTemplateConvert.convert1(templateDO); + /*CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); - respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o); + respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o);*/ return respVO; } @@ -209,7 +215,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } - List fieldValues = machineTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + /* List fieldValues = machineTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() .index(CUTTING_MACHINE_INX) .query(TermsQuery.of(e -> e.field("templateId").terms(b -> b.value(fieldValues)))._toQuery()); @@ -218,26 +224,26 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ machineTemplateMapper.deleteBatchIds(ids); return Boolean.TRUE; } @Override - public CuttingTemplateRespVO getDefaultCutting() { + public CuttingRespVO getDefaultCutting(Integer machineType) { List machineTemplateDOS = machineTemplateMapper.selectList(new LambdaQueryWrapperX() .eq(MachineTemplateDO::getIsDefault, Boolean.TRUE) - .eq(MachineTemplateDO::getMachineType, 1) + .eq(MachineTemplateDO::getMachineType, machineType) ); if (CollectionUtil.isNotEmpty(machineTemplateDOS)) { if (machineTemplateDOS.size() > 1) { throw exception(DEFAULT_TEMPLATE_COUNT); } MachineTemplateDO templateDO = machineTemplateDOS.get(0); - CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); - Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); - respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o); - return respVO; + return MachineTemplateConvert.convert(templateDO); + //CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); + /* Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); + respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o);*/ } throw exception(DEFAULT_TEMPLATE_COUNT); } @@ -295,7 +301,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } // 删除 - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() + /* DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() .index(CUTTING_MACHINE_INX) .query(b -> b.term(t -> t.field("templateId").value(templateDO.getId()))); try { @@ -303,7 +309,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ machineTemplateMapper.deleteById(id); return Boolean.TRUE; } From f33774d73dea4979a7264d24a3d0afa04dd8fdfc Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 2 Apr 2024 17:19:31 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9C=BA=E5=8F=B0=E6=A8=A1=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A0=87=E7=AD=BE=E6=A8=A1=E6=9D=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/ErrorCodeConstants.java | 2 ++ .../LabelTemplateController.java | 8 ++++++++ .../admin/machine/MachineController.java | 2 +- .../labeltemplate/LabelTemplateDO.java | 4 ++++ .../labeltemplate/LabelTemplateService.java | 7 +++++++ .../LabelTemplateServiceImpl.java | 20 +++++++++++++++++++ .../machine/MachineTemplateServiceImpl.java | 5 ++--- 7 files changed, 44 insertions(+), 4 deletions(-) diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index f064b2bb1..7ca05a731 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -183,10 +183,12 @@ public interface ErrorCodeConstants { ErrorCode MACHINE_NOT_EXISTS = new ErrorCode(1_002_029_000, "机台不存在"); ErrorCode MACHINE_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_029_001, "机台模板不存在"); ErrorCode DEFAULT_TEMPLATE_COUNT = new ErrorCode(1_002_029_002, "默认模板数量异常"); + ErrorCode DEFAULT_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_029_003, "该类型机台默认模板不存在"); // ========== 标签模板 1-002-300-000 ========== ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在"); ErrorCode LABEL_NOT_EXISTS = new ErrorCode(1_002_300_001, "标签不存在"); + ErrorCode DEFAULT_LABEL_NOT_EXISTS = new ErrorCode(1_002_300_002, "该类型标签默认模板不存在"); // ========== 系统数据源 1_002_301_000 ========== ErrorCode DATA_SOURCE_NOT_EXISTS = new ErrorCode(1_002_301_000, "系统数据源不存在"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java index 2a27db9d0..5e3f7d514 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java @@ -85,6 +85,14 @@ public class LabelTemplateController { return success(labelTemplateService.getGroupList()); } + @GetMapping("/getDefault") + @Operation(summary = "获得默认标签模板") + @Parameter(name = "type", description = "标签类型", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('system:label-template:query')") + public CommonResult getDefaultLabelTemplate(@RequestParam("type") String type) { + return success(labelTemplateService.getDefaultLabelTemplate(type)); + } + @GetMapping("/export-excel") @Operation(summary = "导出标签模板 Excel") @PreAuthorize("@ss.hasPermission('system:label-template:export')") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java index 1f2f0bd34..5be11c265 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java @@ -87,7 +87,7 @@ public class MachineController { @GetMapping("getDefaultCutting") @Operation(summary = "获得默认机台模板") - @Parameter(name = "type", description = "机台类型", required = true, example = "1") + @Parameter(name = "machineType", description = "机台类型", required = true, example = "1") @PreAuthorize("@ss.hasPermission('machine::query')") public CommonResult getDefaultCutting(@RequestParam Integer machineType) { return success(machineTemplateService.getDefaultCutting(machineType)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java index b882c6588..bb1d14434 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java @@ -47,5 +47,9 @@ public class LabelTemplateDO extends BaseDO { * 高度 */ private Integer height; + /** + * 是否默认 + */ + private Boolean isDefault; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java index a7759ff84..0b7b697d1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java @@ -65,4 +65,11 @@ public interface LabelTemplateService { List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId); Map> getGroupList(); + + /** + * 获得默认标签模板 + * @param type + * @return + */ + LabelTemplateRespVO getDefaultLabelTemplate(String type); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index 47a7504d9..a0e46f2e0 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java @@ -296,6 +296,26 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { return labelTemplateRespVOS.stream().collect(Collectors.groupingBy(e -> e.getType())); } + @Override + public LabelTemplateRespVO getDefaultLabelTemplate(String type) { + List labelTemplateDOS = labelTemplateMapper.selectList(new LambdaQueryWrapperX() + .eq(LabelTemplateDO::getIsDefault, Boolean.TRUE) + .eq(LabelTemplateDO::getType, type) + ); + if(CollectionUtil.isNotEmpty(labelTemplateDOS)) { + if (labelTemplateDOS.size() > 1) { + throw exception(DEFAULT_TEMPLATE_COUNT); + } + LabelTemplateDO labelTemplateDO = labelTemplateDOS.get(0); + List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateDO.getId()); + LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); + List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); + labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS); + return labelTemplateRespVO; + } + throw exception(DEFAULT_LABEL_NOT_EXISTS); + } + private void createLabelElementTemplateList(Long labelTemplateId, List list) { list.forEach(o -> o.setLabelTemplateId(labelTemplateId)); labelElementTemplateMapper.insertBatch(list); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index 4fc648829..f8a40d5c2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -47,8 +47,7 @@ import java.util.stream.Collectors; import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.DEFAULT_TEMPLATE_COUNT; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.MACHINE_TEMPLATE_NOT_EXISTS; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** * @author there @@ -245,7 +244,7 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { /* Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o);*/ } - throw exception(DEFAULT_TEMPLATE_COUNT); + throw exception(DEFAULT_TEMPLATE_NOT_EXISTS); } @Override From be2ffc737736830539d7a5e4ae72eff1e1310232 Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 2 Apr 2024 17:29:51 +0800 Subject: [PATCH 20/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/machine/MachineController.java | 10 ++--- .../machine/MachineTemplateController.java | 10 ++--- .../service/machine/MachineServiceImpl.java | 39 ---------------- .../machine/MachineTemplateServiceImpl.java | 45 ------------------- 4 files changed, 10 insertions(+), 94 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java index 5be11c265..5d69c70ab 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java @@ -36,14 +36,14 @@ public class MachineController { private MachineTemplateService machineTemplateService; @PutMapping("/create-cutting") - @Operation(summary = "创建开料机台") + @Operation(summary = "创建机台") @PreAuthorize("@ss.hasPermission('machine::create')") public CommonResult createCutting(@Valid @RequestBody CuttingSaveReqVO createReqVO) { return success(machineService.createCutting(createReqVO)); } @PostMapping("/update-cutting") - @Operation(summary = "更新开料机台") + @Operation(summary = "更新机台") @PreAuthorize("@ss.hasPermission('machine::update')") public CommonResult update( @RequestBody @Validated(UpdateGroup.class) CuttingSaveReqVO updateReqVO) { machineService.updateCutting(updateReqVO); @@ -51,7 +51,7 @@ public class MachineController { } @DeleteMapping("/delete-cutting") - @Operation(summary = "删除开料机台") + @Operation(summary = "删除机台") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('machine::delete')") public CommonResult delete(@RequestParam("id") Long id) { @@ -60,7 +60,7 @@ public class MachineController { } @DeleteMapping("/batch-delete-cutting") - @Operation(summary = "批量删除开料机台") + @Operation(summary = "批量删除机台") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('machine::delete')") public CommonResult batchDeleteCutting(@RequestParam("ids") List ids) { @@ -69,7 +69,7 @@ public class MachineController { } @GetMapping("/get-cutting") - @Operation(summary = "获得开料机台") + @Operation(summary = "获得机台") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('machine::query')") public CommonResult get(@RequestParam("id") Long id) { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index 19c233f37..efb49df03 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -50,35 +50,35 @@ public class MachineTemplateController { @PutMapping("cutting-machine") - @Operation(summary = "新增开料机台模板配置") + @Operation(summary = "新增机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::create')") public CommonResult createCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) { return success(machineTemplateService.createCuttingTemplate(reqVO)); } @PostMapping("cutting-machine") - @Operation(summary = "修改开料机台模板配置") + @Operation(summary = "修改机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::update')") public CommonResult updateCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) { return success(machineTemplateService.updateCuttingTemplate(reqVO)); } @GetMapping("cutting-machine") - @Operation(summary = "获取开料机台模板配置") + @Operation(summary = "获取机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::query')") public CommonResult getCuttingTemplateById(@RequestParam("id") String id) { return success(machineTemplateService.getCuttingTemplateById(id)); } @DeleteMapping("cutting-machine") - @Operation(summary = "删除开料机台模板配置") + @Operation(summary = "删除机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::delete')") public CommonResult deleteCutting(@RequestParam("id") Long id) { return success(machineTemplateService.deleteCuttingTemplate(id)); } @DeleteMapping("batch-delete-cutting") - @Operation(summary = "批量删除开料机台模板配置") + @Operation(summary = "批量删除机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::delete')") public CommonResult batchDeleteCutting(@RequestParam("id") List ids) { return success(machineTemplateService.batchDeleteCuttingTemplate(ids)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java index 7d33637ba..3d24fe765 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java @@ -62,16 +62,7 @@ public class MachineServiceImpl implements MachineService { public Long createCutting(CuttingSaveReqVO createReqVO) { // 插入 MachineDO machineDO = MachineConvert.convert(createReqVO); - //MachineDO machineDO = Convert.convert(MachineDO.class, createReqVO); machineMapper.insert(machineDO); - /* CuttingSettingDO machineSettingDO = createReqVO.getMachineSettingDO(); - machineSettingDO.setMachineId(machineDO.getId()); - try { - esDocumentService.createByFluentDSL(CUTTING_MACHINE_SETTING, machineSettingDO.getId(), machineSettingDO); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ // 返回 return machineDO.getId(); } @@ -80,13 +71,6 @@ public class MachineServiceImpl implements MachineService { public void updateCutting(CuttingSaveReqVO updateReqVO){ // 校验存在 validateExists(updateReqVO.getId()); - /* updateReqVO.getMachineSettingDO().setMachineId(updateReqVO.getId()); - try { - esDocumentService.createByFluentDSL(CUTTING_MACHINE_SETTING, updateReqVO.getMachineSettingDO().getId(), updateReqVO.getMachineSettingDO()); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ // 更新 MachineDO updateObj = MachineConvert.convert(updateReqVO); //MachineDO updateObj = BeanUtils.toBean(updateReqVO, MachineDO.class); @@ -100,16 +84,6 @@ public class MachineServiceImpl implements MachineService { if (machineMapper.selectById(id) == null) { throw exception(MACHINE_NOT_EXISTS); } - /* // 删除 - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(CUTTING_MACHINE_SETTING) - .query(b->b.term(t->t.field("machineId").value(machineDO.getId()))); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ machineMapper.deleteById(id); } @@ -119,16 +93,6 @@ public class MachineServiceImpl implements MachineService { if(CollectionUtil.isEmpty(machineDOS)){ throw exception(MACHINE_NOT_EXISTS); } - /* List fieldValues = machineDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(CUTTING_MACHINE_SETTING) - .query(TermsQuery.of(e-> e.field("machineId").terms(b->b.value(fieldValues)))._toQuery()); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ machineMapper.deleteBatchIds(ids); } @@ -139,9 +103,6 @@ public class MachineServiceImpl implements MachineService { throw exception(MACHINE_NOT_EXISTS); } CuttingRespVO respVO = MachineConvert.convert(machineDO); - //CuttingRespVO respVO = Convert.convert(CuttingRespVO.class, machineDO); - /*Object o1 = buildResp(machineDO.getId(), CUTTING_MACHINE_SETTING, CuttingSettingDO.class); - respVO.setMachineSettingDO((CuttingSettingDO) o1);*/ return respVO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java index f8a40d5c2..8528e42f6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java @@ -165,32 +165,14 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Transactional(rollbackFor = Exception.class) public Long createCuttingTemplate(CuttingTemplateSaveReqVO reqVO) { MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO); - //MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO); machineTemplateMapper.insert(templateDO); - /*CuttingTemplateMachineDO setting = reqVO.getSetting(); - setting.setTemplateId(templateDO.getId()); - try { - esDocumentService.createByFluentDSL(CUTTING_MACHINE_INX, setting.getId(), setting); - } catch (Exception e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ return templateDO.getId(); } @Override public Boolean updateCuttingTemplate(CuttingTemplateSaveReqVO reqVO) { MachineTemplateDO templateDO = MachineTemplateConvert.convert(reqVO); - //MachineTemplateDO templateDO = Convert.convert(MachineTemplateDO.class, reqVO); machineTemplateMapper.updateById(templateDO); - /*CuttingTemplateMachineDO setting = reqVO.getSetting(); - Map map = BeanUtil.beanToMap(setting); - try { - esDocumentService.updateById(CUTTING_MACHINE_INX, setting.getId(), CuttingTemplateMachineDO.class, map); - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ return Boolean.TRUE; } @@ -201,9 +183,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } CuttingTemplateRespVO respVO = MachineTemplateConvert.convert1(templateDO); - /*CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); - Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); - respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o);*/ return respVO; } @@ -213,17 +192,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { if (CollectionUtil.isEmpty(machineTemplateDOS)) { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } - - /* List fieldValues = machineTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(CUTTING_MACHINE_INX) - .query(TermsQuery.of(e -> e.field("templateId").terms(b -> b.value(fieldValues)))._toQuery()); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ machineTemplateMapper.deleteBatchIds(ids); return Boolean.TRUE; } @@ -240,9 +208,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { } MachineTemplateDO templateDO = machineTemplateDOS.get(0); return MachineTemplateConvert.convert(templateDO); - //CuttingTemplateRespVO respVO = Convert.convert(CuttingTemplateRespVO.class, templateDO); - /* Object o = buildResp(templateDO.getId(), CUTTING_MACHINE_INX, CuttingTemplateMachineDO.class); - respVO.setCuttingTemplateMachineDO((CuttingTemplateMachineDO) o);*/ } throw exception(DEFAULT_TEMPLATE_NOT_EXISTS); } @@ -299,16 +264,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { if (Objects.isNull(templateDO)) { throw exception(MACHINE_TEMPLATE_NOT_EXISTS); } - // 删除 - /* DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(CUTTING_MACHINE_INX) - .query(b -> b.term(t -> t.field("templateId").value(templateDO.getId()))); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ machineTemplateMapper.deleteById(id); return Boolean.TRUE; } From 0ff00b0801f77e34a05f71aa8f630fcb38a80df7 Mon Sep 17 00:00:00 2001 From: yangsb Date: Wed, 3 Apr 2024 10:10:56 +0800 Subject: [PATCH 21/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E5=BC=82=E5=B8=B8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infra/service/logger/ApiErrorLogServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java index 2b05e270c..519cc58a4 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java @@ -8,6 +8,7 @@ import com.cf.imes.module.infra.dal.dataobject.logger.ApiErrorLogDO; import com.cf.imes.module.infra.dal.mysql.logger.ApiErrorLogMapper; import com.cf.imes.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -35,7 +36,11 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService { public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) { ApiErrorLogDO apiErrorLog = BeanUtils.toBean(createDTO, ApiErrorLogDO.class) .setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus()); - apiErrorLogMapper.insert(apiErrorLog); + try { + apiErrorLogMapper.insert(apiErrorLog); + }catch (DataIntegrityViolationException e) { + log.error(apiErrorLog.toString()); + } } @Override From e08dc9324cb4b9125ff12bba246738eca2176156 Mon Sep 17 00:00:00 2001 From: yangsb Date: Wed, 3 Apr 2024 11:15:37 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BF=BD=E7=95=A5=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/infra/controller/admin/file/FileController.java | 1 + .../infra/service/logger/ApiErrorLogServiceImpl.java | 7 +------ .../system/controller/admin/label/LabelController.java | 2 ++ .../admin/labeltemplate/LabelTemplateController.java | 2 ++ .../system/controller/admin/machine/MachineController.java | 3 +++ .../admin/machine/MachineTemplateController.java | 3 +++ 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/FileController.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/FileController.java index 0720e8a44..d9c2f8c83 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/FileController.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/controller/admin/file/FileController.java @@ -63,6 +63,7 @@ public class FileController { @PermitAll @Operation(summary = "下载文件") @Parameter(name = "configId", description = "配置编号", required = true) + @OperateLog(enable = false) public void getFileContent(HttpServletRequest request, HttpServletResponse response, @PathVariable("configId") Long configId) throws Exception { diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java index 519cc58a4..2b05e270c 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/service/logger/ApiErrorLogServiceImpl.java @@ -8,7 +8,6 @@ import com.cf.imes.module.infra.dal.dataobject.logger.ApiErrorLogDO; import com.cf.imes.module.infra.dal.mysql.logger.ApiErrorLogMapper; import com.cf.imes.module.infra.enums.logger.ApiErrorLogProcessStatusEnum; import lombok.extern.slf4j.Slf4j; -import org.springframework.dao.DataIntegrityViolationException; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -36,11 +35,7 @@ public class ApiErrorLogServiceImpl implements ApiErrorLogService { public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) { ApiErrorLogDO apiErrorLog = BeanUtils.toBean(createDTO, ApiErrorLogDO.class) .setProcessStatus(ApiErrorLogProcessStatusEnum.INIT.getStatus()); - try { - apiErrorLogMapper.insert(apiErrorLog); - }catch (DataIntegrityViolationException e) { - log.error(apiErrorLog.toString()); - } + apiErrorLogMapper.insert(apiErrorLog); } @Override diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java index e7d5b7a6e..1aaaf0086 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java @@ -40,6 +40,7 @@ public class LabelController { @PostMapping("/create") @Operation(summary = "创建标签") @PreAuthorize("@ss.hasPermission('system:label:create')") + @OperateLog(logArgs = false) public CommonResult createLabel(@Valid @RequestBody LabelSaveReqVO createReqVO) { return success(labelService.createLabel(createReqVO)); } @@ -47,6 +48,7 @@ public class LabelController { @PutMapping("/update") @Operation(summary = "更新标签") @PreAuthorize("@ss.hasPermission('system:label:update')") + @OperateLog(logArgs = false) public CommonResult updateLabel(@Valid @RequestBody LabelSaveReqVO updateReqVO) { labelService.updateLabel(updateReqVO); return success(true); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java index 5e3f7d514..3117bc22e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java @@ -41,6 +41,7 @@ public class LabelTemplateController { @PostMapping("/create") @Operation(summary = "创建标签模板") @PreAuthorize("@ss.hasPermission('system:label-template:create')") + @OperateLog(logArgs = false) public CommonResult createLabelTemplate(@Valid @RequestBody LabelTemplateSaveReqVO createReqVO) { return success(labelTemplateService.createLabelTemplate(createReqVO)); } @@ -48,6 +49,7 @@ public class LabelTemplateController { @PutMapping("/update") @Operation(summary = "更新标签模板") @PreAuthorize("@ss.hasPermission('system:label-template:update')") + @OperateLog(logArgs = false) public CommonResult updateLabelTemplate(@Valid @RequestBody LabelTemplateSaveReqVO updateReqVO) { labelTemplateService.updateLabelTemplate(updateReqVO); return success(true); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java index 5d69c70ab..cde20529d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.controller.admin.machine; import com.cf.imes.framework.es.core.valid.UpdateGroup; +import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.service.machine.MachineService; @@ -38,6 +39,7 @@ public class MachineController { @PutMapping("/create-cutting") @Operation(summary = "创建机台") @PreAuthorize("@ss.hasPermission('machine::create')") + @OperateLog(logArgs = false) public CommonResult createCutting(@Valid @RequestBody CuttingSaveReqVO createReqVO) { return success(machineService.createCutting(createReqVO)); } @@ -45,6 +47,7 @@ public class MachineController { @PostMapping("/update-cutting") @Operation(summary = "更新机台") @PreAuthorize("@ss.hasPermission('machine::update')") + @OperateLog(logArgs = false) public CommonResult update( @RequestBody @Validated(UpdateGroup.class) CuttingSaveReqVO updateReqVO) { machineService.updateCutting(updateReqVO); return success(true); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java index efb49df03..e6891eb9a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineTemplateController.java @@ -4,6 +4,7 @@ import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; +import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.system.controller.admin.machine.vo.*; import com.cf.imes.module.system.dal.dataobject.machinetemplate.MachineTemplateDO; import com.cf.imes.module.system.service.machine.MachineTemplateService; @@ -52,6 +53,7 @@ public class MachineTemplateController { @PutMapping("cutting-machine") @Operation(summary = "新增机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::create')") + @OperateLog(logArgs = false) public CommonResult createCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) { return success(machineTemplateService.createCuttingTemplate(reqVO)); } @@ -59,6 +61,7 @@ public class MachineTemplateController { @PostMapping("cutting-machine") @Operation(summary = "修改机台模板配置") @PreAuthorize("@ss.hasPermission('machine-template::update')") + @OperateLog(logArgs = false) public CommonResult updateCuttingTemplate(@RequestBody CuttingTemplateSaveReqVO reqVO) { return success(machineTemplateService.updateCuttingTemplate(reqVO)); } From b0dfc889ff629d6fbc6778a8d7664c76fff1dbe1 Mon Sep 17 00:00:00 2001 From: yangsb Date: Wed, 3 Apr 2024 16:15:21 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=95=B0=E6=8D=AE=E6=BA=90value=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infra/job/logger/AccessLogCleanJob.java | 6 ++-- .../infra/job/logger/ErrorLogCleanJob.java | 6 ++-- .../admin/plan/OptimizePlanController.java | 10 +++++++ .../admin/plan/vo/GetSourceDataReq.java | 24 +++++++++++++++ .../executor/dal/mysql/order/OrderMapper.java | 2 ++ .../rpc/config/RpcConfiguration.java | 3 +- .../optimizeplan/OptimizePlanService.java | 3 ++ .../optimizeplan/OptimizePlanServiceImpl.java | 14 +++++++++ .../resources/mapper/order/OrderMapper.xml | 4 +++ .../system/api/dataSource/DataSourceApi.java | 23 +++++++++++++++ .../api/datasource/DataSourceApiImpl.java | 29 +++++++++++++++++++ .../datasource/vo/DataSourcePageReqVO.java | 2 +- .../admin/datasource/vo/DataSourceRespVO.java | 2 +- .../dataobject/datasource/DataSourceDO.java | 2 +- .../mysql/datasource/DataSourceMapper.java | 2 +- 15 files changed, 123 insertions(+), 9 deletions(-) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java create mode 100644 cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/dataSource/DataSourceApi.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/datasource/DataSourceApiImpl.java diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/AccessLogCleanJob.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/AccessLogCleanJob.java index 177368f77..ec825523d 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/AccessLogCleanJob.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/AccessLogCleanJob.java @@ -4,6 +4,7 @@ import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.module.infra.service.logger.ApiAccessLogService; /*import com.xxl.job.core.handler.annotation.XxlJob;*/ import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -30,11 +31,12 @@ public class AccessLogCleanJob { */ private static final Integer DELETE_LIMIT = 100; - /* @XxlJob("accessLogCleanJob") + /* @XxlJob("accessLogCleanJob")*/ @OrganIgnore + /* @Scheduled(cron = "0 0 * * * ?")*/ public void execute() { Integer count = apiAccessLogService.cleanAccessLog(JOB_CLEAN_RETAIN_DAY, DELETE_LIMIT); log.info("[execute][定时执行清理访问日志数量 ({}) 个]", count); - }*/ + } } diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/ErrorLogCleanJob.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/ErrorLogCleanJob.java index 7d56c9b70..3d98a41b3 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/ErrorLogCleanJob.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/job/logger/ErrorLogCleanJob.java @@ -4,6 +4,7 @@ import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.module.infra.service.logger.ApiErrorLogService; /*import com.xxl.job.core.handler.annotation.XxlJob;*/ import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -30,11 +31,12 @@ public class ErrorLogCleanJob { */ private static final Integer DELETE_LIMIT = 100; - /* @XxlJob("errorLogCleanJob") + /*@XxlJob("errorLogCleanJob")*/ @OrganIgnore + /*@Scheduled(cron = "0 0 2 * * ?")*/ public void execute() { Integer count = apiErrorLogService.cleanErrorLog(JOB_CLEAN_RETAIN_DAY,DELETE_LIMIT); log.info("[execute][定时执行清理错误日志数量 ({}) 个]", count); - }*/ + } } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java index ada7f61f3..d6557acbd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/OptimizePlanController.java @@ -4,6 +4,7 @@ import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import com.cf.imes.module.executor.controller.admin.plan.vo.*; import com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService; +import com.cf.imes.module.system.api.dataSource.DataSourceApi; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; @@ -16,6 +17,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; +import java.util.Map; /** * @author there @@ -86,4 +88,12 @@ public class OptimizePlanController { return CommonResult.success(optimizePlanParam); } + + @GetMapping("/getLabelDataSourceValue") + @Operation(summary = "获取标签数据源value") + @PreAuthorize("@ss.hasPermission('executor:optimize-plate:create')") + public CommonResult> getLabelDataSourceValue(@Valid GetSourceDataReq req ) { + return CommonResult.success( optimizePlanService.getLabelDataSourceValue(req)); + + } } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java new file mode 100644 index 000000000..7e9c89785 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java @@ -0,0 +1,24 @@ +package com.cf.imes.module.executor.controller.admin.plan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author Beal + */ +@Data +@Schema(description = "") +public class GetSourceDataReq { + @Schema(description = "生产单id") + @NotNull(message = "生产单id不能空") + private Long orderId; + + @Schema(description = "排单id") + private Long planId; + + @Schema(description = "数据源id") + @NotNull(message = "数据源id不能空") + private Long dataSourceId; +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index f700e0880..381bcd79a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -17,6 +17,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Map; /** * 生产单表 order_{N} Mapper @@ -88,4 +89,5 @@ public interface OrderMapper extends BaseMapperX { return selectList(wrapper); } + Map selectDynamicSqlString(String sql); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/rpc/config/RpcConfiguration.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/rpc/config/RpcConfiguration.java index 92d87991d..e316c4848 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/rpc/config/RpcConfiguration.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/rpc/config/RpcConfiguration.java @@ -1,6 +1,7 @@ package com.cf.imes.module.executor.framework.rpc.config; import com.cf.imes.module.infra.api.file.FileApi; +import com.cf.imes.module.system.api.dataSource.DataSourceApi; import com.cf.imes.module.system.api.machine.MachineApi; import com.cf.imes.module.system.api.user.AdminUserApi; import com.cf.imes.module.system.api.dict.DictDataApi; @@ -11,6 +12,6 @@ import org.springframework.context.annotation.Configuration; * @author there */ @Configuration(proxyBeanMethods = false) -@EnableFeignClients(clients = {AdminUserApi.class, MachineApi.class, DictDataApi.class, FileApi.class}) +@EnableFeignClients(clients = {AdminUserApi.class, MachineApi.class, DictDataApi.class, FileApi.class, DataSourceApi.class}) public class RpcConfiguration { } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java index e80f34025..48c7fdb75 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanService.java @@ -3,6 +3,7 @@ package com.cf.imes.module.executor.service.optimizeplan; import com.cf.imes.module.executor.controller.admin.plan.vo.*; import java.util.List; +import java.util.Map; public interface OptimizePlanService { List getPlateListByPlanId(Long planId); @@ -16,4 +17,6 @@ public interface OptimizePlanService { OptimizeParamResVO getOptimizeParam(Long planId); OptimizeParamRespVO getOptimizePlanParam(Long planId); + + Map getLabelDataSourceValue(GetSourceDataReq req); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index 82306d87c..ce4be8cba 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -17,6 +17,7 @@ import com.cf.imes.module.executor.dal.dataobject.remainplaten.OutlineDTO; import com.cf.imes.module.executor.dal.dataobject.remainplaten.PointDTO; import com.cf.imes.module.executor.dal.dataobject.remainplaten.RemainPlateDO; import com.cf.imes.module.executor.dal.mysql.goods.GoodsMapper; +import com.cf.imes.module.executor.dal.mysql.order.OrderMapper; import com.cf.imes.module.executor.dal.mysql.plan.PlanMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; import com.cf.imes.module.executor.dal.mysql.remainplaten.RemainPlateMapper; @@ -24,6 +25,7 @@ import com.cf.imes.module.executor.util.RandomUtils; import com.cf.imes.module.executor.util.RectangleChecker; import com.cf.imes.module.infra.api.file.FileApi; import com.cf.imes.module.infra.api.file.dto.FileCreateReqDTO; +import com.cf.imes.module.system.api.dataSource.DataSourceApi; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.springframework.stereotype.Service; @@ -61,6 +63,12 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Resource private GoodsMapper goodsMapper; + @Resource + private DataSourceApi dataSourceApi; + + @Resource + private OrderMapper orderMapper; + @Override public List getPlateListByPlanId(Long planId) { return planMapper.selectPlateListByPlanId(planId); @@ -226,5 +234,11 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { return optimizePlanParam; } + @Override + public Map getLabelDataSourceValue(GetSourceDataReq req) { + String sqlStr = dataSourceApi.getSqlById(req.getDataSourceId()).getCheckedData(); + return orderMapper.selectDynamicSqlString(String.format(sqlStr, req.getOrderId())); + } + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml index 28a429977..da90f0fa5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml @@ -12,4 +12,8 @@ ${ew.customSqlSegment} group by orderId, p.id + + \ No newline at end of file diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/dataSource/DataSourceApi.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/dataSource/DataSourceApi.java new file mode 100644 index 000000000..02b7127ab --- /dev/null +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/api/dataSource/DataSourceApi.java @@ -0,0 +1,23 @@ +package com.cf.imes.module.system.api.dataSource; + +import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.module.system.enums.ApiConstants; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author Beal + */ +@FeignClient(name = ApiConstants.NAME) // TODO 晨丰：fallbackFactory = +@Tag(name = "RPC 服务 - 数据源") +public interface DataSourceApi { + + String PREFIX = ApiConstants.PREFIX + "/dataSource"; + + @GetMapping(PREFIX + "/getSqlById") + @Operation(summary = "获得数据源sql") + CommonResult getSqlById(@RequestParam(value = "id") Long id); +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/datasource/DataSourceApiImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/datasource/DataSourceApiImpl.java new file mode 100644 index 000000000..068a4273b --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/datasource/DataSourceApiImpl.java @@ -0,0 +1,29 @@ +package com.cf.imes.module.system.api.datasource; + +import com.cf.imes.framework.common.exception.ErrorCode; +import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.module.system.api.dataSource.DataSourceApi; +import com.cf.imes.module.system.dal.dataobject.datasource.DataSourceDO; +import com.cf.imes.module.system.dal.mysql.datasource.DataSourceMapper; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Objects; + +import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; + +@RestController +public class DataSourceApiImpl implements DataSourceApi { + + @Resource + private DataSourceMapper dataSourceMapper; + + @Override + public CommonResult getSqlById(Long id) { + DataSourceDO dataSourceDO = dataSourceMapper.selectById(id); + if(Objects.isNull(dataSourceDO)) { + throw exception(new ErrorCode(2133,"数据源不存在")); + } + return CommonResult.success(dataSourceDO.getSqlStr()) ; + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourcePageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourcePageReqVO.java index 517ac8913..cc2f663dd 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourcePageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourcePageReqVO.java @@ -19,7 +19,7 @@ public class DataSourcePageReqVO extends PageParam { private String name; @Schema(description = "sql") - private String sql; + private String sqlStr; @Schema(description = "数据源类型", example = "2") private Integer type; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java index 2362e2eb3..51c7312af 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/vo/DataSourceRespVO.java @@ -24,7 +24,7 @@ public class DataSourceRespVO { @Schema(description = "sql", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("sql") - private String sql; + private String sqlStr; @Schema(description = "数据源类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @ExcelProperty("数据源类型") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceDO.java index e97146753..e86fad02a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/datasource/DataSourceDO.java @@ -34,7 +34,7 @@ public class DataSourceDO extends BaseDO { /** * sql */ - private String sql; + private String sqlStr; /** * 数据源类型 */ diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java index 098e7dc7a..f6f2abb80 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java @@ -20,7 +20,7 @@ public interface DataSourceMapper extends BaseMapperX { default PageResult selectPage(DataSourcePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(DataSourceDO::getName, reqVO.getName()) - .eqIfPresent(DataSourceDO::getSql, reqVO.getSql()) + .eqIfPresent(DataSourceDO::getSqlStr, reqVO.getSqlStr()) .eqIfPresent(DataSourceDO::getType, reqVO.getType()) .betweenIfPresent(DataSourceDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(DataSourceDO::getId)); From 7ae23bdf8792b7f19b35e0f67832923746a7c918 Mon Sep 17 00:00:00 2001 From: yangsb Date: Sun, 7 Apr 2024 15:16:04 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E3=80=81=E6=A0=87=E7=AD=BE=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/vo/GetSourceDataReq.java | 11 +- .../executor/dal/mysql/order/OrderMapper.java | 2 +- .../optimizeplan/OptimizePlanServiceImpl.java | 9 +- .../admin/label/LabelController.java | 22 +- .../admin/label/vo/LabelRespVO.java | 7 +- .../admin/label/vo/LabelSaveReqVO.java | 8 +- .../LabelTemplateController.java | 23 +- .../labeltemplate/vo/LabelTemplateRespVO.java | 11 +- .../vo/LabelTemplateSaveReqVO.java | 8 +- .../system/convert/label/LabelConvert.java | 16 -- .../convert/label/LabelConvertImpl.java | 52 ---- .../labletemplate/LabelTemplateConvert.java | 16 -- .../LabelTemplateConvertImpl.java | 76 ------ .../labeltemplate/LabelElementTemplateDO.java | 53 ---- .../labeltemplate/LabelTemplateDO.java | 4 + .../system/dal/dataobject/lable/LabelDO.java | 4 + .../dal/dataobject/lable/LabelElementDO.java | 51 ---- .../dal/mysql/label/LabelElementMapper.java | 25 -- .../LabelElementTemplateMapper.java | 28 -- .../labeltemplate/LabelTemplateService.java | 9 - .../LabelTemplateServiceImpl.java | 234 +---------------- .../system/service/lable/LabelService.java | 11 - .../service/lable/LabelServiceImpl.java | 239 +----------------- 23 files changed, 70 insertions(+), 849 deletions(-) delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/label/LabelElementMapper.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/labeltemplate/LabelElementTemplateMapper.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java index 7e9c89785..888014517 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java @@ -15,10 +15,15 @@ public class GetSourceDataReq { @NotNull(message = "生产单id不能空") private Long orderId; - @Schema(description = "排单id") - private Long planId; - @Schema(description = "数据源id") @NotNull(message = "数据源id不能空") private Long dataSourceId; + + @Schema(description = "排单id") + private Long planId; + + @Schema(description = "包裹id") + private Long packageId; + + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index 381bcd79a..55a32572f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -89,5 +89,5 @@ public interface OrderMapper extends BaseMapperX { return selectList(wrapper); } - Map selectDynamicSqlString(String sql); + Map selectDynamicSqlString(@Param("sqlStr") String sqlStr); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index ce4be8cba..5aac5d760 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -237,7 +237,14 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Override public Map getLabelDataSourceValue(GetSourceDataReq req) { String sqlStr = dataSourceApi.getSqlById(req.getDataSourceId()).getCheckedData(); - return orderMapper.selectDynamicSqlString(String.format(sqlStr, req.getOrderId())); + String sql = sqlStr.replace("#{orderId}", req.getOrderId() + ""); + if(!Objects.isNull(req.getPackageId())) { + sql = sql.replace("#{packageId}", req.getPackageId() + ""); + } + if(!Objects.isNull(req.getPlanId())) { + sql = sql.replace("#{planId}", req.getPlanId() + ""); + } + return orderMapper.selectDynamicSqlString(sql); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java index 1aaaf0086..d2094fab1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java @@ -6,12 +6,10 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.excel.core.util.ExcelUtils; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelPageReqVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelSaveReqVO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; import com.cf.imes.module.system.service.lable.LabelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -40,7 +38,7 @@ public class LabelController { @PostMapping("/create") @Operation(summary = "创建标签") @PreAuthorize("@ss.hasPermission('system:label:create')") - @OperateLog(logArgs = false) + @OperateLog(enable = false) public CommonResult createLabel(@Valid @RequestBody LabelSaveReqVO createReqVO) { return success(labelService.createLabel(createReqVO)); } @@ -48,7 +46,7 @@ public class LabelController { @PutMapping("/update") @Operation(summary = "更新标签") @PreAuthorize("@ss.hasPermission('system:label:update')") - @OperateLog(logArgs = false) + @OperateLog(enable = false) public CommonResult updateLabel(@Valid @RequestBody LabelSaveReqVO updateReqVO) { labelService.updateLabel(updateReqVO); return success(true); @@ -67,6 +65,7 @@ public class LabelController { @Operation(summary = "获得标签") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:label:query')") + @OperateLog(enable = false) public CommonResult getLabel(@RequestParam("id") Long id) { return success(labelService.getLabel(id)); } @@ -74,6 +73,7 @@ public class LabelController { @GetMapping("/page") @Operation(summary = "获得标签分页") @PreAuthorize("@ss.hasPermission('system:label:query')") + @OperateLog(enable = false) public CommonResult> getLabelPage(@Valid LabelPageReqVO pageReqVO) { PageResult pageResult = labelService.getLabelPage(pageReqVO); return success(BeanUtils.toBean(pageResult, LabelRespVO.class)); @@ -83,13 +83,15 @@ public class LabelController { @Operation(summary = "获得标签列表") @Parameter(name = "type", description = "类型", required = false, example = "1024") @PreAuthorize("@ss.hasPermission('system:label:query')") - public CommonResult> getLabel(@RequestParam("type") String type) { + @OperateLog(enable = false) + public CommonResult> getList(@RequestParam("type") String type) { return success(BeanUtils.toBean(labelService.list(type), LabelRespVO.class)); } @GetMapping("/group-list") @Operation(summary = "获得分组标签列表") @PreAuthorize("@ss.hasPermission('system:label:query')") + @OperateLog(enable = false) public CommonResult>> getGroupList() { return success(labelService.getGroupList()); } @@ -107,14 +109,4 @@ public class LabelController { BeanUtils.toBean(list, LabelRespVO.class)); } - // ==================== 子表（标签元素） ==================== - - @GetMapping("/label-element/list-by-label-id") - @Operation(summary = "获得标签元素列表") - @Parameter(name = "labelId", description = "标签id") - @PreAuthorize("@ss.hasPermission('system:label:query')") - public CommonResult> getLabelElementListByLabelId(@RequestParam("labelId") Long labelId) { - return success(labelService.getLabelElementListByLabelId(labelId)); - } - } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelRespVO.java index 31449baf8..ef07d4bf9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelRespVO.java @@ -46,7 +46,10 @@ public class LabelRespVO { @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private LocalDateTime createTime; - @Schema(description = "标签元素模板列表") - private List labelElements; + /*@Schema(description = "标签元素模板列表") + private List labelElements;*/ + + @Schema(description = "配置") + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelSaveReqVO.java index 13e3d151d..173d1dd08 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelSaveReqVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.label.vo; +import co.elastic.clients.elasticsearch.watcher.DeactivateWatchRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -34,7 +35,10 @@ public class LabelSaveReqVO { @NotNull(message = "高度不能为空") private Integer height; - @Schema(description = "标签元素模板列表") - private List elements; + /*@Schema(description = "标签元素模板列表") + private List elements;*/ + + @Schema(description = "配置") + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java index 3117bc22e..2b55d7faa 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java @@ -1,27 +1,21 @@ package com.cf.imes.module.system.controller.admin.labeltemplate; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import java.util.*; import java.io.IOException; - import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.util.object.BeanUtils; import static com.cf.imes.framework.common.pojo.CommonResult.success; - import com.cf.imes.framework.excel.core.util.ExcelUtils; - import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*; - import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; import com.cf.imes.module.system.service.labeltemplate.LabelTemplateService; @@ -41,7 +35,7 @@ public class LabelTemplateController { @PostMapping("/create") @Operation(summary = "创建标签模板") @PreAuthorize("@ss.hasPermission('system:label-template:create')") - @OperateLog(logArgs = false) + @OperateLog(enable = false) public CommonResult createLabelTemplate(@Valid @RequestBody LabelTemplateSaveReqVO createReqVO) { return success(labelTemplateService.createLabelTemplate(createReqVO)); } @@ -49,7 +43,7 @@ public class LabelTemplateController { @PutMapping("/update") @Operation(summary = "更新标签模板") @PreAuthorize("@ss.hasPermission('system:label-template:update')") - @OperateLog(logArgs = false) + @OperateLog(enable = false) public CommonResult updateLabelTemplate(@Valid @RequestBody LabelTemplateSaveReqVO updateReqVO) { labelTemplateService.updateLabelTemplate(updateReqVO); return success(true); @@ -68,6 +62,7 @@ public class LabelTemplateController { @Operation(summary = "获得标签模板") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:label-template:query')") + @OperateLog(enable = false) public CommonResult getLabelTemplate(@RequestParam("id") Long id) { return success(labelTemplateService.getLabelTemplate(id)); } @@ -75,6 +70,7 @@ public class LabelTemplateController { @GetMapping("/page") @Operation(summary = "获得标签模板分页") @PreAuthorize("@ss.hasPermission('system:label-template:query')") + @OperateLog(enable = false) public CommonResult> getLabelTemplatePage(@Valid LabelTemplatePageReqVO pageReqVO) { PageResult pageResult = labelTemplateService.getLabelTemplatePage(pageReqVO); return success(BeanUtils.toBean(pageResult, LabelTemplateRespVO.class)); @@ -83,6 +79,7 @@ public class LabelTemplateController { @GetMapping("/group-list") @Operation(summary = "获得分组标签模板列表") @PreAuthorize("@ss.hasPermission('system:label-template:query')") + @OperateLog(enable = false) public CommonResult>> getGroupList() { return success(labelTemplateService.getGroupList()); } @@ -91,6 +88,7 @@ public class LabelTemplateController { @Operation(summary = "获得默认标签模板") @Parameter(name = "type", description = "标签类型", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:label-template:query')") + @OperateLog(enable = false) public CommonResult getDefaultLabelTemplate(@RequestParam("type") String type) { return success(labelTemplateService.getDefaultLabelTemplate(type)); } @@ -108,14 +106,5 @@ public class LabelTemplateController { BeanUtils.toBean(list, LabelTemplateRespVO.class)); } - // ==================== 子表（标签元素模板） ==================== - - @GetMapping("/label-element-template/list-by-label-template-id") - @Operation(summary = "获得标签元素模板列表") - @Parameter(name = "labelTemplateId", description = "标签模板id") - @PreAuthorize("@ss.hasPermission('system:label-template:query')") - public CommonResult> getLabelElementTemplateListByLabelTemplateId(@RequestParam("labelTemplateId") Long labelTemplateId) { - return success(labelTemplateService.getLabelElementTemplateListByLabelTemplateId(labelTemplateId)); - } } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateRespVO.java index 6d53045e4..cb583dc56 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateRespVO.java @@ -1,12 +1,9 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; @@ -47,7 +44,9 @@ public class LabelTemplateRespVO { @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private LocalDateTime createTime; - @Schema(description = "标签元素模板列表") - private List labelElementTemplates; + /*@Schema(description = "标签元素模板列表") + private List labelElementTemplates;*/ + @Schema(description = "配置") + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java index be096acb7..3f9e08b79 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java @@ -1,11 +1,9 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.*; @Schema(description = "管理后台 - 标签模板新增/修改 Request VO") @Data @@ -34,7 +32,9 @@ public class LabelTemplateSaveReqVO { @NotNull(message = "高度不能为空") private Integer height; - @Schema(description = "标签元素模板列表") - private List elements; + /*@Schema(description = "标签元素模板列表") + private List elements;*/ + @Schema(description = "配置") + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java deleted file mode 100644 index df9095219..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cf.imes.module.system.convert.label; - -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementSaveReqVO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; - -import java.util.List; - -public interface LabelConvert { - - List convert1 (List labelElementDOS); - - List convert2 (List labelElementRespVOS); - - LabelElementDO convert(LabelElementSaveReqVO vo); -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java deleted file mode 100644 index cb4cbb784..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cf.imes.module.system.convert.label; - -import com.alibaba.fastjson.JSON; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementSaveReqVO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class LabelConvertImpl implements LabelConvert{ - @Override - public List convert1(List labelElementDOS) { - return labelElementDOS.stream().map( - e-> LabelElementRespVO.builder() - .labelId(e.getLabelId()) - .name(e.getName()) - .id(e.getId()) - .type(e.getType()) - .sourceId(e.getSourceId()) - .propertyDO(JSON.parseObject(e.getConfig())) - .build() - ).collect(Collectors.toList()); - } - - @Override - public List convert2(List labelElementRespVOS) { - return labelElementRespVOS.stream().map(e-> LabelElementDO.builder() - .labelId(e.getLabelId()) - .type(e.getType()) - .name(e.getName()) - .sourceId(e.getSourceId()) - .id(e.getId()) - .config(e.getPropertyDO().toJSONString()) - .build() - ).collect(Collectors.toList()); - } - - @Override - public LabelElementDO convert(LabelElementSaveReqVO vo) { - return LabelElementDO.builder() - .config(vo.getPropertyDO().toJSONString()) - .labelId(vo.getLabelId()) - .type(vo.getType()) - .sourceId(vo.getSourceId()) - .id(vo.getId()) - .name(vo.getName()) - .build(); - } -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java deleted file mode 100644 index d92884514..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cf.imes.module.system.convert.labletemplate; - -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateRespVO; -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; -import java.util.List; - -public interface LabelTemplateConvert { - - List convert1 (List labelElementTemplateDOS); - - List convert2 (List labelElementTemplateRespVOS); - - LabelElementTemplateDO convert(LabelElementTemplateSaveReqVO vo); - -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java deleted file mode 100644 index d108f5479..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.cf.imes.module.system.convert.labletemplate; - -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONObject; -import com.alibaba.fastjson.JSON; -import com.cf.imes.framework.common.util.collection.MapUtils; -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateRespVO; -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import org.springframework.stereotype.Service; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @author Beal - */ -@Service -public class LabelTemplateConvertImpl implements LabelTemplateConvert { - - @Override - public List convert1 (List labelElementTemplateDOS) { - return labelElementTemplateDOS.stream().map(e -> { - /*Gson gson = new Gson(); - Type type = new TypeToken>() { - }.getType();*/ - return LabelElementTemplateRespVO.builder() - .labelTemplateId(e.getLabelTemplateId()) - .id(e.getId()) - .type(e.getType()) - .name(e.getName()) - .propertyDO(JSON.parseObject(e.getConfig())) - // .propertyDO(StrUtil.isBlank(e.getPropertyDO()) ? new HashMap(): gson.fromJson(e.getPropertyDO(), type)) - .sourceId(e.getSourceId()) - .build(); - } - - ).collect(Collectors.toList()); - } - - @Override - public List convert2(List labelElementTemplateRespVOS) { - - return labelElementTemplateRespVOS.stream().map(e-> - LabelElementTemplateDO.builder() - .config(e.getPropertyDO().toJSONString()) - .labelTemplateId(e.getLabelTemplateId()) - .type(e.getType()) - .id(e.getId()) - .name(e.getName()) - .sourceId(e.getSourceId()) - .build() - ).collect(Collectors.toList()); - } - - @Override - public LabelElementTemplateDO convert(LabelElementTemplateSaveReqVO vo) { - return LabelElementTemplateDO.builder() - .name(vo.getName()) - .config(vo.getPropertyDO().toJSONString()) - .labelTemplateId(vo.getLabelTemplateId()) - .sourceId(vo.getSourceId()) - .id(vo.getId()) - .type(vo.getType()) - .build() - ; - } -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java deleted file mode 100644 index 26ee407b8..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cf.imes.module.system.dal.dataobject.labeltemplate; - -import com.alibaba.fastjson.JSONObject; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import org.apache.ibatis.type.JdbcType; - -/** - * 标签元素模板 DO - * - * @author 晨丰科技 - */ -@TableName("system_label_element_template") -@KeySequence("system_label_element_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LabelElementTemplateDO extends BaseDO { - - /** - * 注释 - */ - @TableId - private Long id; - /** - * 标签模板id - */ - private Long labelTemplateId; - /** - * 标签元素名称 - */ - private String name; - /** - * 元素类型 - */ - private String type; - /** - * 数据源id - */ - private Long sourceId; - /** - * 元素配置 - */ - private String config; - -} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java index bb1d14434..e9a2f4270 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java @@ -51,5 +51,9 @@ public class LabelTemplateDO extends BaseDO { * 是否默认 */ private Boolean isDefault; + /** + * 配置 + */ + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelDO.java index a0a4a7897..87ad61358 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelDO.java @@ -47,5 +47,9 @@ public class LabelDO extends OrganBaseDO { * 高度 */ private Integer height; + /** + * 配置 + */ + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java deleted file mode 100644 index 48faa2bb8..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cf.imes.module.system.dal.dataobject.lable; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import com.cf.imes.framework.organ.core.db.OrganBaseDO; -import lombok.*; - -/** - * 标签元素模板 DO - * - * @author 晨丰科技 - */ -@TableName("system_label_element") -@KeySequence("system_label_element_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LabelElementDO extends OrganBaseDO { - - /** - * 注释 - */ - @TableId - private Long id; - /** - * 标签模板id - */ - private Long labelId; - /** - * 标签元素名称 - */ - private String name; - /** - * 元素类型 - */ - private String type; - /** - * 数据源id - */ - private Long sourceId; - /** - * 元素配置 - */ - private String config; - -} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/label/LabelElementMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/label/LabelElementMapper.java deleted file mode 100644 index 14ddc93b5..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/label/LabelElementMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cf.imes.module.system.dal.mysql.label; - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 标签元素模板 Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface LabelElementMapper extends BaseMapperX { - - default List selectListByLabelId(Long labelTemplateId) { - return selectList(LabelElementDO::getLabelId, labelTemplateId); - } - - default int deleteByLabelId(Long labelTemplateId) { - return delete(LabelElementDO::getLabelId, labelTemplateId); - } - -} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/labeltemplate/LabelElementTemplateMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/labeltemplate/LabelElementTemplateMapper.java deleted file mode 100644 index 6e2011b80..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/labeltemplate/LabelElementTemplateMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.system.dal.mysql.labeltemplate; - -import java.util.*; - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 标签元素模板 Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface LabelElementTemplateMapper extends BaseMapperX { - - default List selectListByLabelTemplateId(Long labelTemplateId) { - return selectList(LabelElementTemplateDO::getLabelTemplateId, labelTemplateId); - } - - default int deleteByLabelTemplateId(Long labelTemplateId) { - return delete(LabelElementTemplateDO::getLabelTemplateId, labelTemplateId); - } - -} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java index 0b7b697d1..1459f6fb2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java @@ -2,10 +2,8 @@ package com.cf.imes.module.system.service.labeltemplate; import java.util.*; import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.pojo.PageParam; import javax.validation.Valid; @@ -56,13 +54,6 @@ public interface LabelTemplateService { // ==================== 子表（标签元素模板） ==================== - /** - * 获得标签元素模板列表 - * - * @param labelTemplateId 标签模板id - * @return 标签元素模板列表 - */ - List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId); Map> getGroupList(); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index a0e46f2e0..623ac8be7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java @@ -1,43 +1,18 @@ package com.cf.imes.module.system.service.labeltemplate; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import co.elastic.clients.elasticsearch.ElasticsearchClient; -import co.elastic.clients.elasticsearch._types.FieldValue; -import co.elastic.clients.elasticsearch._types.query_dsl.TermsQuery; -import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; -import co.elastic.clients.elasticsearch.core.SearchResponse; -import co.elastic.clients.elasticsearch.core.search.Hit; -import com.alibaba.fastjson.JSON; -import com.cf.imes.framework.common.exception.ServiceException; -import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.system.convert.labletemplate.LabelTemplateConvert; -import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; -import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; -import com.cf.imes.module.system.dal.mysql.labeltemplate.LabelElementTemplateMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; - import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.dal.mysql.labeltemplate.LabelTemplateMapper; - import javax.annotation.Resource; - -import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; @@ -53,140 +28,33 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { @Resource private LabelTemplateMapper labelTemplateMapper; - @Resource - private LabelElementTemplateMapper labelElementTemplateMapper; - @Resource - private ESDocumentService esDocumentService; - @Resource - private ElasticsearchClient elasticsearchClient; - @Resource - private LabelTemplateConvert labelTemplateConvert; - - private static final String LABEL_TEMPLATE_ELEMENT_PROPERTY_INX = "label_template_element_property"; @Override - @Transactional(rollbackFor = Exception.class) public Long createLabelTemplate(LabelTemplateSaveReqVO createReqVO) { // 插入 LabelTemplateDO labelTemplate = BeanUtils.toBean(createReqVO, LabelTemplateDO.class); labelTemplateMapper.insert(labelTemplate); - - // 插入子表 - List createReqVOElements = createReqVO.getElements(); - if(CollectionUtil.isNotEmpty(createReqVOElements)) { - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelTemplateId(labelTemplate.getId()); - LabelElementTemplateDO elementTemplateDO = labelTemplateConvert.convert(e); - labelElementTemplateMapper.insert(elementTemplateDO); - /*LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO);*/ - }); - //插入索引 - /* try { - esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - } // 返回 return labelTemplate.getId(); } @Override - @Transactional(rollbackFor = Exception.class) public void updateLabelTemplate(LabelTemplateSaveReqVO updateReqVO) { // 校验存在 validateLabelTemplateExists(updateReqVO.getId()); // 更新 LabelTemplateDO updateObj = BeanUtils.toBean(updateReqVO, LabelTemplateDO.class); labelTemplateMapper.updateById(updateObj); - labelElementTemplateMapper.delete(new LambdaQueryWrapperX().eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId())); - - /* List labelElementTemplateDOS = labelElementTemplateMapper.selectList(new LambdaQueryWrapperX() - .select(LabelElementTemplateDO::getId) - .eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId()));*/ - //删除旧的元素 - /*DeleteByQueryRequest.Builder builder = null; - if(CollectionUtil.isNotEmpty(labelElementTemplateDOS)) { - List templateIds = labelElementTemplateDOS.stream() - .map(LabelElementTemplateDO::getId) - .toList(); - labelElementTemplateMapper.deleteBatchIds(templateIds); - List fieldValues = templateIds.stream().map(FieldValue::of).collect(Collectors.toList()); - builder = new DeleteByQueryRequest.Builder() - .index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - }*/ - - - //新增新的元素 - List createReqVOElements = updateReqVO.getElements(); - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelTemplateId(updateObj.getId()); - LabelElementTemplateDO elementTemplateDO = labelTemplateConvert.convert(e); - //LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); - labelElementTemplateMapper.insert(elementTemplateDO); - /*LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO);*/ - }); - //插入索引 - /*try { - if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { - esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } - if(!Objects.isNull(builder)) { - elasticsearchClient.deleteByQuery(builder.build()); - } - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - - - /*updateLabelElementTemplateList(updateReqVO.getId(), Convert.convert(new TypeReference>() { - }, elements));*/ - /* labelElementTemplateMapper.updateBatch(Convert.convert(new TypeReference>() { - }, elements)); - List labelElementPropertyDOS = elements.stream().map(e -> e.getPropertyDO()).collect(Collectors.toList()); - try { - esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - } @Override - @Transactional(rollbackFor = Exception.class) public void deleteLabelTemplate(Long id) { // 校验存在 LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectById(id); if (labelTemplateDO == null) { throw exception(LABEL_TEMPLATE_NOT_EXISTS); } - List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(id); - /*List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - // 删除索引 - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - // 删除标签模板表 labelTemplateMapper.deleteById(id); - // 删除标签元素模板表 - labelElementTemplateMapper.delete(new LambdaQueryWrapperX().eq(LabelElementTemplateDO::getLabelTemplateId, id)); - } private void validateLabelTemplateExists(Long id) { @@ -198,33 +66,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { @Override public LabelTemplateRespVO getLabelTemplate(Long id) { LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectById(id); - List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateDO.getId()); LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); - List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); - //List labelElementTemplateRespVOS = Convert.convert(new TypeReference>() {}, labelElementTemplateDOS); - //List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - /*List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - SearchResponse searchSetting = null; - try { - SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId") - .terms(b -> b.value(fieldValues)))._toQuery()) - .from(0) - .size(10000), - LabelElementPropertyDO.class); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementTemplateRespVO respVO : labelElementTemplateRespVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ - - labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS); return labelTemplateRespVO; } @@ -233,67 +75,12 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { return labelTemplateMapper.selectPage(pageReqVO); } - // ==================== 子表（标签元素模板） ==================== - - @Override - public List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId) { - List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateId); - List respVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); - //List respVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - /* List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - try { - SearchResponse response = elasticsearchClient.search(b -> b.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .from(0) - .size(10000) - .query(TermsQuery.of(e -> e.field("elementId").terms(t -> t.value(fieldValues)))._toQuery()), - LabelElementPropertyDO.class); - List> hits = response.hits().hits(); - if(CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementTemplateRespVO respVO : respVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - return respVOS; - } @Override public Map> getGroupList() { List labelTemplateDOS = labelTemplateMapper.selectList(); List labelTemplateRespVOS = BeanUtils.toBean(labelTemplateDOS, LabelTemplateRespVO.class); - Set ids = labelTemplateRespVOS.stream().map(e -> e.getId()).collect(Collectors.toSet()); - List labelElementTemplateDOS = labelElementTemplateMapper.selectList(new LambdaQueryWrapperX().in(LabelElementTemplateDO::getLabelTemplateId, ids)); - List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); - //List labelElementTemplateRespVOS = Convert.convert(new TypeReference>() {}, labelTemplateDOS); - //List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - /*List fieldValues = labelElementTemplateRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - try { - SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId") - .terms(b -> b.value(fieldValues)))._toQuery()) - .from(0) - .size(10000), - LabelElementPropertyDO.class); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementTemplateRespVO respVO : labelElementTemplateRespVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ - for (LabelTemplateRespVO labelTemplateRespVO : labelTemplateRespVOS) { - labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS.stream().filter(e -> Objects.equals(e.getLabelTemplateId(), labelTemplateRespVO.getId())).toList()); - } - return labelTemplateRespVOS.stream().collect(Collectors.groupingBy(e -> e.getType())); + return labelTemplateRespVOS.stream().collect(Collectors.groupingBy(LabelTemplateRespVO::getType)); } @Override @@ -307,29 +94,10 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { throw exception(DEFAULT_TEMPLATE_COUNT); } LabelTemplateDO labelTemplateDO = labelTemplateDOS.get(0); - List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateDO.getId()); LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); - List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); - labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS); return labelTemplateRespVO; } throw exception(DEFAULT_LABEL_NOT_EXISTS); } - private void createLabelElementTemplateList(Long labelTemplateId, List list) { - list.forEach(o -> o.setLabelTemplateId(labelTemplateId)); - labelElementTemplateMapper.insertBatch(list); - } - - private void updateLabelElementTemplateList(Long labelTemplateId, List list) { - deleteLabelElementTemplateByLabelTemplateId(labelTemplateId); - list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新 - createLabelElementTemplateList(labelTemplateId, list); - } - - private void deleteLabelElementTemplateByLabelTemplateId(Long labelTemplateId) { - labelElementTemplateMapper.deleteByLabelTemplateId(labelTemplateId); - } - - } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java index 6ce8f32c2..10e47ff13 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java @@ -1,12 +1,10 @@ package com.cf.imes.module.system.service.lable; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelPageReqVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelSaveReqVO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; import javax.validation.Valid; import java.util.List; @@ -57,15 +55,6 @@ public interface LabelService { */ PageResult getLabelPage(LabelPageReqVO pageReqVO); - // ==================== 子表（标签元素模板） ==================== - - /** - * 获得标签元素模板列表 - * - * @param LabelId 标签模板id - * @return 标签元素模板列表 - */ - List getLabelElementListByLabelId(Long LabelId); Map> getGroupList(); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index 07b5e380c..2f4368caa 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -1,40 +1,18 @@ package com.cf.imes.module.system.service.lable; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; -import co.elastic.clients.elasticsearch.ElasticsearchClient; -import co.elastic.clients.elasticsearch._types.FieldValue; -import co.elastic.clients.elasticsearch._types.query_dsl.TermsQuery; -import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; -import co.elastic.clients.elasticsearch.core.SearchResponse; -import co.elastic.clients.elasticsearch.core.search.Hit; -import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.controller.admin.label.vo.*; -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; -import com.cf.imes.module.system.convert.label.LabelConvert; -import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; -import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; -import com.cf.imes.module.system.dal.mysql.label.LabelElementMapper; import com.cf.imes.module.system.dal.mysql.label.LabelMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; - import javax.annotation.Resource; -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; - -import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.module.system.enums.ErrorCodeConstants.LABEL_NOT_EXISTS; @@ -49,46 +27,15 @@ import static com.cf.imes.module.system.enums.ErrorCodeConstants.LABEL_NOT_EXIST public class LabelServiceImpl implements LabelService { @Resource - private LabelMapper LabelMapper; - @Resource - private LabelElementMapper labelElementMapper; - @Resource - private ESDocumentService esDocumentService; - @Resource - private ElasticsearchClient elasticsearchClient; - @Resource - private LabelConvert labelConvert; + private LabelMapper labelMapper; - private static final String LABEL_ELEMENT_PROPERTY_INX = "label_element_property"; @Override @Transactional(rollbackFor = Exception.class) public Long createLabel(LabelSaveReqVO createReqVO) { // 插入 LabelDO Label = BeanUtils.toBean(createReqVO, LabelDO.class); - LabelMapper.insert(Label); - - // 插入子表 - List createReqVOElements = createReqVO.getElements(); - if(CollectionUtil.isNotEmpty(createReqVOElements)) { - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelId(Label.getId()); - //LabelElementDO elementDO = Convert.convert(LabelElementDO.class, e); - LabelElementDO elementDO = labelConvert.convert(e); - labelElementMapper.insert(elementDO); - /* LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(elementDO.getId()); - labelElementPropertyDOS.add(propertyDO);*/ - }); - //插入索引 - /* try { - esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - } + labelMapper.insert(Label); // 返回 return Label.getId(); } @@ -100,217 +47,53 @@ public class LabelServiceImpl implements LabelService { validateLabelExists(updateReqVO.getId()); // 更新 LabelDO updateObj = BeanUtils.toBean(updateReqVO, LabelDO.class); - LabelMapper.updateById(updateObj); - - labelElementMapper.delete(new LambdaQueryWrapperX().eq(LabelElementDO::getLabelId, updateReqVO.getId())); - - /*List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX() - .select(LabelElementDO::getId) - .eq(LabelElementDO::getLabelId, updateReqVO.getId()));*/ - //删除旧的元素 - /*DeleteByQueryRequest.Builder builder = null; - if(CollectionUtil.isNotEmpty(labelElementDOS)) { - List templateIds = labelElementDOS.stream() - .map(LabelElementDO::getId) - .toList(); - labelElementMapper.deleteBatchIds(templateIds); - *//*List fieldValues = templateIds.stream().map(FieldValue::of).collect(Collectors.toList()); - builder = new DeleteByQueryRequest.Builder() - .index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery());*//* - }*/ - - - //新增新的元素 - List createReqVOElements = updateReqVO.getElements(); - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelId(updateObj.getId()); - LabelElementDO labelElementDO = labelConvert.convert(e); - //LabelElementDO labelElementDO = Convert.convert(LabelElementDO.class, e); - labelElementMapper.insert(labelElementDO); - /* LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(labelElementDO.getId()); - labelElementPropertyDOS.add(propertyDO);*/ - }); - //插入索引 - /* try { - if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { - esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } - if(!Objects.isNull(builder)) { - elasticsearchClient.deleteByQuery(builder.build()); - } - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - - /* List elements = updateReqVO.getElements(); - *//*updateLabelElementList(updateReqVO.getId(), Convert.convert(new TypeReference>() { - }, elements));*//* - labelElementMapper.updateBatch(Convert.convert(new TypeReference>() { - }, elements)); - List labelElementPropertyDOS = elements.stream().map(e -> e.getPropertyDO()).collect(Collectors.toList()); - try { - esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - + labelMapper.updateById(updateObj); } @Override @Transactional(rollbackFor = Exception.class) public void deleteLabel(Long id) { // 校验存在 - LabelDO LabelDO = LabelMapper.selectById(id); + LabelDO LabelDO = labelMapper.selectById(id); if (LabelDO == null) { throw exception(LABEL_NOT_EXISTS); } - List labelElementDOS = labelElementMapper.selectListByLabelId(id); - List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - // 删除索引 - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - } // 删除标签模板表 - LabelMapper.deleteById(id); - // 删除标签元素模板表 - labelElementMapper.delete(new LambdaQueryWrapperX().eq(LabelElementDO::getLabelId, id)); + labelMapper.deleteById(id); } private void validateLabelExists(Long id) { - if (LabelMapper.selectById(id) == null) { + if (labelMapper.selectById(id) == null) { throw exception(LABEL_NOT_EXISTS); } } @Override public LabelRespVO getLabel(Long id) { - LabelDO LabelDO = LabelMapper.selectById(id); - List labelElementDOS = labelElementMapper.selectListByLabelId(LabelDO.getId()); + LabelDO LabelDO = labelMapper.selectById(id); LabelRespVO LabelRespVO = BeanUtils.toBean(LabelDO, LabelRespVO.class); - List labelElementRespVOS = labelConvert.convert1(labelElementDOS); - //List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - /* List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - SearchResponse searchSetting = null; - try { - SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId") - .terms(b -> b.value(fieldValues)))._toQuery()) - .from(0) - .size(10000), - LabelElementPropertyDO.class); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementRespVO respVO : labelElementRespVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ - - LabelRespVO.setLabelElements(labelElementRespVOS); return LabelRespVO; } @Override public PageResult getLabelPage(LabelPageReqVO pageReqVO) { - return LabelMapper.selectPage(pageReqVO); + return labelMapper.selectPage(pageReqVO); } - // ==================== 子表（标签元素模板） ==================== - @Override - public List getLabelElementListByLabelId(Long LabelId) { - List labelElementDOS = labelElementMapper.selectListByLabelId(LabelId); - List respVOS = labelConvert.convert1(labelElementDOS); - //List respVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - /* List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - try { - SearchResponse response = elasticsearchClient.search(b -> b.index(LABEL_ELEMENT_PROPERTY_INX) - .from(0) - .size(10000) - .query(TermsQuery.of(e -> e.field("elementId").terms(t -> t.value(fieldValues)))._toQuery()), - LabelElementPropertyDO.class); - List> hits = response.hits().hits(); - if(CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementRespVO respVO : respVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - return respVOS; - } @Override public Map> getGroupList() { - List LabelDOS = LabelMapper.selectList(); + List LabelDOS = labelMapper.selectList(); List LabelRespVOS = BeanUtils.toBean(LabelDOS, LabelRespVO.class); - Set ids = LabelRespVOS.stream().map(e -> e.getId()).collect(Collectors.toSet()); - List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX().in(LabelElementDO::getLabelId, ids)); - List labelElementRespVOS = labelConvert.convert1(labelElementDOS); - //List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - /*List fieldValues = labelElementRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - try { - SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId") - .terms(b -> b.value(fieldValues)))._toQuery()) - .from(0) - .size(10000), - LabelElementPropertyDO.class); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementRespVO respVO : labelElementRespVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ - for (LabelRespVO LabelRespVO : LabelRespVOS) { - LabelRespVO.setLabelElements(labelElementRespVOS.stream().filter(e -> Objects.equals(e.getLabelId(), LabelRespVO.getId())).toList()); - } - return LabelRespVOS.stream().collect(Collectors.groupingBy(e -> e.getType())); + return LabelRespVOS.stream().collect(Collectors.groupingBy(LabelRespVO::getType)); } @Override public List list(String type) { - return LabelMapper.selectList(new LambdaQueryWrapperX().eqIfPresent(LabelDO::getType, type)); + return labelMapper.selectList(new LambdaQueryWrapperX().eqIfPresent(LabelDO::getType, type)); } - private void createLabelElementList(Long LabelId, List list) { - list.forEach(o -> o.setLabelId(LabelId)); - labelElementMapper.insertBatch(list); - } - - private void updateLabelElementList(Long LabelId, List list) { - deleteLabelElementByLabelId(LabelId); - list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新 - createLabelElementList(LabelId, list); - } - - private void deleteLabelElementByLabelId(Long LabelId) { - labelElementMapper.deleteByLabelId(LabelId); - } } \ No newline at end of file From 33597959e263703dacb41ee0fe28487f7845b9e7 Mon Sep 17 00:00:00 2001 From: yangsb Date: Sun, 7 Apr 2024 17:00:30 +0800 Subject: [PATCH 25/25] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=A6=E6=9D=9F=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/enums/ErrorCodeConstants.java | 1 + .../system/service/lable/LabelServiceImpl.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java index 7ca05a731..1390fd524 100644 --- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java @@ -189,6 +189,7 @@ public interface ErrorCodeConstants { ErrorCode LABEL_TEMPLATE_NOT_EXISTS = new ErrorCode(1_002_300_000, "标签模板不存在"); ErrorCode LABEL_NOT_EXISTS = new ErrorCode(1_002_300_001, "标签不存在"); ErrorCode DEFAULT_LABEL_NOT_EXISTS = new ErrorCode(1_002_300_002, "该类型标签默认模板不存在"); + ErrorCode MACHINE_USE_LABEL = new ErrorCode(1_002_300_003, "无法删除已有机台使用标签"); // ========== 系统数据源 1_002_301_000 ========== ErrorCode DATA_SOURCE_NOT_EXISTS = new ErrorCode(1_002_301_000, "系统数据源不存在"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index 2f4368caa..e1410df03 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -1,11 +1,14 @@ package com.cf.imes.module.system.service.lable; +import cn.hutool.core.collection.CollectionUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.controller.admin.label.vo.*; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; +import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.dal.mysql.label.LabelMapper; +import com.cf.imes.module.system.dal.mysql.machine.MachineMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,6 +18,7 @@ import java.util.*; import java.util.stream.Collectors; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.module.system.enums.ErrorCodeConstants.LABEL_NOT_EXISTS; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.MACHINE_USE_LABEL; /** * 标签模板 Service 实现类 @@ -29,6 +33,8 @@ public class LabelServiceImpl implements LabelService { @Resource private LabelMapper labelMapper; + @Resource + private MachineMapper machineMapper; @Override @Transactional(rollbackFor = Exception.class) @@ -58,6 +64,13 @@ public class LabelServiceImpl implements LabelService { if (LabelDO == null) { throw exception(LABEL_NOT_EXISTS); } + List machineDOS = machineMapper.selectList(new LambdaQueryWrapperX() + .select(MachineDO::getId) + .eq(MachineDO::getLabelId, id) + ); + if(CollectionUtil.isNotEmpty(machineDOS)) { + throw exception(MACHINE_USE_LABEL); + } // 删除标签模板表 labelMapper.deleteById(id);