Skip to content

P
patzn-cloud-service-soil
Commit 5bb9deda by wangweidong
Options

土工平台修改

parent 4bfbaa0e
Showing with 88 additions and 24 deletions
src/main/java/com/patzn/cloud/service/lims/common/CollectUtil.java
......@@ -37,6 +37,7 @@ public class CollectUtil {
content = content.replace("凝 聚 力","凝聚力");
content = content.replace("灵 敏 度","灵敏度");
content = content.replace("粘 聚 力","凝聚力");
content = content.replace("粘聚力","凝聚力");
String[] dataArray = content.split(" ");
for (String handleS:dataArray) {
handleS=handleS.trim();
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java
......@@ -1367,6 +1367,21 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
List<SoilItem> soilItemList = soilItemService.list(Condition.create().in("experiment_id",expIdsList));
Map<Long,List<SoilItem>> expItemMap = new HashMap<>();
for (SoilItem item:soilItemList) {
if (!expItemMap.containsKey(item.getExperimentId())){
List<SoilItem> itemList = new ArrayList<>();
itemList.add(item);
expItemMap.put(item.getExperimentId(),itemList);
}else{
List<SoilItem> itemList = expItemMap.get(item.getExperimentId());
itemList.add(item);
expItemMap.put(item.getExperimentId(),itemList);
}
}
Map<Long,List<SoilItem>> sampleItemMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(soilItemList)){
......@@ -1428,11 +1443,11 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
&& null!=template.getTemplateSampleNum()){
List<SoilExpReportTemplateConfig> configList = soilExpReportTemplateConfigService.list(Condition.create().eq("template_id",templateId));
if (sampleList.size()<templateSampleNum){
if (voList.size()<templateSampleNum){
int sampleMergerNum =sampleMergerNumOri;
for (SoilSampleVO vo:sampleList) {
for (SoilExperimentVO vo:voList) {
List<SoilItem> itemList = sampleItemMap.get(vo.getId());
List<SoilItem> itemList = expItemMap.get(vo.getId());
if (null == itemList){
itemList = new ArrayList<>();
}
......@@ -1453,7 +1468,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
XSSFCellStyle cellStyle = zeroRow.getCell(0).getCellStyle();
int lastCellNum = zeroRow.getLastCellNum();
int insertCount = sampleList.size()-templateSampleNum;
int insertCount = voList.size()-templateSampleNum;
for (int m = 0 ; m<insertCount ;m++) {
for (int i = 0; i < sampleMergerNum; i++) {
sheetOne.shiftRows(insertRow, sheetOne.getLastRowNum(), 1,true,false);
......@@ -1467,9 +1482,9 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
}
}
int sn = 1;
for (SoilSampleVO vo:sampleList) {
for (SoilExperimentVO vo:voList) {
XSSFRow xssfRow = sheetOne.getRow(beginRow);
List<SoilItem> itemList = sampleItemMap.get(vo.getId());
List<SoilItem> itemList = expItemMap.get(vo.getId());
if (null == itemList){
itemList = new ArrayList<>();
}
......@@ -1893,6 +1908,29 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
}
public void setExcellCellValue (String prepory,SoilExperimentVO vo,XSSFCell cell,List<SoilItem> itemList){
if (StringUtils.isNotBlank(prepory)){
if (prepory.equals("{appendix}")){
SoilAppendix soilAppendix = soilAppendixService.getByExpId(vo.getId());
if (null != soilAppendix){
cell.setCellValue(soilAppendix.getTitle());
}
}else{
if (StringHandleUtils.is_alpha(prepory)){
cell.setCellValue(StringHandleUtils.getFieldIfNummReturnBlankValueByFieldName(prepory,vo));
}else{
if (CollectionUtils.isNotEmpty(itemList)){
for (SoilItem item:itemList) {
if (prepory.equals(item.getName())){
cell.setCellValue(item.getTestValue());
break;
}
}
}
}
}
}
}
@Override
public void uploadCollectGds(SmbFile smbFile, CollectDataType request) {
......@@ -2372,11 +2410,21 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
Map<String,SoilExperimentVO> nameCodeList = new HashMap<>();
for (SoilExperimentVO experimentVO:voList) {
nameCodeList.put(experimentVO.getName()+experimentVO.getSampleCode(),experimentVO);
}
if (experimentVO.getName().contains("三轴压缩")){
if (experimentVO.getName().contains("重塑")){
nameCodeList.put("三轴压缩重塑"+experimentVO.getSampleCode(),experimentVO);
nameCodeList.put("三轴压缩重塑"+experimentVO.getSiteNo(),experimentVO);
}else{
nameCodeList.put("三轴压缩"+experimentVO.getSampleCode(),experimentVO);
nameCodeList.put("三轴压缩"+experimentVO.getSiteNo(),experimentVO);
}
}else{
nameCodeList.put(experimentVO.getName()+experimentVO.getSampleCode(),experimentVO);
nameCodeList.put(experimentVO.getName()+experimentVO.getSiteNo(),experimentVO);
}
}
Iterator<String> fileNamesIt = multipartHttpServletRequest.getFileNames();
List<String> failedNameList = new ArrayList<>();
while (fileNamesIt.hasNext()) {
......@@ -2386,13 +2434,16 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
String name = multipartFile.getName();
String originalFilename = multipartFile.getOriginalFilename();
if (originalFilename.contains(".bmp")||originalFilename.contains(".txt")){
String nameCode = originalFilename.replace(".bmp","").replace(".txt","");
String lastName = name.substring(name.length()-1,name.length());
if ("r".equals(lastName)){
if (nameCode.contains("三轴压缩")&&(!nameCode.contains("重塑"))){
nameCode = nameCode.replace("三轴压缩","三轴压缩重塑");
}
}
if (!nameCodeList.containsKey(nameCode)){
RestAssert.fail("请正确上传委托下的数据采集文件");
}
}else {
RestAssert.fail("请上传 .bmp 或者 .txt格式的文件");
}
......@@ -2408,18 +2459,30 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
String originalFilename = multipartFile.getOriginalFilename();
String nameCode = originalFilename.replace(".bmp","").replace(".txt","");
SoilExperimentVO vo = nameCodeList.get(nameCode);
CollectDataType dataType = new CollectDataType();
dataType.setExpId(vo.getId());
dataType.setSampleCode(vo.getSampleCode());
dataType.setExperiment(vo.getName());
dataType.setEntrustCode(vo.getEntrustCode());
if (originalFilename.contains(".bmp")){
uploadCollectPng(multipartFile,dataType);
}else if (originalFilename.contains(".txt")){
parseTxt(multipartFile,dataType);
if (originalFilename.contains(".bmp")||originalFilename.contains(".txt")){
String nameCode = originalFilename.replace(".bmp","").replace(".txt","");
String lastName = name.substring(name.length()-1,name.length());
if ("r".equals(lastName)){
if (nameCode.contains("三轴压缩")&&(!nameCode.contains("重塑"))){
nameCode = nameCode.replace("三轴压缩","三轴压缩重塑");
}
}
SoilExperimentVO vo = nameCodeList.get(nameCode);
CollectDataType dataType = new CollectDataType();
dataType.setExpId(vo.getId());
dataType.setSampleCode(vo.getSampleCode());
dataType.setExperiment(vo.getName());
dataType.setEntrustCode(vo.getEntrustCode());
if (originalFilename.contains(".bmp")){
uploadCollectPng(multipartFile,dataType);
}else if (originalFilename.contains(".txt")){
parseTxt(multipartFile,dataType);
}
}else {
RestAssert.fail("请上传 .bmp 或者 .txt格式的文件");
}
}
return true;
......
src/main/resources/mapper/soil/SoilExperimentMapper.xml
......@@ -424,7 +424,7 @@
<select id="selectByEntrustId" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
SELECT i.id,i.name,s.sample_code FROM soil_experiment i
SELECT i.id,i.name,s.sample_code,s.site_no FROM soil_experiment i
JOIN soil_sample s ON i.sample_id = s.id
JOIN soil_entrust e ON s.entrust_id = e.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment