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

Merge remote-tracking branch 'origin/develop_master' into FOTON

Browse Source
This commit is contained in:
zhangjun
2022-10-13 09:03:12 +08:00
parent d67bfea609 452ed1920b
commit d0e7a5f96f
3 changed files with 3 additions and 3 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
+1 -1
View File
@@ -1832,7 +1832,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
QueryWrapper<SarBussStandFile> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("STAND_ID",data.getId());
fileQueryWrapper.eq("USE_MODEL","SOURCE_FILE");
fileQueryWrapper.eq("validFlag",0);
fileQueryWrapper.eq("VALID_FLAG",0);
List<SarBussStandFile> sarBussStandFiles = sarBussStandFileEODao.selectList(fileQueryWrapper);
if(sarBussStandFiles!=null && !sarBussStandFiles.isEmpty()){
for(SarBussStandFile file : sarBussStandFiles){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+1 -1
View File
@@ -3586,7 +3586,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
QueryWrapper<SarStandFile> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("STAND_ID",data.getId());
fileQueryWrapper.eq("USE_MODEL","SOURCE_FILE");
fileQueryWrapper.eq("validFlag",0);
fileQueryWrapper.eq("VALID_FLAG","0");
List<SarStandFile> sarStandFiles = sarStandFileEODao.selectList(fileQueryWrapper);
if(sarStandFiles!=null && !sarStandFiles.isEmpty()){
for(SarStandFile file : sarStandFiles){
adc-da-slrs/src/main/java/com/adc/da/utils/util/EncryptFileUtils.java
+1 -1
View File
@@ -96,7 +96,7 @@ public class EncryptFileUtils {
* @param list
*/
public void writeTxt(List<String> list) {
String savePath = filePath+"/TEMPPATH/"+ UUIDUtils.randomSnowflakeID()+".txt";
String savePath = filePath+"/TEMPPATH/"+ UUIDUtils.randomUUID20()+".txt";
BufferedWriter bw = null;
FileWriter fr = null;
try {