From 65b66cc38cff6787442f5c890e60fff0f7938458 Mon Sep 17 00:00:00 2001 From: zyd Date: Wed, 12 Oct 2022 23:52:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- .../service/impl/SarStandardsInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index b81b0c39..11bbe3e5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1832,7 +1832,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 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 sarBussStandFiles = sarBussStandFileEODao.selectList(fileQueryWrapper); if(sarBussStandFiles!=null && !sarBussStandFiles.isEmpty()){ for(SarBussStandFile file : sarBussStandFiles){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 48f2c7cd..b4430356 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -3586,7 +3586,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 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 sarStandFiles = sarStandFileEODao.selectList(fileQueryWrapper); if(sarStandFiles!=null && !sarStandFiles.isEmpty()){ for(SarStandFile file : sarStandFiles){ From 452ed1920b63e5050b94135337b8c7259fcb5e21 Mon Sep 17 00:00:00 2001 From: zyd Date: Thu, 13 Oct 2022 00:53:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?add:=E8=A7=A3=E5=86=B3=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/utils/util/EncryptFileUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/EncryptFileUtils.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/EncryptFileUtils.java index cc62e2c0..cadea2d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/EncryptFileUtils.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/EncryptFileUtils.java @@ -96,7 +96,7 @@ public class EncryptFileUtils { * @param list */ public void writeTxt(List list) { - String savePath = filePath+"/TEMPPATH/"+ UUIDUtils.randomSnowflakeID()+".txt"; + String savePath = filePath+"/TEMPPATH/"+ UUIDUtils.randomUUID20()+".txt"; BufferedWriter bw = null; FileWriter fr = null; try {