liuchengqian/industrial_measurement
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新数据表Qo

Browse Source
This commit is contained in:
liuchengqian
2022-02-28 21:32:34 +08:00
parent 7e3f433e16
commit 9d463735c6
8 changed files with 170 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/xkrs/service/impl/DataDictServiceImpl.java
View File

@ -25,6 +25,7 @@ public class DataDictServiceImpl implements DataDictService {
/**
* 添加字典数据
*
* @param dataDictQo
* @return
*/
@ -37,14 +38,14 @@ public class DataDictServiceImpl implements DataDictService {
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT,"该产品变量已存在，请勿重复添加！",locale);
}*/
//DataDict byDictEnglishName = dataDictDao.findByDictEnglishName(dataDictQo.getDictEnglishName());
DataDict englishName = dataDictDao.findByDictEnglishName(dataDictQo.getDictEnglishName());
if(englishName != null){
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT,"该产品变量已存在，请勿重复添加！",locale);
DataDict englishName = dataDictDao.findByDictEnglishName(dataDictQo.getInspectionItemCode());
if (englishName != null) {
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT, "该产品变量已存在，请勿重复添加！", locale);
}
DataDict dataDict = new DataDict();
dataDict.setDictChineseName(dataDictQo.getDictChineseName());
dataDict.setDictEnglishName(dataDictQo.getDictEnglishName());
dataDict.setInspectionItemName(dataDictQo.getInspectionItemName());
dataDict.setInspectionItemCode(dataDictQo.getInspectionItemCode());
dataDictDao.save(dataDict);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"添加成功！",locale);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS, "添加成功！", locale);
}
}

21
src/main/java/com/xkrs/service/impl/DataSourceServiceImpl.java
View File

@ -36,23 +36,18 @@ public class DataSourceServiceImpl implements DataSourceService {
@Override
public String insertDataSource(DataSourceQo dataSourceQo) {
Locale locale = LocaleContextHolder.getLocale();
DataDict byDictEnglishName = dataDictDao.findByDictEnglishName(dataSourceQo.getDataName());
DataDict byDictEnglishName = dataDictDao.findByDictEnglishName(dataSourceQo.getInspectionItemCode());
if(byDictEnglishName == null){
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE,"不存在该字典类型！",locale);
}
/*DataSource byDataName = dataSourceDao.findByDataName(dataSourceQo.getDataName());
if(byDataName != null){
return outputEncapsulationObject(PromptMessageEnum.DATA_EXIT,"该字典类型数据已添加，请勿重复添加！",locale);
}*/
DataSource dataSource = new DataSource();
dataSource.setDataModelNumber(dataSourceQo.getDataModelNumber());
dataSource.setDataBatchNumber(dataSourceQo.getDataBatchNumber());
dataSource.setDataMachineCode(dataSourceQo.getDataMachineCode());
dataSource.setProductNumber(dataSourceQo.getProductNumber());
dataSource.setMaterial(dataSourceQo.getMaterial());
dataSource.setDataName(dataSourceQo.getDataName());
dataSource.setNumericalValue(dataSourceQo.getNumericalValue());
dataSource.setLotNo(dataSourceQo.getLotNo());
dataSource.setMachineNo(dataSourceQo.getMachineNo());
dataSource.setMaterialNo(dataSourceQo.getMaterialNo());
dataSource.setModelNo(dataSourceQo.getModelNo());
dataSource.setPartNo(dataSourceQo.getPartNo());
dataSource.setInspectionItemCode(dataSourceQo.getInspectionItemCode());
dataSource.setInspectValue(dataSourceQo.getInspectValue());
dataSourceDao.save(dataSource);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"添加成功！",locale);
}

12
src/main/java/com/xkrs/service/impl/FileServiceImpl.java
View File

@ -58,12 +58,12 @@ public class FileServiceImpl implements FileService {
}
String file = ExcelUploadUtil.memoryFile(fileExcel);
FileEntity fileEntity1 = new FileEntity();
fileEntity1.setFileModelNumber(fileQo.getFileModelNumber());
fileEntity1.setFileBatchNumber(fileQo.getFileBatchNumber());
fileEntity1.setFileMachineCode(fileQo.getFileMachineCode());
fileEntity1.setFileProductNumber(fileQo.getFileProductNumber());
fileEntity1.setLotNo(fileQo.getLotNo());
fileEntity1.setMachineNo(fileQo.getMachineNo());
fileEntity1.setMaterialNo(fileQo.getMaterialNo());
fileEntity1.setModelNo(fileQo.getModelNo());
fileEntity1.setPartNo(fileQo.getPartNo());
fileEntity1.setFileUploadPath(file);
fileDao.save(fileEntity1);
return outputEncapsulationObject(PromptMessageEnum.SUCCESS,"添加成功！",locale);
}
@ -86,7 +86,7 @@ public class FileServiceImpl implements FileService {
if(maps == null || maps.size() == 0){
return outputEncapsulationObject(PromptMessageEnum.DATA_NONE,"暂时没有该产品的信息！",locale);
}
Map<String,String> map = new HashMap<String,String>();
Map<String,String> map = new HashMap<>();
for(Map<String,String> stringMap : maps){
map.put(stringMap.get("dataname"),stringMap.get("numericalvalue"));
}