From e09b9786a8e41754718162bfb0729778694b742b Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Fri, 20 Dec 2024 10:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E6=96=B0?= =?UTF-8?q?=E9=9C=80=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9-=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E7=B1=BB=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/OrderServiceImpl.java | 2 +- .../vo/ConfigUpdateSortReqVO.java | 41 +++++++++++ .../impl/AdvancedScreenServiceHandler.java | 54 +++++++++++++++ .../impl/DataProcessServiceHandler.java | 69 +++++++++++++++++++ 4 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigUpdateSortReqVO.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/AdvancedScreenServiceHandler.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index 6b726cba1..f1ac61191 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -1236,7 +1236,7 @@ public class OrderServiceImpl implements OrderService { orderModelDOs.forEach(f->{ f.setGoodsId(orderGoodsPlateIds.stream().filter(fo->fo.getId().equals(f.getPlateId())).map(OrderGoodsPlateIds::getActualGoodsId).toList().get(0)); f.setPlateGoodsId(orderGoodsPlateIds.stream().filter(fo->fo.getId().equals(f.getPlateId())).map(OrderGoodsPlateIds::getGoodsId).toList().get(0)); - f.setIsOptimized(false); +// f.setIsOptimized(false); }); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigUpdateSortReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigUpdateSortReqVO.java new file mode 100644 index 000000000..7a80c944a --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/systemconfig/vo/ConfigUpdateSortReqVO.java @@ -0,0 +1,41 @@ +package com.cf.imes.module.system.controller.admin.systemconfig.vo; + + +import com.cf.imes.module.system.validation.common.CommonStatus; +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; + +/** + * @author 系统配置顺序更新 + */ +@Schema(description = "管理后台 - 系统配置顺序更新 Request VO") +@Data +public class ConfigUpdateSortReqVO { + + + @Schema(description = "系统配置编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @NotNull(message = "系统配置编号不能为空") + private Long id; + + + @Schema(description = "状态，见 CommonStatusEnum 枚举（0启用1禁用） ", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "状态不能为空") + @CommonStatus + private Integer status; + + + @Schema(description = "配置类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "配置类型不能为空") + @SystemConfigTypeEnumValid + private Integer type; + + + @Schema(description = "系统配置顺序编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") + @NotNull(message = "系统顺序编号不能为空") + private Integer sort; + + +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/AdvancedScreenServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/AdvancedScreenServiceHandler.java new file mode 100644 index 000000000..2c5f1fe3f --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/AdvancedScreenServiceHandler.java @@ -0,0 +1,54 @@ +package com.cf.imes.module.system.service.systemconfig.factory.service.impl; + + +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.service.systemconfig.factory.service.AbstractSystemConfigServiceHandler; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author 高级筛选服务处理 + */ + +@Service("advancedScreenServiceHandler") +@Slf4j +public class AdvancedScreenServiceHandler extends AbstractSystemConfigServiceHandler { + + + @Override + public List selectList(ConfigPageReqVO pageReqVO) { + + return null; + } + + @Override + public void checkValid(String setting) { + // todo checkValid + } + + @Override + public void beforeSaveConfig(ConfigSaveReqVO reqVO) { + // todo beforeSaveConfig + } + + @Override + public void afterSaveConfig(SystemConfigDO systemConfigDO, ConfigSaveReqVO reqVO) { + // todo afterSaveConfig + } + + @Override + public void afterUpdateStatus(SystemConfigDO systemConfigDO, ConfigUpdateStatusReqVO reqVO) { + // todo afterUpdateStatus + } + + @Override + public void deleteConfig(ConfigDeleteReqVO reqVO) { + // todo deleteConfig + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java new file mode 100644 index 000000000..5ecff24da --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DataProcessServiceHandler.java @@ -0,0 +1,69 @@ +package com.cf.imes.module.system.service.systemconfig.factory.service.impl; + + +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.systemconfig.factory.service.AbstractSystemConfigServiceHandler; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 数据处理服务处理器 + */ +@Service("dataProcessServiceHandler") +@Slf4j +public class DataProcessServiceHandler extends AbstractSystemConfigServiceHandler { + + @Resource + private SystemConfigMapper systemConfigMapper; + + @Override + public List selectList(ConfigPageReqVO pageReqVO) { + + List systemConfigDOS = systemConfigMapper.selectSystemConfigList(pageReqVO.getType(),null); + + if (systemConfigDOS.isEmpty()){ + return null; + } + + return systemConfigDOS; + + } + + + + @Override + public void checkValid(String setting) { + // todo checkValid + } + + @Override + public void beforeSaveConfig(ConfigSaveReqVO reqVO) { + // todo beforeSaveConfig + } + + @Override + public void afterSaveConfig(SystemConfigDO systemConfigDO, ConfigSaveReqVO reqVO) { + // todo afterSaveConfig + } + + @Override + public void afterUpdateStatus(SystemConfigDO systemConfigDO, ConfigUpdateStatusReqVO reqVO) { + // todo afterUpdateStatus + } + + @Override + public void deleteConfig(ConfigDeleteReqVO reqVO) { + + systemConfigMapper.deleteById(reqVO.getId()); + + } + +}