系统配置-方案组字段校验，修改开料状态逻辑更改

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApiImpl.java

@@ -17,16 +17,18 @@ import com.cf.imes.module.system.dal.mysql.machine.MachineMapper;
 import com.cf.imes.module.system.dal.mysql.systemconfig.SystemConfigMapper;
 import com.cf.imes.module.system.enums.config.SystemConfigTypeEnum;
 import com.cf.imes.module.system.service.systemconfig.SystemConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
 
+import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
 import static com.cf.imes.framework.common.util.json.JsonUtils.*;
-import static com.cf.imes.module.system.enums.ErrorCodeConstants.PROCESS_CONFIG_DEFAULT_DATA_ERROR;
-import static com.cf.imes.module.system.enums.ErrorCodeConstants.THIS_PROCESS_CONFIG_DATA_ERROR;
+import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
 
 /**
  * 系统配置feign实现类
@@ -36,6 +38,7 @@ import static com.cf.imes.module.system.enums.ErrorCodeConstants.THIS_PROCESS_CO
  */
 @RestController
 @Validated
+@Slf4j
 public class SystemConfigApiImpl implements SystemConfigApi {
 
     @Resource
@@ -93,16 +96,32 @@ public class SystemConfigApiImpl implements SystemConfigApi {
 
         AssertUtils.notEmpty(systemConfigDO,THIS_PROCESS_CONFIG_DATA_ERROR);
 
-        List<ProcessSchemeConfig> processSchemeConfigs = parseArray(systemConfigDO.getSetting(), ProcessSchemeConfig.class);
+        List<ProcessSchemeConfig> processSchemeConfigs;
+
+        try {
+
+            processSchemeConfigs = parseArray(systemConfigDO.getSetting(), ProcessSchemeConfig.class);
+
+        }catch (Exception e){
+            log.error(e.getMessage());
+            throw exception(SYSTEM_PROCESS_SCHEME_CONFIG_FIELD_ERROR);
+        }
+
 
         List<ProcessSchemeDTO> schemeDTOS = BeanUtils.toBean(processSchemeConfigs, ProcessSchemeDTO.class);
 
         List<String> processLineConfigIds = processSchemeConfigs.stream().map(ProcessSchemeConfig::getProcessLineConfig).distinct().toList();
 
+        checkValueIsNotEmpty(processLineConfigIds,"加工分线");
+
         List<String> optimizationConfigIds = processSchemeConfigs.stream().map(ProcessSchemeConfig::getOptimizationConfig).distinct().toList();
 
+        checkValueIsNotEmpty(optimizationConfigIds,"优化数据配置");
+
         List<String> analyzerIds = processSchemeConfigs.stream().map(ProcessSchemeConfig::getAnalyzer).distinct().toList();
 
+        checkValueIsNotEmpty(analyzerIds,"解析器");
+
 
         List<SystemConfigDO> processLineConfigList = systemConfigMapper.selectBatchIds(processLineConfigIds);
 
@@ -158,4 +177,13 @@ public class SystemConfigApiImpl implements SystemConfigApi {
 
         return success(schemeDTOS);
     }
+
+
+    private void checkValueIsNotEmpty(List<String> value,String error) {
+
+        if(ObjectUtils.isEmpty(value)){
+            throw exception(SYSTEM_PROCESS_SCHEME_CONFIG_DATA_ERROR,error);
+        }
+
+    }
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/DefaultSystemConfigServiceHandler.java

@@ -1,6 +1,7 @@
 package com.cf.imes.module.system.service.systemconfig.factory.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.cf.imes.framework.common.enums.CommonStatusEnum;
 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;
@@ -62,6 +63,19 @@ public class DefaultSystemConfigServiceHandler extends AbstractSystemConfigServi
                         .type(configTypeEnum.getType())
                         .build();
 
+                if(configTypeEnum.getType().equals(SystemConfigTypeEnum.MULTI_COLOR_ORDER_PLAN.getType())){
+                    SystemConfigDO systemConfigDO = SystemConfigDO
+                            .builder()
+                            .id(null)
+                            .name(configTypeEnum.getName())
+                            .type(configTypeEnum.getType())
+                            .status(CommonStatusEnum.DISABLE.getStatus())
+                            .build();
+                    systemConfigMapper.insert(systemConfigDO);
+                    resultList.add(systemConfigDO);
+                    continue;
+                }
+
                 resultList.add(initConfig);
             } else {
                 // 如果存在配置，保留版本号最大的配置

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/systemconfig/factory/service/impl/ProcessSchemeServiceHandler.java

@@ -1,6 +1,7 @@
 package com.cf.imes.module.system.service.systemconfig.factory.service.impl;
 
 
+import cn.hutool.core.text.CharSequenceUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
@@ -16,8 +17,10 @@ import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.cf.imes.framework.common.util.json.JsonUtils.parseArray;
 import static com.cf.imes.framework.common.util.json.JsonUtils.toJsonString;
+import static com.cf.imes.module.system.enums.ErrorCodeConstants.SYSTEM_PROCESS_SCHEME_DATA_ERROR;
 
 /**
  * @author 加工方案服务处理器
@@ -47,7 +50,31 @@ public class ProcessSchemeServiceHandler extends AbstractSystemConfigServiceHand
 
     @Override
     public void checkValid(String setting) {
-        // todo checkValid
+
+
+        List<ProcessSchemeConfig> processSchemeConfigs = parseArray(setting, ProcessSchemeConfig.class);
+
+        processSchemeConfigs.forEach(f->{
+
+            String planName = Optional.ofNullable(f.getPlanName()).orElse("");
+
+            checkValueIsNotNull(planName,"加工方案名称");
+
+            String processLineConfig = Optional.ofNullable(f.getProcessLineConfig()).orElse("");
+
+            checkValueIsNotNull(processLineConfig,"加工分线");
+
+            String optimizationConfig = Optional.ofNullable(f.getOptimizationConfig()).orElse("");
+
+            checkValueIsNotNull(optimizationConfig,"优化数据配置");
+
+            String analyzer = Optional.ofNullable(f.getAnalyzer()).orElse("");
+
+            checkValueIsNotNull(analyzer,"解析器");
+
+        });
+
+
     }
 
     @Override
@@ -101,4 +128,14 @@ public class ProcessSchemeServiceHandler extends AbstractSystemConfigServiceHand
         systemConfigMapper.deleteById(reqVO.getId());
 
     }
+
+
+    private void checkValueIsNotNull(String value,String error) {
+
+        if(CharSequenceUtil.isBlank(value)){
+            throw exception(SYSTEM_PROCESS_SCHEME_DATA_ERROR,error);
+        }
+
+    }
+
 }