From 9ce3d2e57aa7f6e9ba6f2b49f85cf25c1bb870c4 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 24 Jul 2024 17:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=A9=BA?= =?UTF-8?q?=E5=B0=8F=E6=9D=BF=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/service/plate/PlateServiceImpl.java | 8 +++++++- .../imes/module/system/enums/ErrorCodeConstants.java | 1 + .../controller/admin/setting/SettingController.java | 3 ++- .../admin/setting/vo/PackageConfigReqVO.java | 12 ++++++------ .../system/service/setting/SettingService.java | 3 ++- .../system/service/setting/SettingServiceImpl.java | 9 ++++++--- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 809f86733..aae596023 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -63,7 +63,7 @@ import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConsta import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId; import static com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService.ORDER_PLATE_MODEL; -import static com.cf.imes.module.system.enums.ErrorCodeConstants.PLATE_NOT_EXISTS; +import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; /** * 生产单板件 Service 实现类 @@ -261,6 +261,12 @@ public class PlateServiceImpl implements PlateService { @Transactional(rollbackFor = Exception.class) public List createNewPlate(OptimizationSavePlateReqVO reqVO) { + if(reqVO.getRoomId() == null || reqVO.getBodyId() == null){ + + throw exception(THE_CURRENT_BOARD_IS_NOT_SELECTED); + + } + List plateDOS = new ArrayList<>(); for (int i = 0; i < reqVO.getMultiple(); i++) { 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 581fea2c0..3c107a8b4 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 @@ -229,6 +229,7 @@ public interface ErrorCodeConstants { //=========== 板材信息 1-002-032-000 ============ ErrorCode PLATE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_032_001, "导入板材数据不能为空！"); ErrorCode PLATE_EXISTS = new ErrorCode(1_002_032_002, "板材存在"); + ErrorCode THE_CURRENT_BOARD_IS_NOT_SELECTED = new ErrorCode(1_002_032_003, "当前板材没有选择房间和柜体，请选择"); //=========== 板材信息 1-002-033-000 ============ ErrorCode REMAIN_PLATE_NOT_EXISTS = new ErrorCode(1_002_032_002, "板材不存在"); 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 3eaa01b95..48aa99c51 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 @@ -3,6 +3,7 @@ package com.cf.imes.module.system.controller.admin.setting; import com.cf.imes.framework.common.pojo.CommonResult; 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.service.setting.SettingService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -53,7 +54,7 @@ public class SettingController { @GetMapping("/select") @Operation(summary = "查看当前用户的配置信息") @Parameter(name = "type", description = "配置类型", required = true) - public CommonResult selectSetting( @RequestParam("type") Integer type ) { + public CommonResult selectSetting(@RequestParam("type") Integer type ) { return success(settingService.selectSetting(type)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java index 623c04971..bd50e0fb7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/setting/vo/PackageConfigReqVO.java @@ -19,12 +19,12 @@ public class PackageConfigReqVO { private Long id; - @Schema(description = "组织ID") - private Long organId; - - - @Schema(description = "用户ID") - private Long userId; +// @Schema(description = "组织ID") +// private Long organId; +// +// +// @Schema(description = "用户ID") +// private Long userId; @Schema(description = "配置类型： 1 预打包，2 打包", requiredMode = Schema.RequiredMode.REQUIRED) 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 d5cdb5ee8..a0c613b73 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 @@ -2,6 +2,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; public interface SettingService { @@ -12,5 +13,5 @@ public interface SettingService { Long updateSetting(PackageConfigReqVO reqVO); - PackageConfigReqVO selectSetting(Integer type); + PackageConfigDO selectSetting(Integer type); } 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 5df8fa98b..f92891df9 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 @@ -13,6 +13,7 @@ import org.springframework.validation.annotation.Validated; 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.*; @@ -64,7 +65,7 @@ public class SettingServiceImpl implements SettingService{ @Override - public PackageConfigReqVO selectSetting(Integer type) { + public PackageConfigDO selectSetting(Integer type) { LoginUser loginUser = getLoginUser(); @@ -74,9 +75,11 @@ public class SettingServiceImpl implements SettingService{ throw exception(CURRENTLY_NO_CONFIGURATION_AVAILABLE); } - packageConfigDO.setSetting(JsonUtils.unzipString(packageConfigDO.getSetting())); - return BeanUtils.toBean(packageConfigDO,PackageConfigReqVO.class); + packageConfigDO.setSetting(unzipString(packageConfigDO.getSetting())); + + + return packageConfigDO; }