FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!436
This commit is contained in:
super_liu
2022-03-31 15:25:42 +08:00
parent c132519054 4a1e49c7b7
commit 78e358e67d
5 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+4 -2
View File
@@ -998,7 +998,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
convert.setFileSuffix(fileInfo.getFileSuffix());
convert.setStandFileClassify(field);
convert.setConvertType(SarTypeEnum.BUSINESS.getValue());
// convertMq.sendMQ(convert);
if(elasflag) {
convertMq.sendMQ(convert);
}
}
}
}
@@ -1056,7 +1058,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && InitStandAttrUtil.fileFieldListBuss.size() > 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) {
value = entry.getValue().toString();
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value);
entry.setValue(fileObj);
}
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
+1 -1
View File
@@ -398,7 +398,7 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
if (entry.getValue() != null && InitStandAttrUtil.fileFieldListLaws != null && InitStandAttrUtil.fileFieldListLaws.size() > 0 && InitStandAttrUtil.fileFieldListLaws.contains(name)) {
value = entry.getValue().toString();
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value);
entry.setValue(fileObj);
}
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListLaws != null && InitStandAttrUtil.selectionFieldListLaws.size() > 0 && InitStandAttrUtil.selectionFieldListLaws.contains(name)) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+1 -1
View File
@@ -627,7 +627,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) {
value = entry.getValue().toString();
if (StringUtils.isNotBlank(value)) {
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
List<AttFileEO> fileObj = attFileEOService.getMultiFileInfosOrderByDateDesc(value);
entry.setValue(fileObj);
}
}else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
adc-da-sys/src/main/java/com/adc/da/att/service/IAttFileEOService.java
+2
View File
@@ -22,6 +22,8 @@ public interface IAttFileEOService extends IService<AttFileEO> {
public List<AttFileEO> getMultiFileInfos(String fileIds);
public List<AttFileEO> getMultiFileInfosOrderByDateDesc(String fileIds);
public String saveFileAttId(File file);
public AttFileVo insertFileInfo(File file,String fileName);
adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java
+34
View File
@@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -332,6 +333,39 @@ public class AttFileEOServiceImpl extends ServiceImpl<AttFileEODao, AttFileEO> i
return attFileEO;
}
/**
* @Author super_liu
* @Description 多文件查询
* Date 2018/10/24 11:08
* @Param [fileIds]
* @return java.util.List<com.adc.da.att.entity.AttFileEO>
**/
public List<AttFileEO> getMultiFileInfosOrderByDateDesc(String fileIds) {
List<AttFileEO> fileObj = new ArrayList<>();
if(StringUtils.isNotEmpty(fileIds)){
String idList[] = fileIds.split(",");
for(int i=0;i<idList.length;i++){
AttFileEO attFileEO = new AttFileEO();
try {
if(StringUtils.isNotEmpty(idList[i])){
attFileEO.setId(idList[i]);
AttFileEO getFile = this.baseMapper.selectFileInfoById(attFileEO);
if(attFileEO != null && getFile != null){
fileObj.add(getFile);
}
}
} catch (Exception e) {
log.error(e.getMessage(),e);
}
}
}
if(!fileObj.isEmpty()){
fileObj.sort(Comparator.comparing(AttFileEO::getCreationTime,Comparator.nullsLast(Date::compareTo)).reversed());
}
return fileObj;
}
/**
* @Author super_liu