Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-13 21:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化生产异常提示补全，方案组标签信息增加

Browse Source
This commit is contained in:
liuzhaotian
2025-01-15 17:12:40 +08:00
parent 56a293ef78
commit 1cede97b42
16 changed files with 252 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/systemconfig/SystemConfigApiImpl.java
+25 -9
View File
@@ -114,6 +114,7 @@ public class SystemConfigApiImpl implements SystemConfigApi {
List<ProcessSchemeDTO> schemeDTOS = BeanUtils.toBean(processSchemeConfigs, ProcessSchemeDTO.class);
// 配置ID查询和数据校验
List<String> processLineConfigIds = processSchemeConfigs.stream().map(ProcessSchemeConfig::getProcessLineConfig).distinct().toList();
checkValueIsNotEmpty(processLineConfigIds,"加工分线");
@@ -127,19 +128,30 @@ public class SystemConfigApiImpl implements SystemConfigApi {
checkValueIsNotEmpty(analyzerIds,"解析器");
// 配置查询和数据校验
List<SystemConfigDO> processLineConfigList = systemConfigMapper.selectBatchIds(processLineConfigIds);
checkValueIsNotEmpty(processLineConfigList,"加工分线");
List<SystemConfigDO> optimizationConfigList = systemConfigMapper.selectBatchIds(optimizationConfigIds);
checkValueIsNotEmpty(optimizationConfigList,"优化数据配置");
List<MachineDO> analyzerList = machineMapper.selectBatchIds(analyzerIds);
checkValueIsNotEmpty(analyzerList,"解析器");
// 标签ID和配置查询和数据校验
List<Long> labelIds = analyzerList.stream().map(MachineDO::getLabelId).distinct().toList();
AssertUtils.notEmpty(labelIds,SYSTEM_PROCESS_SCHEME_CONFIG_MACHINE_LABEL);
List<LabelDO> labelDOS = labelMapper.selectBatchIds(labelIds);
AssertUtils.notEmpty(labelDOS,SYSTEM_PROCESS_SCHEME_CONFIG_MACHINE_LABEL);
// 匹配对应数据
schemeDTOS.forEach(f->{
f.setProcessLineConfigName(processLineConfigList.stream()
@@ -147,35 +159,39 @@ public class SystemConfigApiImpl implements SystemConfigApi {
.map(SystemConfigDO::getName)
.toList().get(0)
);
f.setProcessLineConfigSetting(toJsonString(
f.setProcessLineConfigSetting(
processLineConfigList.stream()
.filter(p->f.getProcessLineConfig().equals(p.getId()))
.map(SystemConfigDO::getSetting)
.toList().get(0)
));
);
f.setOptimizationConfigName(processLineConfigList.stream()
.filter(p->f.getProcessLineConfig().equals(p.getId()))
.map(SystemConfigDO::getName)
.toList().get(0)
);
f.setOptimizationConfigSetting(toJsonString(
f.setOptimizationConfigSetting(
optimizationConfigList.stream()
.filter(p->f.getOptimizationConfig().equals(p.getId()))
.map(SystemConfigDO::getSetting)
.toList().get(0)
));
);
MachineDO machineDO = analyzerList.stream().filter(p -> f.getAnalyzer().equals(p.getId())).toList().get(0);
f.setAnalyzerConfigName(machineDO.getName());
f.setAnalyzerConfigSetting(toJsonString(unzipString(machineDO.getSetting())));
f.setAnalyzerConfigSetting(unzipString(machineDO.getSetting()));
f.setMachineType(machineDO.getMachineType());
LabelDO labelDO = labelDOS.stream().filter(l -> machineDO.getLabelId().equals(l.getId())).toList().get(0);
f.setLabel(labelDO.getId());
f.setLabelHeight(labelDO.getHeight());
f.setLabelWidth(labelDO.getWidth());
f.setLabelType(labelDO.getType());
f.setLabelSetting(unzipString(labelDO.getTemplate()));
});
@@ -183,7 +199,7 @@ public class SystemConfigApiImpl implements SystemConfigApi {
}
private void checkValueIsNotEmpty(List<String> value,String error) {
private void checkValueIsNotEmpty(List<?> value,String error) {
if(ObjectUtils.isEmpty(value)){
throw exception(SYSTEM_PROCESS_SCHEME_CONFIG_DATA_ERROR,error);