From ff4eccc2f281d66d6906e54e2cf136969936eafb Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Mon, 18 Nov 2024 09:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E-=E6=99=BA=E8=83=BD=E5=88=86?= =?UTF-8?q?=E7=BA=BF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/PlanController.java | 2 +- .../admin/plan/vo/PlanOptimizeDataDTO.java | 1108 ----------------- .../manage/service/pack/PackServiceImpl.java | 2 +- .../system/enums/ErrorCodeConstants.java | 9 +- .../system/api/setting/SettingApiImpl.java | 6 +- .../admin/setting/SettingController.java | 20 +- .../systemconfig/SystemConfigController.java | 22 +- .../systemconfig/vo/ConfigDeleteReqVO.java | 24 + .../systemconfig/vo/ConfigSaveReqVO.java | 2 +- .../vo/ConfigUpdateStatusReqVO.java | 2 +- ...ngMapper.java => PackageConfigMapper.java} | 2 +- .../systemconfig/SystemConfigMapper.java | 25 + .../service/config/SystemConfigService.java | 4 + .../config/SystemConfigServiceImpl.java | 13 + .../factory/SystemConfigServiceFactory.java | 3 +- .../AbstractSystemConfigServiceHandler.java | 11 + .../impl/CustomPlateNoServiceHandler.java | 6 + .../DefaultSystemConfigServiceHandler.java | 6 + .../impl/IntellectBranchingService.java | 152 +++ .../machine/MachineTemplateServiceImpl.java | 1 - .../service/setting/SettingService.java | 4 +- .../service/setting/SettingServiceImpl.java | 34 +- 22 files changed, 313 insertions(+), 1145 deletions(-) delete mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanOptimizeDataDTO.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigDeleteReqVO.java rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/{SettingMapper.java => PackageConfigMapper.java} (92%) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/IntellectBranchingService.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java index a6d83bea2..73502902e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java @@ -69,7 +69,7 @@ public class PlanController { @GetMapping("/get") @Operation(summary = "获得排单") - @Parameter(name = "id", description = "排单id", required = true, example = "1024") + @Parameter(name = "id", description = "排单id", required = true) @PreAuthorize("@ss.hasPermission('placeorder:query')") public CommonResult getPlan(@RequestParam("id") @NotNull(message = "排单数据异常，请重新操作") Long id) { PlanRespVO plan = planService.getPlan(id); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanOptimizeDataDTO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanOptimizeDataDTO.java deleted file mode 100644 index b1382757d..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/PlanOptimizeDataDTO.java +++ /dev/null @@ -1,1108 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.plan.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - - -/** - * @author Beal - */ -@NoArgsConstructor -@Data -public class PlanOptimizeDataDTO { - - @Schema(description ="AreaID") - private int areaID; - @Schema(description ="AreaName") - private String areaName; - @Schema(description ="PlanOrder") - private PlanOrderBean planOrder; - @Schema(description ="MetrialList") - private List metrialList; - @Schema(description ="OrderList") - private List orderList; - @Schema(description ="ConfigList") - private List configList; - @Schema(description ="SourceType") - private int sourceType; - @Schema(description ="BlockList") - private List blockList; - @Schema(description ="BlockDetailList") - private List blockDetailList; - @Schema(description ="AreaDeleted") - private boolean areaDeleted; - - @NoArgsConstructor - @Data - public static class PlanOrderBean { - @Schema(description ="ID") - private int iD; - @Schema(description ="WorkAreaID") - private int workAreaID; - @Schema(description ="PlanCode") - private String planCode; - @Schema(description ="CreateTime") - private String createTime; - @Schema(description ="CreatorID") - private int creatorID; - @Schema(description ="State") - private int state; - @Schema(description ="PlanTime") - private String planTime; - @Schema(description ="CompanyID") - private int companyID; - @Schema(description ="Remark") - private String remark; - @Schema(description ="IsSelected") - private boolean isSelected; - } - - @NoArgsConstructor - @Data - public static class MetrialListBean { - @Schema(description ="OrderNo") - private String orderNo; - @Schema(description ="GoodsID") - private int goodsID; - @Schema(description ="GoodsName") - private String goodsName; - @Schema(description ="Specification") - private String specification; - @Schema(description ="Metrial") - private String metrial; - @Schema(description ="Color") - private String color; - @Schema(description ="Brank") - private String brank; - @Schema(description ="Width") - private int width; - @Schema(description ="Length") - private int length; - @Schema(description ="Thickness") - private int thickness; - @Schema(description ="Border") - private int border; - @Schema(description ="CutDia") - private int cutDia; - @Schema(description ="CutGap") - private int cutGap; - @Schema(description ="IsSorted") - private boolean isSorted; - @Schema(description ="BoardCount") - private int boardCount; - @Schema(description ="MinBoardID") - private int minBoardID; - @Schema(description ="MaxBoardID") - private int maxBoardID; - @Schema(description ="AvgLyr_All") - private double avgLyr_All; - @Schema(description ="AvgLyr_NoLastOne") - private double avgLyr_NoLastOne; - @Schema(description ="Lyr_LastOne") - private double lyr_LastOne; - @Schema(description ="CompanyID") - private int companyID; - @Schema(description ="UsedBoardMessage") - private List usedBoardMessage; - @Schema(description ="BlockPlaceMessage") - private List blockPlaceMessage; - @Schema(description ="State") - private int state; - @Schema(description ="HasWave") - private boolean hasWave; - @Schema(description ="OrgWidth") - private int orgWidth; - @Schema(description ="OrgLength") - private int orgLength; - @Schema(description ="PreCutValue") - private int preCutValue; - @Schema(description ="HelpCut") - private boolean helpCut; - @Schema(description ="SameKnifeHelpCutGap") - private int sameKnifeHelpCutGap; - @Schema(description ="CutKnifeID") - private int cutKnifeID; - @Schema(description ="HelpKnifeID") - private int helpKnifeID; - @Schema(description ="BoardCount_Remain") - private int boardCount_Remain; - @Schema(description ="RemainBoardMessage") - private String remainBoardMessage; - @Schema(description ="ScrapBoardList") - private List scrapBoardList; - @Schema(description ="LastSaveDate") - private String lastSaveDate; - - @NoArgsConstructor - @Data - public static class UsedBoardMessageBean { - @Schema(description ="Bi") - private int bi; - @Schema(description ="W") - private int w; - @Schema(description ="L") - private int l; - @Schema(description ="Si") - private int si; - @Schema(description ="So") - private String so; - @Schema(description ="No") - private String no; - @Schema(description ="LK") - private boolean lK; - private Object scrapPts; - private List scrapBlocks; - @Schema(description ="LE") - private boolean lE; - @Schema(description ="RE") - private boolean rE; - } - - @NoArgsConstructor - @Data - public static class BlockPlaceMessageBean { - private Object zzInfo; - @Schema(description ="Bi") - private int bi; - @Schema(description ="Bo") - private long bo; - @Schema(description ="X") - private int x; - @Schema(description ="Y") - private int y; - @Schema(description ="Pi") - private int pi; - @Schema(description ="Ps") - private int ps; - @Schema(description ="Ci") - private int ci; - @Schema(description ="Ca") - private int ca; - @Schema(description ="CP") - private int cP; - private boolean iA; - private boolean iO; - @Schema(description ="Dh") - private boolean dh; - @Schema(description ="Dm") - private boolean dm; - @Schema(description ="OF") - private int oF; - private int type; - private List points; - @Schema(description ="OrgSizeOutOff") - private OrgSizeOutOffBean orgSizeOutOff; - @Schema(description ="SizeOutOff") - private SizeOutOffBean sizeOutOff; - @Schema(description ="PlaceOffX") - private double placeOffX; - @Schema(description ="PlaceOffY") - private double placeOffY; - - @NoArgsConstructor - @Data - public static class OrgSizeOutOffBean { - private int left; - private int right; - private int upper; - private int under; - private int width; - private int length; - private int outWidth; - private int outLength; - private boolean hasDone; - } - - @NoArgsConstructor - @Data - public static class SizeOutOffBean { - private double left; - private double right; - private double upper; - private double under; - private int width; - private int length; - private int outWidth; - private int outLength; - private boolean hasDone; - } - } - } - - @NoArgsConstructor - @Data - public static class OrderListBean { - @Schema(description ="CustomerID") - private int customerID; - @Schema(description ="CustomerName") - private String customerName; - @Schema(description ="CustomerPhone") - private String customerPhone; - @Schema(description ="SaleDate") - private String saleDate; - @Schema(description ="SalePersonNo") - private int salePersonNo; - @Schema(description ="Consignee") - private String consignee; - @Schema(description ="ConsigneePhone") - private String consigneePhone; - @Schema(description ="ConsigneeAddress") - private String consigneeAddress; - @Schema(description ="OrderState") - private int orderState; - @Schema(description ="OrderMoney") - private double orderMoney; - @Schema(description ="Remark") - private String remark; - @Schema(description ="CustomOrderNo") - private String customOrderNo; - @Schema(description ="DeliveryDate") - private String deliveryDate; - @Schema(description ="PushConfig") - private boolean pushConfig; - @Schema(description ="OfferListStr") - private Object offerListStr; - @Schema(description ="CancelState") - private int cancelState; - @Schema(description ="ItemList") - private Object itemList; - @Schema(description ="GoodsList") - private Object goodsList; - @Schema(description ="OfferList") - private Object offerList; - @Schema(description ="TotalOrderOfferList") - private Object totalOrderOfferList; - @Schema(description ="BlockList") - private Object blockList; - @Schema(description ="DataBlockList") - private Object dataBlockList; - @Schema(description ="ObjectList") - private Object objectList; - @Schema(description ="DataObjectList") - private Object dataObjectList; - @Schema(description ="GoodsInfoList") - private Object goodsInfoList; - @Schema(description ="OrderProcessList") - private Object orderProcessList; - @Schema(description ="EditFun") - private OrderListBean.EditFunBean editFun; - @Schema(description ="SalePerson") - private String salePerson; - @Schema(description ="CdUserID") - private int cdUserID; - @Schema(description ="CdUser") - private String cdUser; - @Schema(description ="OrderNo") - private long orderNo; - @Schema(description ="CreateTime") - private String createTime; - @Schema(description ="CompanyID") - private int companyID; - @Schema(description ="SchduleDeliveryDate") - private String schduleDeliveryDate; - @Schema(description ="OrderType") - private int orderType; - @Schema(description ="OrderSort") - private int orderSort; - @Schema(description ="CadDataType") - private int cadDataType; - @Schema(description ="Deleted") - private boolean deleted; - @Schema(description ="ProcessState") - private Object processState; - - @NoArgsConstructor - @Data - public static class EditFunBean { - private int customer; - } - } - - @NoArgsConstructor - @Data - public static class ConfigListBean { - @Schema(description ="Type") - private int type; - @Schema(description ="Setting") - private ConfigListBean.SettingBean setting; - @Schema(description ="MachineID") - private int machineID; - - @NoArgsConstructor - @Data - public static class SettingBean { - @Schema(description ="UseWorkPanelSize") - private boolean useWorkPanelSize; - @Schema(description ="BoardWidth") - private int boardWidth; - @Schema(description ="BoardLength") - private int boardLength; - @Schema(description ="BoardSizeList") - private List boardSizeList; - @Schema(description ="BoardBorder") - private int boardBorder; - @Schema(description ="BoardBorder_B") - private int boardBorder_B; - @Schema(description ="CutBorderOff1") - private int cutBorderOff1; - @Schema(description ="CutBorderOff2") - private int cutBorderOff2; - @Schema(description ="KnifeDia") - private int knifeDia; - @Schema(description ="CutGap") - private int cutGap; - @Schema(description ="PreCutValue") - private int preCutValue; - @Schema(description ="OriginPointPosition") - private int originPointPosition; - @Schema(description ="WidthSideAxis") - private int widthSideAxis; - @Schema(description ="LengthSideAxis") - private int lengthSideAxis; - @Schema(description ="LocatorPosition") - private int locatorPosition; - @Schema(description ="UseLocator4Place") - private boolean useLocator4Place; - @Schema(description ="OffsetX_Board1") - private int offsetX_Board1; - @Schema(description ="OffsetY_Board1") - private int offsetY_Board1; - @Schema(description ="LocatorPosition_Block") - private int locatorPosition_Block; - @Schema(description ="OffsetX_Block") - private int offsetX_Block; - @Schema(description ="OffsetY_Block") - private int offsetY_Block; - private int scrapBlockSquare; - private int srcapBlockWidthMin; - private int scrapBlockWidthMax; - @Schema(description ="FreeHeight") - private int freeHeight; - @Schema(description ="FreeLocationX") - private int freeLocationX; - @Schema(description ="FreeLocationY") - private int freeLocationY; - @Schema(description ="FreeSpeed") - private int freeSpeed; - @Schema(description ="WorkStartHeight") - private int workStartHeight; - @Schema(description ="WorkStartSpeed") - private int workStartSpeed; - @Schema(description ="WorkStartDistance") - private int workStartDistance; - @Schema(description ="WorkPreDistance") - private int workPreDistance; - @Schema(description ="WorkSpeed") - private int workSpeed; - @Schema(description ="WorkCornerSpeed") - private int workCornerSpeed; - @Schema(description ="WorkEndSpeed") - private int workEndSpeed; - @Schema(description ="WorkEndDistace") - private int workEndDistace; - private int sameBorderHighSpeed; - private int innerCornerDistence; - private int innerCornerSpeed; - @Schema(description ="HoleFreeSpeed") - private int holeFreeSpeed; - @Schema(description ="HoleFirstDepth") - private int holeFirstDepth; - @Schema(description ="HoleFirstSpeed") - private int holeFirstSpeed; - @Schema(description ="HoleSpeed") - private int holeSpeed; - @Schema(description ="ModelSpeed") - private int modelSpeed; - @Schema(description ="AllowDoubleHoleFirstSort") - private boolean allowDoubleHoleFirstSort; - @Schema(description ="YuLiaoBoardDo2FaceBlock") - private boolean yuLiaoBoardDo2FaceBlock; - @Schema(description ="ShowDoubleHoleFirst4Place") - private boolean showDoubleHoleFirst4Place; - @Schema(description ="AutoSortingMinWidth") - private int autoSortingMinWidth; - @Schema(description ="FirstCutBorderInFaceB") - private boolean firstCutBorderInFaceB; - @Schema(description ="TongHoleOnlyOneTime") - private boolean tongHoleOnlyOneTime; - @Schema(description ="TongHoleUseTwoTime") - private boolean tongHoleUseTwoTime; - @Schema(description ="TongKongDoBackFace") - private boolean tongKongDoBackFace; - @Schema(description ="AllowDoubleSplit") - private boolean allowDoubleSplit; - @Schema(description ="SplitThickness") - private int splitThickness; - @Schema(description ="SplitDepth") - private int splitDepth; - @Schema(description ="LimitDouleSplit") - private boolean limitDouleSplit; - @Schema(description ="DoubleSplitWidth") - private int doubleSplitWidth; - @Schema(description ="DoubleSplitLength") - private int doubleSplitLength; - @Schema(description ="SplitBlockSeqIds") - private String splitBlockSeqIds; - @Schema(description ="UseDianZiJuMethod") - private boolean useDianZiJuMethod; - @Schema(description ="DisposeCutBlock") - private boolean disposeCutBlock; - @Schema(description ="ThroughModelSkewCutLength") - private int throughModelSkewCutLength; - @Schema(description ="UseNewSort") - private boolean useNewSort; - @Schema(description ="UseOrgSortInYX") - private boolean useOrgSortInYX; - @Schema(description ="CutBlockInModelFirst") - private boolean cutBlockInModelFirst; - @Schema(description ="LastBoardReplace") - private boolean lastBoardReplace; - @Schema(description ="LastBoardReplaceTime") - private int lastBoardReplaceTime; - @Schema(description ="HelpCutKnifeNo") - private int helpCutKnifeNo; - @Schema(description ="HelpCutKnifeDepth") - private int helpCutKnifeDepth; - @Schema(description ="HelpCutKnifeWaitingCode") - private String helpCutKnifeWaitingCode; - @Schema(description ="HelpCutKnifeWaitingCode2") - private String helpCutKnifeWaitingCode2; - @Schema(description ="UseSecodeKnifeBlockName") - private String useSecodeKnifeBlockName; - @Schema(description ="UseSecondKnifeBlockWidth") - private int useSecondKnifeBlockWidth; - @Schema(description ="UseSecondKnifeBlockLength") - private int useSecondKnifeBlockLength; - @Schema(description ="UseSameKnifeToHelpCut") - private boolean useSameKnifeToHelpCut; - @Schema(description ="UseSameKnifeToHelpCutGap") - private int useSameKnifeToHelpCutGap; - @Schema(description ="UseNewKnifeModule") - private boolean useNewKnifeModule; - @Schema(description ="KnifeIDForHole") - private int knifeIDForHole; - @Schema(description ="Knifes4Hole") - private String knifes4Hole; - @Schema(description ="ModelKnifeGroup") - private List modelKnifeGroup; - @Schema(description ="KnifeList") - private List knifeList; - @Schema(description ="ExportOrderPathName") - private String exportOrderPathName; - @Schema(description ="ExportBoardPathName") - private String exportBoardPathName; - @Schema(description ="BoardFileA") - private String boardFileA; - @Schema(description ="BoardFileB") - private String boardFileB; - @Schema(description ="BlockFile") - private String blockFile; - @Schema(description ="NcFileHead") - private String ncFileHead; - @Schema(description ="NcFileEnd") - private String ncFileEnd; - @Schema(description ="NcFileHead_B") - private String ncFileHead_B; - @Schema(description ="NcFileEnd_B") - private String ncFileEnd_B; - @Schema(description ="NcFileHead_Block") - private String ncFileHead_Block; - @Schema(description ="NcFileEnd_Block") - private String ncFileEnd_Block; - @Schema(description ="RegularBlockFilletCurve") - private boolean regularBlockFilletCurve; - @Schema(description ="UnregularBlockFilletCurve") - private boolean unregularBlockFilletCurve; - @Schema(description ="DealCircleWithIJ") - private boolean dealCircleWithIJ; - @Schema(description ="IsTurnOverG2G3") - private boolean isTurnOverG2G3; - @Schema(description ="ArcLineMaxLength") - private int arcLineMaxLength; - @Schema(description ="AllowNCComments") - private boolean allowNCComments; - @Schema(description ="AllowAddGcodeEndChar") - private boolean allowAddGcodeEndChar; - @Schema(description ="GcodeEndChar") - private String gcodeEndChar; - @Schema(description ="NcFileIsGB2312") - private boolean ncFileIsGB2312; - @Schema(description ="NcFileIsUtfBom") - private boolean ncFileIsUtfBom; - @Schema(description ="AllowExportNC_BackFace") - private boolean allowExportNC_BackFace; - @Schema(description ="OneBoardFile") - private boolean oneBoardFile; - @Schema(description ="AllowExportNC_block") - private boolean allowExportNC_block; - @Schema(description ="AllowExportDataFile") - private boolean allowExportDataFile; - @Schema(description ="AllowExportBoardDxf") - private boolean allowExportBoardDxf; - private boolean isNcSimpleXYZ; - private boolean showTwoWorkSpace; - private boolean showChooseCutKnife; - private boolean showPriorFacing; - private boolean showAutoLoadBoard; - private boolean showHoleGroup; - private boolean showAutoNotePrinter; - private boolean showCustomBlockNo; - private boolean showMachine; - @Schema(description ="AllowDoubleWorkSpace") - private boolean allowDoubleWorkSpace; - @Schema(description ="SameOriginPointPosition") - private boolean sameOriginPointPosition; - @Schema(description ="OffsetX_WorkNum2") - private int offsetX_WorkNum2; - @Schema(description ="OffsetY_WorkNum2") - private int offsetY_WorkNum2; - @Schema(description ="OriginPointPosition2") - private int originPointPosition2; - @Schema(description ="WidthSideAxis2") - private int widthSideAxis2; - @Schema(description ="LengthSideAxis2") - private int lengthSideAxis2; - @Schema(description ="LocatorPosition2") - private int locatorPosition2; - @Schema(description ="OffsetX_Board2") - private int offsetX_Board2; - @Schema(description ="OffsetY_Board2") - private int offsetY_Board2; - @Schema(description ="AllowCombineNCWithDoubleWorkSpace") - private boolean allowCombineNCWithDoubleWorkSpace; - @Schema(description ="CombineNCFileName") - private String combineNCFileName; - @Schema(description ="IsOddNumInWorkSpace1") - private boolean isOddNumInWorkSpace1; - @Schema(description ="IsHoleBlockInSpace1") - private boolean isHoleBlockInSpace1; - @Schema(description ="NcFileHead_WorkSpace2") - private String ncFileHead_WorkSpace2; - @Schema(description ="NcFileEnd_WorkSpace2") - private String ncFileEnd_WorkSpace2; - @Schema(description ="NcFileHead_B_WorkSpace2") - private String ncFileHead_B_WorkSpace2; - @Schema(description ="NcFileEnd_B_WorkSpace2") - private String ncFileEnd_B_WorkSpace2; - @Schema(description ="AllowChangeCutKnifeWithThickness") - private boolean allowChangeCutKnifeWithThickness; - @Schema(description ="AllowChangeCutKnifeWidthID") - private boolean allowChangeCutKnifeWidthID; - @Schema(description ="BoardKnifeList") - private List boardKnifeList; - @Schema(description ="IsPriorFacing_RoleNum") - private int isPriorFacing_RoleNum; - @Schema(description ="DisPloseHoleRole") - private boolean disPloseHoleRole; - @Schema(description ="IsIgnore_HolingModeling") - private boolean isIgnore_HolingModeling; - @Schema(description ="IsForceHoling_MultiSide_Minimum") - private boolean isForceHoling_MultiSide_Minimum; - @Schema(description ="IgnoreValue_MultiSide_Minimum") - private int ignoreValue_MultiSide_Minimum; - @Schema(description ="IsForceHoling_SingleSide_Minimum") - private boolean isForceHoling_SingleSide_Minimum; - @Schema(description ="IgnoreValue_SingleSide_Minimum") - private int ignoreValue_SingleSide_Minimum; - @Schema(description ="IsForceHoling_SingleSide_Maximum") - private boolean isForceHoling_SingleSide_Maximum; - @Schema(description ="IgnoreValue_SingleSide_Maximum") - private int ignoreValue_SingleSide_Maximum; - @Schema(description ="IsForceHoling_MultiSide_Maximun") - private boolean isForceHoling_MultiSide_Maximun; - @Schema(description ="IgnoreValue_MultiSide_Maximun") - private int ignoreValue_MultiSide_Maximun; - @Schema(description ="IsForceHoling_UnRegularBlock") - private boolean isForceHoling_UnRegularBlock; - @Schema(description ="IsForceHoling_HasModel") - private boolean isForceHoling_HasModel; - @Schema(description ="IsIgnore_Modeling") - private boolean isIgnore_Modeling; - private boolean doModel_hasModel; - private boolean doModel_UnRegular; - private boolean doModel_twoSmall; - private int doModel_twoSmall_Value; - private boolean doModel_oneSmall; - private int doModel_oneSmall_Value; - private boolean doModel_twoBig; - private int doModel_twoBig_Value; - private boolean doModel_oneBig; - private int doModel_oneBig_Value; - @Schema(description ="AllowChangeIgnore") - private boolean allowChangeIgnore; - @Schema(description ="IsFoceModeling_hasModel") - private boolean isFoceModeling_hasModel; - @Schema(description ="IsFoceModeling_SameHoling") - private boolean isFoceModeling_SameHoling; - @Schema(description ="IsFoceModeling_MultiLine") - private boolean isFoceModeling_MultiLine; - @Schema(description ="IsForceModeling_Arc") - private boolean isForceModeling_Arc; - @Schema(description ="IsForceModeling_Through") - private boolean isForceModeling_Through; - @Schema(description ="IsPriorFacing_KaiLiaoMian") - private boolean isPriorFacing_KaiLiaoMian; - @Schema(description ="IsPriorFacing_Reverse") - private boolean isPriorFacing_Reverse; - @Schema(description ="IsPriorFacing_SingleModel") - private boolean isPriorFacing_SingleModel; - @Schema(description ="IsPriorFacing_SingleModel_Front") - private boolean isPriorFacing_SingleModel_Front; - @Schema(description ="IsPriorFacing_DoubleModel") - private boolean isPriorFacing_DoubleModel; - @Schema(description ="IsPriorFacing_DoubleModel_Front") - private boolean isPriorFacing_DoubleModel_Front; - @Schema(description ="IsPriorFacing_SingleHole") - private boolean isPriorFacing_SingleHole; - @Schema(description ="IsPriorFacing_SingleHole_Front") - private boolean isPriorFacing_SingleHole_Front; - @Schema(description ="IsPriorFacing_BigHole") - private boolean isPriorFacing_BigHole; - @Schema(description ="IsPriorFacing_BigHole_Front") - private boolean isPriorFacing_BigHole_Front; - @Schema(description ="IsPriorFacing_DoubleHole") - private boolean isPriorFacing_DoubleHole; - @Schema(description ="IsPriorFacing_DoubleHole_More") - private boolean isPriorFacing_DoubleHole_More; - @Schema(description ="IsPriorFacing_CustomFunction") - private String isPriorFacing_CustomFunction; - private int wr6_OverRun_WdthS; - private int wr6_OverRun_WdthE; - private int wr6_OverRun_LengthS; - private int wr6_OverRun_LengthE; - private boolean wr6_OverRun_hasThroghModel; - private int wr6_OverRun_hasThroghModel_r; - private int wr6_OverRun_hasThroghModel_size; - private boolean wr6_OverRun_UnRegular; - private boolean wr6_OverRun_hasCorner; - private int wr6_OverRun_MaxChamferR; - private int wr6_OverRun_MaxInnerLength; - private boolean wr6_OverRun_hasOneRightAngle; - private boolean wr6_OverRun_hasOneBorder; - private String wr6_OverRun_WorkGroups; - private String wr6_OverRun_BlockNames; - private boolean wr6_unModel_all; - private boolean wr6_unModel_isThrogh; - private boolean wr6_unModel_isArc; - private boolean wr6_unModel_hasMulLines; - private boolean wr6_unModel_checkRadius; - private String wr6_unModel_isRadius; - private boolean wr6_unModel_checkName; - private String wr6_unModel_isName; - private boolean wr6_unModel_checkDepth; - private String wr6_unModel_isDepth; - private boolean wr6_unModel_isVKnifeModel; - private boolean wr6_unModel_is3VModell; - private boolean wr6_unModel_isLaChao; - private boolean wr6_unModel_notLaChao; - private int wr6_laChao_maxWidth; - private int wr6_lachao_minLength; - private boolean wr6_unHole_all; - private boolean wr6_unHole_checkRadius; - private String wr6_unHole_isRadius; - private boolean wr6_unHole_checkType; - private String wr6_unHole_isType; - private boolean wr6_unHole_checkDepth; - private String wr6_unHole_isDepth; - private boolean wr6_unHole_isThrogh; - private boolean wr6_unHole_isNoHoleKnife; - private boolean wr6_dragUndo_m2m; - private boolean wr6_dragUndo_m2m_2face; - private boolean wr6_dragUndo_m2h; - private boolean wr6_dragUndo_m2h_2face; - private boolean wr6_dragUndo_h2m; - private boolean wr6_dragUndo_h2m_2face; - private boolean wr6_dragUndo_h2h; - private boolean wr6_dragUndo_h2h_2face; - private boolean wr6_cncDo_modelR; - private String wr6_cncDo_modelR_str; - private boolean wr6_cncDo_modelD; - private String wr6_cncDo_modelD_str; - private boolean wr6_cncDo_holeR; - private String wr6_cncDo_holeR_str; - private boolean wr6_cncDo_holeD; - private String wr6_cncDo_holeD_str; - private int wr6_doStyle_1Face; - private boolean wr6_doStyle_1Face_hole; - private boolean wr6_doStyle_1Face_model; - private boolean wr6_doStyle_1Face_face; - private boolean wr6_doStyle_1Face_pbm; - private boolean wr6_doStyle_1Face_sideHole; - private int wr6_doStyle_2Face; - private boolean wr6_doStyle_2Face_hole; - private boolean wr6_doStyle_2Face_model; - private String wr6_doStyle_2Face_role; - private String wr6_turnFace_roleSeq; - private boolean wr6_CustomFun_use; - private String wr6_CustomFun_text; - @Schema(description ="AllowHoleToModel") - private boolean allowHoleToModel; - @Schema(description ="HoleToModelKnifes") - private List holeToModelKnifes; - @Schema(description ="IsLoadBoardBeforeFileHead") - private boolean isLoadBoardBeforeFileHead; - @Schema(description ="NcLoadBoard") - private String ncLoadBoard; - @Schema(description ="NcFileHoleBegin") - private String ncFileHoleBegin; - @Schema(description ="NcFileHoleEnd") - private String ncFileHoleEnd; - @Schema(description ="HolingByKnifeDia") - private boolean holingByKnifeDia; - @Schema(description ="NoteAutoPrinter") - private boolean noteAutoPrinter; - @Schema(description ="NoteAutoPrinterScrapBorad") - private boolean noteAutoPrinterScrapBorad; - @Schema(description ="NoteNcName") - private String noteNcName; - @Schema(description ="NotePicName") - private String notePicName; - @Schema(description ="NotePicType") - private String notePicType; - @Schema(description ="NotePicBit") - private String notePicBit; - @Schema(description ="NotePrintOnFaceA") - private boolean notePrintOnFaceA; - @Schema(description ="NotePositionAvoidHole") - private boolean notePositionAvoidHole; - @Schema(description ="NoteWidth") - private int noteWidth; - @Schema(description ="NOteHeight") - private int nOteHeight; - @Schema(description ="NoteContent") - private String noteContent; - @Schema(description ="NotePushInNcFile") - private boolean notePushInNcFile; - @Schema(description ="NoteGB2312") - private boolean noteGB2312; - @Schema(description ="NoteUtf8Bom") - private boolean noteUtf8Bom; - @Schema(description ="NoteOtherExport") - private boolean noteOtherExport; - @Schema(description ="NoteOtherFun") - private String noteOtherFun; - @Schema(description ="AllowBlockNo_Note") - private boolean allowBlockNo_Note; - @Schema(description ="BlockNo_Note") - private String blockNo_Note; - @Schema(description ="BoardName") - private String boardName; - @Schema(description ="MinBlockWidth") - private int minBlockWidth; - @Schema(description ="MinHoleRadius") - private int minHoleRadius; - @Schema(description ="MinHoleDepth") - private int minHoleDepth; - @Schema(description ="MinModelDepth") - private int minModelDepth; - @Schema(description ="MinModelRadius") - private int minModelRadius; - @Schema(description ="MaxBorderThickness") - private int maxBorderThickness; - @Schema(description ="Ignore2in1SideHole") - private boolean ignore2in1SideHole; - @Schema(description ="Ignore2in1SideHoleGap") - private double ignore2in1SideHoleGap; - private boolean canReloadPlaceInfo; - @Schema(description ="MiniumSpaceSize") - private int miniumSpaceSize; - @Schema(description ="NeatenSpaceGap") - private int neatenSpaceGap; - @Schema(description ="ResetPositionWithLocator") - private boolean resetPositionWithLocator; - @Schema(description ="NcNumberFixNumber") - private int ncNumberFixNumber; - @Schema(description ="NcFileRemoveEmptyLine") - private boolean ncFileRemoveEmptyLine; - @Schema(description ="HoleWaitingCode") - private String holeWaitingCode; - private int prevRunActionCount; - @Schema(description ="ShearBorderFaceA") - private boolean shearBorderFaceA; - @Schema(description ="DelayDoCountBeforeChangeKnife") - private int delayDoCountBeforeChangeKnife; - @Schema(description ="DelayCodeBeforeChangeKnife") - private String delayCodeBeforeChangeKnife; - @Schema(description ="UseBoardFaceZ") - private boolean useBoardFaceZ; - @Schema(description ="PushNcLineIDStr") - private PushNcLineIDStrBean pushNcLineIDStr; - @Schema(description ="ReverseModelPoints") - private boolean reverseModelPoints; - @Schema(description ="DisPoseModelInBoardBorderWidth") - private int disPoseModelInBoardBorderWidth; - @Schema(description ="DisPoseModelInBoardFace") - private int disPoseModelInBoardFace; - @Schema(description ="DisPoseModelInBoardBorderForCNC") - private boolean disPoseModelInBoardBorderForCNC; - @Schema(description ="DisPoseModelInBoardReverse") - private boolean disPoseModelInBoardReverse; - @Schema(description ="EnableFaceWithDoingRate") - private boolean enableFaceWithDoingRate; - @Schema(description ="EnableFaceByCncDoing") - private boolean enableFaceByCncDoing; - @Schema(description ="DoingRate") - private int doingRate; - @Schema(description ="PerHoleTime") - private double perHoleTime; - @Schema(description ="PerModelTime") - private int perModelTime; - @Schema(description ="EnableNotePrintAutoPosition") - private boolean enableNotePrintAutoPosition; - @Schema(description ="EnabaleModelOutSize") - private boolean enabaleModelOutSize; - @Schema(description ="Enable2VModelOutSize") - private boolean enable2VModelOutSize; - @Schema(description ="OverlapGap") - private double overlapGap; - @Schema(description ="EnableUnPlacedBlockWithABoard") - private boolean enableUnPlacedBlockWithABoard; - @Schema(description ="UnregularSizeLimit") - private int unregularSizeLimit; - @Schema(description ="ManagerPassword") - private String managerPassword; - @Schema(description ="Remark") - private String remark; - @Schema(description ="EnableRectScrapBlock") - private boolean enableRectScrapBlock; - @Schema(description ="RectScrapBlockFlag") - private int rectScrapBlockFlag; - @Schema(description ="EnableShatterWaste") - private boolean enableShatterWaste; - @Schema(description ="ShatterWastelenth") - private int shatterWastelenth; - @Schema(description ="ShatterWasteRetain") - private double shatterWasteRetain; - @Schema(description ="NcFileBeginCutBlock") - private String ncFileBeginCutBlock; - @Schema(description ="NcFileEndCutBlock") - private String ncFileEndCutBlock; - private String wr6_cncDo_BlockNames; - private String wr6_cncDo_WorkGroups; - private boolean wr6_cncDo_model_wc; - private boolean wr6_cncDo_hole_wc; - @Schema(description ="ModelPointControl") - private int modelPointControl; - @Schema(description ="ModelCutRedundancy") - private int modelCutRedundancy; - @Schema(description ="WebQueryPageSize") - private int webQueryPageSize; - @Schema(description ="ExportRootPath") - private String exportRootPath; - @Schema(description ="AllowSelectExportPath") - private boolean allowSelectExportPath; - @Schema(description ="AllowExportImage") - private boolean allowExportImage; - @Schema(description ="ManualSortingCornerWidth") - private int manualSortingCornerWidth; - @Schema(description ="AllowOppositeDealChuanHole") - private boolean allowOppositeDealChuanHole; - @Schema(description ="UseSecodeKnifeBlockNames") - private Object useSecodeKnifeBlockNames; - - @NoArgsConstructor - @Data - public static class PushNcLineIDStrBean { - private boolean enable; - private int beginLine; - private int endLine; - private boolean ignoreEmptyLine; - private String format; - private int lineID; - } - - @NoArgsConstructor - @Data - public static class KnifeListBean { - @Schema(description ="KnifeID") - private int knifeID; - @Schema(description ="KnifeName") - private String knifeName; - @Schema(description ="AxleID") - private int axleID; - @Schema(description ="AllowCut") - private boolean allowCut; - @Schema(description ="AllowHole") - private boolean allowHole; - @Schema(description ="AllowModel") - private boolean allowModel; - @Schema(description ="AllowPrevRun") - private boolean allowPrevRun; - @Schema(description ="Diameter") - private int diameter; - @Schema(description ="Diameter2") - private int diameter2; - @Schema(description ="Length") - private int length; - @Schema(description ="GroupType") - private String groupType; - @Schema(description ="OffsetX") - private int offsetX; - @Schema(description ="OffsetY") - private int offsetY; - @Schema(description ="OffsetZ") - private int offsetZ; - @Schema(description ="VKnifAngle") - private int vKnifAngle; - @Schema(description ="Speed") - private int speed; - @Schema(description ="PushDepthIncres") - private String pushDepthIncres; - @Schema(description ="RunCode") - private String runCode; - @Schema(description ="SwitchCode") - private String switchCode; - @Schema(description ="StopCode") - private String stopCode; - @Schema(description ="IsAdvanceHole") - private boolean isAdvanceHole; - @Schema(description ="RePlaceKnifeID") - private int rePlaceKnifeID; - @Schema(description ="AdvanceHoleCode") - private String advanceHoleCode; - @Schema(description ="AdvanceHolePoints") - private List advanceHolePoints; - @Schema(description ="IsAdvanceHoleGroup") - private boolean isAdvanceHoleGroup; - @Schema(description ="IsOutBlockDown") - private boolean isOutBlockDown; - } - } - } - - @NoArgsConstructor - @Data - public static class BlockListBean { - @Schema(description ="RoomName") - private String roomName; - @Schema(description ="BoxName") - private String boxName; - @Schema(description ="OrderNo") - private long orderNo; - @Schema(description ="BlockID") - private int blockID; - @Schema(description ="GoodsID") - private int goodsID; - @Schema(description ="OldBlockID") - private int oldBlockID; - @Schema(description ="BlockNo") - private long blockNo; - @Schema(description ="NoteNo") - private String noteNo; - @Schema(description ="BlockName") - private String blockName; - @Schema(description ="Width") - private int width; - @Schema(description ="Length") - private int length; - @Schema(description ="Thickness") - private int thickness; - @Schema(description ="Area") - private double area; - @Schema(description ="IsHXDJX") - private boolean isHXDJX; - @Schema(description ="BorderLeft") - private int borderLeft; - @Schema(description ="BorderRight") - private int borderRight; - @Schema(description ="BorderUpper") - private int borderUpper; - @Schema(description ="BorderUnder") - private int borderUnder; - @Schema(description ="Wave") - private int wave; - @Schema(description ="PaiKong") - private int paiKong; - @Schema(description ="BorderLengthLight") - private int borderLengthLight; - @Schema(description ="BorderLengthHeavy") - private int borderLengthHeavy; - @Schema(description ="RemarkJson") - private String remarkJson; - @Schema(description ="CadDataType") - private int cadDataType; - @Schema(description ="ProcessGroupName") - private String processGroupName; - @Schema(description ="Type") - private String type; - @Schema(description ="OpenDoorType") - private int openDoorType; - @Schema(description ="ExtraRemark") - private BlockListBean.ExtraRemarkBean extraRemark; - @Schema(description ="ItemID") - private int itemID; - @Schema(description ="IsUnRegular") - private boolean isUnRegular; - @Schema(description ="IsModel") - private boolean isModel; - @Schema(description ="BoxGroupNumber") - private int boxGroupNumber; - @Schema(description ="BoxNumber") - private int boxNumber; - @Schema(description ="BoxMultNumber") - private int boxMultNumber; - - @NoArgsConstructor - @Data - public static class ExtraRemarkBean { - private ExtraBean extra; - - @NoArgsConstructor - @Data - public static class ExtraBean { - private String boardType; - private int throughHoleCount; - private int throughModelCount; - private boolean has2DModel; - private boolean has3DModel; - private String composingFace; - private List processList; - } - } - } - - @NoArgsConstructor - @Data - public static class BlockDetailListBean { - @Schema(description ="ID") - private int iD; - @Schema(description ="OrderNo") - private long orderNo; - @Schema(description ="PointDetail") - private List pointDetail; - @Schema(description ="ModelDetail") - private List modelDetail; - @Schema(description ="HoleDetail") - private List holeDetail; - @Schema(description ="OffSet") - private BlockDetailListBean.OffSetBean offSet; - @Schema(description ="NewVersion") - private boolean newVersion; - @Schema(description ="OrgPointDetail") - private List orgPointDetail; - @Schema(description ="KaiLiaoSize") - private BlockDetailListBean.KaiLiaoSizeBean kaiLiaoSize; - @Schema(description ="SideModelDetail") - private List sideModelDetail; - @Schema(description ="SideHoleDetail") - private List sideHoleDetail; - - @NoArgsConstructor - @Data - public static class OffSetBean { - private int x; - private int y; - private int z; - } - - @NoArgsConstructor - @Data - public static class KaiLiaoSizeBean { - private int width; - private int height; - } - } -} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index ba59098a9..0fe435075 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -830,7 +830,7 @@ public class PackServiceImpl implements PackService { if (orderItemDoPartsList.isEmpty()) { OrderDO orderDO = ordersMapper.selectById(reqVO.getOrderId()); orderDO.setPackaged(OrderPackageStatusEnum.PACKAGED.getStatus()); - if(orderPlanApi.getOrder(reqVO.getOrderId()).getData()){ + if(Boolean.TRUE.equals(orderPlanApi.getOrder(reqVO.getOrderId()).getData())){ orderDO.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus()); } ordersMapper.updateById(orderDO); 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 6fe97cd6b..92200f4b4 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 @@ -298,7 +298,7 @@ public class ErrorCodeConstants { //=========== 断言提示信息 1-002-041-000 ============ public static final ErrorCode ORDER_DATE_ERROR = new ErrorCode(1_002_041_001, "生产单信息不存在，请重新进入或切换生产单"); - public static final ErrorCode ORDER_PLATE_ERROR = new ErrorCode(1_002_041_002, "生产单对应的板材数据有异常，请查看板材信息或联系客服"); + public static final ErrorCode ORDER_PLATE_ERROR = new ErrorCode(1_002_041_002, "生产单对应的板材数据为空，请检查是否为空单或重新导入生产单，或联系客服"); public static final ErrorCode INSERT_PLATE_DATE_ERROR = new ErrorCode(1_002_041_003, "新增排单的板材数据有误，请重新新增"); public static final ErrorCode ORDER_PLAN_DATE_ERROR = new ErrorCode(1_002_041_004, "排单信息不存在，请重新进入或切换排单"); public static final ErrorCode ORDER_PLAN_OPTIMIZE_ERROR = new ErrorCode(1_002_041_005, "排单的优化数据异常，请将该排单重新优化"); @@ -321,6 +321,9 @@ public class ErrorCodeConstants { public static final ErrorCode ORDER_PACK_DATA_ERROR = new ErrorCode(1_002_041_019, "当前包裹信息有误，请重新选择包裹"); public static final ErrorCode PLAN_BODY_DATA_ERROR = new ErrorCode(1_002_041_019, "当前排单的生产单对应的柜体数据异常，请查看柜体数据或联系客服"); public static final ErrorCode CREATE_PLAN_DATA_ERROR = new ErrorCode(1_002_041_020, "排单优化数据异常，请重新进行优化或者删除排单然后重新创建排单"); + public static final ErrorCode PLAN_MIXED_ORDER_ERROR = new ErrorCode(1_002_041_021, "当前选择的混排板材条件不相同，无法混排，请重新选择板材进行排单！"); + public static final ErrorCode BRANCHING_SETTING_ERROR = new ErrorCode(1_002_041_022, "当前分线配置有误，请重新进行保存"); + public static final ErrorCode BRANCHING_DEFAULT_SETTING_ERROR = new ErrorCode(1_002_041_023, "当前组织智能分线无默认配置，请进行配置"); @@ -338,6 +341,10 @@ public class ErrorCodeConstants { //=========== 用户的系统配置 1-002-039-000 ============ public static final ErrorCode CURRENTLY_NO_CONFIGURATION_AVAILABLE = new ErrorCode(1_002_039_001, "当前没有{}配置信息，请前往设置配置"); + public static final ErrorCode BRANCHING_SETTING_NAME_REPEAT = new ErrorCode(1_002_039_002, "分线配置名称重复，请重新设置"); + public static final ErrorCode BRANCHING_SETTING_RULE_SAVE_CHECK_ERROR = new ErrorCode(1_002_039_003, "智能分线配置保存解析失败，数据有误，请检查配置规则或联系客服"); + public static final ErrorCode BRANCHING_SETTING_SAVE_ERROR = new ErrorCode(1_002_039_004, "智能分线配置为空，请添加配置"); + public static final ErrorCode BRANCHING_SETTING_COUNT_ERROR = new ErrorCode(1_002_039_005, "智能分线配置机台数量必须大于2才能保存"); //=========== 系统配置 1-002-040-000 ============ public static final ErrorCode SYSTEM_CONFIG_NOT_EXISTS = new ErrorCode(1_002_040_001, "系统配置不存在"); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/setting/SettingApiImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/setting/SettingApiImpl.java index df00d986b..6886c1eda 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/setting/SettingApiImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/setting/SettingApiImpl.java @@ -6,7 +6,7 @@ import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.module.system.api.setting.dto.PackageConfigDTO; import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO; -import com.cf.imes.module.system.dal.mysql.setting.SettingMapper; +import com.cf.imes.module.system.dal.mysql.setting.PackageConfigMapper; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -22,7 +22,7 @@ public class SettingApiImpl implements SettingApi{ @Resource - private SettingMapper settingMapper; + private PackageConfigMapper packageConfigMapper; @Override @@ -30,7 +30,7 @@ public class SettingApiImpl implements SettingApi{ LoginUser loginUser = getLoginUser(); assert loginUser != null; - PackageConfigDO packageConfigDO = settingMapper.selectSetting(type, loginUser.getId(), loginUser.getOrganId()); + PackageConfigDO packageConfigDO = packageConfigMapper.selectSetting(type, loginUser.getId(), loginUser.getOrganId()); if(packageConfigDO == null){ throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE,type == 1 ? UserSettingTypeEnum.PREPACKAGED.getName(): UserSettingTypeEnum.PACKAGED.getName()); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java index 48aa99c51..57dc0a6f4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/SettingController.java @@ -2,8 +2,11 @@ package com.cf.imes.module.system.controller.admin.setting; import com.cf.imes.framework.common.pojo.CommonResult; +import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.controller.admin.setting.vo.PackageConfigReqVO; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigRespVO; import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO; +import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO; import com.cf.imes.module.system.service.setting.SettingService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -16,7 +19,7 @@ import javax.annotation.Resource; import static com.cf.imes.framework.common.pojo.CommonResult.success; -@Tag(name = "管理后台 - 系统配置") +@Tag(name = "管理后台 - 系统打包配置") @RestController @RequestMapping("/system/setting") @Validated @@ -29,7 +32,7 @@ public class SettingController { @PutMapping("/insert") - @Operation(summary = "新增系统配置") + @Operation(summary = "新增打包系统配置") //@PreAuthorize("@ss.hasPermission('system:data-source:query')") public CommonResult insertSetting( @RequestBody PackageConfigReqVO reqVO ) { @@ -41,7 +44,7 @@ public class SettingController { @PostMapping("/update") - @Operation(summary = "更新系统配置") + @Operation(summary = "更新打包系统配置") //@PreAuthorize("@ss.hasPermission('system:data-source:query')") public CommonResult updateSetting( @RequestBody PackageConfigReqVO reqVO ) { @@ -52,15 +55,22 @@ public class SettingController { @GetMapping("/select") - @Operation(summary = "查看当前用户的配置信息") + @Operation(summary = "查看当前用户的打包配置信息") @Parameter(name = "type", description = "配置类型", required = true) public CommonResult selectSetting(@RequestParam("type") Integer type ) { return success(settingService.selectSetting(type)); + } + + + @GetMapping("/selectDefault") + @Operation(summary = "获取默认的智能分线配置") + public CommonResult selectDefaultBranching() { + SystemConfigDO systemConfigDO = settingService.selectDefaultBranching(); + return success(BeanUtils.toBean(systemConfigDO, ConfigRespVO.class)); } - } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java index 3f96f78a7..dc2b11a16 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/SystemConfigController.java @@ -3,22 +3,14 @@ package com.cf.imes.module.system.controller.admin.systemconfig; 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.systemconfig.vo.ConfigPageReqVO; -import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigRespVO; -import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigSaveReqVO; -import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigUpdateStatusReqVO; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.*; import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO; import com.cf.imes.module.system.service.config.SystemConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; @@ -70,4 +62,14 @@ public class SystemConfigController { systemConfigService.modifySystemConfig(reqVO); return success(true); } + + @DeleteMapping("") + @Operation(summary = "删除系统配置") + @PreAuthorize("@ss.hasPermission('system:base-setting:setting')") + public CommonResult deleteSystemConfig(@Valid @RequestBody ConfigDeleteReqVO reqVO) { + systemConfigService.deleteSystemConfig(reqVO); + return success(true); + } + + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigDeleteReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigDeleteReqVO.java new file mode 100644 index 000000000..1145a222c --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigDeleteReqVO.java @@ -0,0 +1,24 @@ +package com.cf.imes.module.system.controller.admin.systemconfig.vo; + + +import com.cf.imes.module.system.validation.config.SystemConfigTypeEnumValid; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Schema(description = "管理后台 - 基础配置删除 Request VO") +@Data +public class ConfigDeleteReqVO { + + @Schema(description = "基础配置编号", example = "1") + @NotNull(message = "系统配置编号不能为空") + private Long id; + + + @Schema(description = "配置类型：1 自定义板编号,2 智能分线,3 高级筛选'", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "配置类型不能为空") + @SystemConfigTypeEnumValid + private Integer type; + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigSaveReqVO.java index f86c6ee8b..625b461d6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigSaveReqVO.java @@ -25,7 +25,7 @@ public class ConfigSaveReqVO { @Size(max = 64, message = "基础配置名称长度不能超过 64 个字符") private String name; - @Schema(description = "配置类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "配置类型：1 自定义板编号,2 智能分线,3 高级筛选'", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "配置类型不能为空") @SystemConfigTypeEnumValid private Integer type; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigUpdateStatusReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigUpdateStatusReqVO.java index 16789c537..9f6b71f0d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigUpdateStatusReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigUpdateStatusReqVO.java @@ -20,7 +20,7 @@ public class ConfigUpdateStatusReqVO { @NotNull(message = "系统配置编号不能为空") private Long id; - @Schema(description = "状态，见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "状态，见 CommonStatusEnum 枚举（0启用1禁用） ", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "状态不能为空") @CommonStatus private Integer status; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/SettingMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java similarity index 92% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/SettingMapper.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java index 0cb6d3e8e..c0b377b43 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/SettingMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/setting/PackageConfigMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper -public interface SettingMapper extends BaseMapperX { +public interface PackageConfigMapper extends BaseMapperX { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/systemconfig/SystemConfigMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/systemconfig/SystemConfigMapper.java index fd6dffed1..851241e3e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/systemconfig/SystemConfigMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/systemconfig/SystemConfigMapper.java @@ -1,13 +1,17 @@ package com.cf.imes.module.system.dal.mysql.systemconfig; +import com.cf.imes.framework.common.enums.CommonStatusEnum; 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.framework.organ.core.context.OrganContextHolder; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigPageReqVO; import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO; +import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 系统配置 Mapper * @@ -31,4 +35,25 @@ public interface SystemConfigMapper extends BaseMapperX { .select(SystemConfigDO::getId, SystemConfigDO::getName, SystemConfigDO::getStatus, SystemConfigDO::getType) .orderByAsc(SystemConfigDO::getId)); } + + + default SystemConfigDO selectDefaultBranching() { + return selectOne(new LambdaQueryWrapperX() + .eqIfPresent(SystemConfigDO::getOrganId, OrganContextHolder.getOrganId()) + .eq(SystemConfigDO::getDeleted,false) + .eq(SystemConfigDO::getType, SystemConfigTypeEnum.INTELLIGENT_BRANCH.getType()) + .eq(SystemConfigDO::getStatus, CommonStatusEnum.ENABLE.getStatus())); + } + + + + default List selectSystemConfigList(Integer type,Integer status) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(SystemConfigDO::getOrganId, OrganContextHolder.getOrganId()) + .eq(SystemConfigDO::getDeleted,false) + .eq(SystemConfigDO::getType, type) + .eqIfPresent(SystemConfigDO::getStatus,status)); + } + + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigService.java index 4f9629001..2c4273ea3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigService.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.service.config; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigDeleteReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigPageReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigSaveReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigUpdateStatusReqVO; @@ -49,4 +50,7 @@ public interface SystemConfigService { * @return */ SystemConfigCopyDO getOrgCustomPlateNoConfig(); + + void deleteSystemConfig(ConfigDeleteReqVO reqVO); + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigServiceImpl.java index efff050ac..1e09ad0bf 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/SystemConfigServiceImpl.java @@ -8,6 +8,7 @@ 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.framework.organ.core.context.OrganContextHolder; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigDeleteReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigPageReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigSaveReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigUpdateStatusReqVO; @@ -72,6 +73,8 @@ public class SystemConfigServiceImpl implements SystemConfigService { systemConfigDO = validateSystemConfigExists(id); // 覆盖配置 systemConfigDO.setSetting(reqVO.getSetting()); + // 覆盖名称 + systemConfigDO.setName(reqVO.getName()); // 更新 systemConfigMapper.updateById(systemConfigDO); } else { @@ -113,6 +116,16 @@ public class SystemConfigServiceImpl implements SystemConfigService { } } + + @Override + public void deleteSystemConfig(ConfigDeleteReqVO reqVO) { + validateSystemConfigExists(reqVO.getId()); + // 根据配置类型选择对应的service + AbstractSystemConfigServiceHandler configService = configServiceFactory.getConfigServiceHandler(reqVO.getType()); + configService.deleteConfig(reqVO); + + } + /** * 校验基础配置是否存在 * diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/SystemConfigServiceFactory.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/SystemConfigServiceFactory.java index bcab5daf1..09212f8d8 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/SystemConfigServiceFactory.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/SystemConfigServiceFactory.java @@ -4,6 +4,7 @@ import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum; import com.cf.imes.module.system.service.config.factory.service.AbstractSystemConfigServiceHandler; import com.cf.imes.module.system.service.config.factory.service.impl.CustomPlateNoServiceHandler; import com.cf.imes.module.system.service.config.factory.service.impl.DefaultSystemConfigServiceHandler; +import com.cf.imes.module.system.service.config.factory.service.impl.IntellectBranchingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; @@ -34,7 +35,7 @@ public class SystemConfigServiceFactory { case CUSTOM_PLATE_NO: return applicationContext.getBean(CustomPlateNoServiceHandler.class); case INTELLIGENT_BRANCH: - // todo 智能分线 + return applicationContext.getBean(IntellectBranchingService.class); case ADVANCED_SCREEN: // todo 高级筛选 default: diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/AbstractSystemConfigServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/AbstractSystemConfigServiceHandler.java index b47eae7e0..ce7f87ecb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/AbstractSystemConfigServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/AbstractSystemConfigServiceHandler.java @@ -1,6 +1,7 @@ package com.cf.imes.module.system.service.config.factory.service; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigDeleteReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigPageReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigSaveReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigUpdateStatusReqVO; @@ -52,4 +53,14 @@ public abstract class AbstractSystemConfigServiceHandler { * @param reqVO */ public abstract void afterUpdateStatus(SystemConfigDO systemConfigDO, ConfigUpdateStatusReqVO reqVO); + + + /** + * 删除系统配置操作 + * + * @param reqVO + */ + public abstract void deleteConfig(ConfigDeleteReqVO reqVO); + + } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/CustomPlateNoServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/CustomPlateNoServiceHandler.java index 0ab2d94ad..4c67c23a2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/CustomPlateNoServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/CustomPlateNoServiceHandler.java @@ -11,6 +11,7 @@ import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; 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.systemconfig.vo.ConfigDeleteReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigPageReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigSaveReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigUpdateStatusReqVO; @@ -234,4 +235,9 @@ public class CustomPlateNoServiceHandler extends AbstractSystemConfigServiceHand log.info("[CustomPlateNoGenerateService][afterUpdateStatus]key：{}缓存删除结果：{}", redisKey, delete); } } + + @Override + public void deleteConfig(ConfigDeleteReqVO reqVO) { + // TODO document why this method is empty + } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/DefaultSystemConfigServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/DefaultSystemConfigServiceHandler.java index 02ec5e092..441d2a482 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/DefaultSystemConfigServiceHandler.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/DefaultSystemConfigServiceHandler.java @@ -2,6 +2,7 @@ package com.cf.imes.module.system.service.config.factory.service.impl; import cn.hutool.core.util.ObjectUtil; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigDeleteReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigPageReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigSaveReqVO; import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigUpdateStatusReqVO; @@ -59,4 +60,9 @@ public class DefaultSystemConfigServiceHandler extends AbstractSystemConfigServi public void afterUpdateStatus(SystemConfigDO systemConfigDO, ConfigUpdateStatusReqVO reqVO) { // todo afterUpdateStatus } + + @Override + public void deleteConfig(ConfigDeleteReqVO reqVO) { + // TODO document why this method is empty + } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/IntellectBranchingService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/IntellectBranchingService.java new file mode 100644 index 000000000..986929783 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/config/factory/service/impl/IntellectBranchingService.java @@ -0,0 +1,152 @@ +package com.cf.imes.module.system.service.config.factory.service.impl; + + +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.cf.imes.framework.common.enums.CommonStatusEnum; +import com.cf.imes.framework.common.exception.ServiceException; +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.systemconfig.vo.ConfigDeleteReqVO; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigPageReqVO; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigSaveReqVO; +import com.cf.imes.module.system.controller.admin.systemconfig.vo.ConfigUpdateStatusReqVO; +import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO; +import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigMapper; +import com.cf.imes.module.system.service.config.factory.service.AbstractSystemConfigServiceHandler; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; + + +/** + * @author 智能分线生成服务 + */ +@Service("intellectBranchingService") +public class IntellectBranchingService extends AbstractSystemConfigServiceHandler { + + @Resource + private SystemConfigMapper systemConfigMapper; + + + @Override + public PageResult selectPage(ConfigPageReqVO pageReqVO) { + + List systemConfigDOS = systemConfigMapper.selectSystemConfigList(pageReqVO.getType(),null); + + if (systemConfigDOS.isEmpty()){ + return null; + } + + PageResult pageResult = new PageResult<>(); + + pageResult.setList(systemConfigDOS); + + return pageResult; + } + + @Override + public void checkValid(String setting) { + + JSONArray jsonArray = JSON.parseArray(setting); + + for (int i = 0; i < jsonArray.size(); i++) { + + JSONObject jsonObject = jsonArray.getJSONObject(i); + + checkMachineId(jsonObject.getString("machineId")); + checkMachineName(jsonObject.getString("machineName")); + checkMachineConfig(jsonObject.get("machineConfig")); + } + + if(jsonArray.size() < 2){ + throw new ServiceException(BRANCHING_SETTING_COUNT_ERROR); + } + + } + + + @Override + public void beforeSaveConfig(ConfigSaveReqVO reqVO) { + + // todo beforeSaveConfig + } + + + @Override + public void afterSaveConfig(SystemConfigDO systemConfigDO, ConfigSaveReqVO reqVO) { + + List systemConfigDOS = systemConfigMapper.selectSystemConfigList(reqVO.getType(), CommonStatusEnum.ENABLE.getStatus()); + + if(systemConfigDOS.size() > 1){ + systemConfigMapper.update(new LambdaUpdateWrapper() + .eq(SystemConfigDO::getOrganId, OrganContextHolder.getOrganId()) + .eq(SystemConfigDO::getId,systemConfigDO.getId()) + .set(SystemConfigDO::getStatus, CommonStatusEnum.DISABLE.getStatus())); + } + + } + + @Override + public void afterUpdateStatus(SystemConfigDO systemConfigDO, ConfigUpdateStatusReqVO reqVO) { + + systemConfigMapper.update(new LambdaUpdateWrapper() + .eq(SystemConfigDO::getOrganId, OrganContextHolder.getOrganId()) + .eq(SystemConfigDO::getDeleted,false) + .notIn(SystemConfigDO::getId,reqVO.getId()) + .eq(SystemConfigDO::getType, systemConfigDO.getType()) + .set(SystemConfigDO::getStatus, CommonStatusEnum.DISABLE.getStatus())); + + } + + + @Override + public void deleteConfig(ConfigDeleteReqVO reqVO) { + + systemConfigMapper.deleteById(reqVO.getId()); + + } + + + /** + * 校验 机台ID + * + */ + private void checkMachineId(String machineId) { + if (StringUtils.isBlank(machineId)) { + throw new ServiceException(BRANCHING_SETTING_RULE_SAVE_CHECK_ERROR); + } + + } + + /** + * 校验 机台名称 + * + */ + private void checkMachineName(String machineName) { + if (StringUtils.isBlank(machineName)) { + throw new ServiceException(BRANCHING_SETTING_RULE_SAVE_CHECK_ERROR); + } + + } + + /** + * 校验 机台分流条件 + * + */ + private void checkMachineConfig(Object machineConfig) { + if (ObjectUtil.isEmpty(machineConfig)) { + throw new ServiceException(BRANCHING_SETTING_SAVE_ERROR); + } + + } + +} + 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 3c09b2bf5..70caeeb3d 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 @@ -114,7 +114,6 @@ public class MachineTemplateServiceImpl implements MachineTemplateService { @Transactional(rollbackFor = Exception.class) public Boolean updateCuttingTemplate(CuttingTemplateSaveReqVO reqVO) { - // todo 测试时的判断，测试完毕后删除 MachineBrandDO machineBrandDO = machineBrandMapper.selectById(reqVO.getNowBrandId()); if (machineBrandDO == null) { throw exception(THE_CURRENT_BRAND); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingService.java index a0c613b73..ca4abe009 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingService.java @@ -3,7 +3,7 @@ package com.cf.imes.module.system.service.setting; import com.cf.imes.module.system.controller.admin.setting.vo.PackageConfigReqVO; import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO; -import org.springframework.stereotype.Service; +import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO; public interface SettingService { @@ -14,4 +14,6 @@ public interface SettingService { Long updateSetting(PackageConfigReqVO reqVO); PackageConfigDO selectSetting(Integer type); + + SystemConfigDO selectDefaultBranching(); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java index f498ca65b..c0b6ff456 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/setting/SettingServiceImpl.java @@ -2,11 +2,14 @@ package com.cf.imes.module.system.service.setting; import com.cf.imes.framework.common.enums.UserSettingTypeEnum; +import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.module.system.controller.admin.setting.vo.PackageConfigReqVO; import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO; -import com.cf.imes.module.system.dal.mysql.setting.SettingMapper; +import com.cf.imes.module.system.dal.dataobject.systemconfig.SystemConfigDO; +import com.cf.imes.module.system.dal.mysql.setting.PackageConfigMapper; +import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -15,7 +18,7 @@ import javax.annotation.Resource; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.framework.common.util.json.JsonUtils.unzipString; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getLoginUser; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.CURRENTLY_NO_CONFIGURATION_AVAILABLE; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; @Service @@ -24,15 +27,17 @@ public class SettingServiceImpl implements SettingService{ @Resource - private SettingMapper settingMapper; + private PackageConfigMapper packageConfigMapper; + @Resource + private SystemConfigMapper systemConfigMapper; @Override public Long insertSetting(PackageConfigReqVO reqVO) { LoginUser loginUser = getLoginUser(); - settingMapper.deleteSetting(reqVO.getType(),loginUser.getId(),loginUser.getOrganId()); + packageConfigMapper.deleteSetting(reqVO.getType(),loginUser.getId(),loginUser.getOrganId()); PackageConfigDO packageConfigDO = PackageConfigDO.builder() .userId(loginUser.getId()) @@ -41,7 +46,7 @@ public class SettingServiceImpl implements SettingService{ .type(reqVO.getType()) .build(); - settingMapper.insert(packageConfigDO); + packageConfigMapper.insert(packageConfigDO); return packageConfigDO.getId(); @@ -54,14 +59,14 @@ public class SettingServiceImpl implements SettingService{ LoginUser loginUser = getLoginUser(); // 更新 - PackageConfigDO packageConfigDO = settingMapper.selectSetting(reqVO.getType(), loginUser.getId(), loginUser.getOrganId()); + PackageConfigDO packageConfigDO = packageConfigMapper.selectSetting(reqVO.getType(), loginUser.getId(), loginUser.getOrganId()); if (packageConfigDO == null) { throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE,reqVO.getType() == 1 ? UserSettingTypeEnum.PREPACKAGED.getName(): UserSettingTypeEnum.PACKAGED.getName()); } if(reqVO.getSetting() != null) { packageConfigDO.setSetting(JsonUtils.zipString(reqVO.getSetting().toJSONString())); } - settingMapper.updateById(packageConfigDO); + packageConfigMapper.updateById(packageConfigDO); return packageConfigDO.getId(); } @@ -74,18 +79,27 @@ public class SettingServiceImpl implements SettingService{ LoginUser loginUser = getLoginUser(); assert loginUser != null; - PackageConfigDO packageConfigDO = settingMapper.selectSetting(type, loginUser.getId(), loginUser.getOrganId()); + PackageConfigDO packageConfigDO = packageConfigMapper.selectSetting(type, loginUser.getId(), loginUser.getOrganId()); if (packageConfigDO == null) { throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE,type == 1 ? UserSettingTypeEnum.PREPACKAGED.getName(): UserSettingTypeEnum.PACKAGED.getName()); } - packageConfigDO.setSetting(unzipString(packageConfigDO.getSetting())); - return packageConfigDO; } + @Override + public SystemConfigDO selectDefaultBranching() { + + SystemConfigDO systemConfigDO = systemConfigMapper.selectDefaultBranching(); + + AssertUtils.notEmpty(systemConfigDO,BRANCHING_DEFAULT_SETTING_ERROR); + + return systemConfigDO; + + } + }