From 41023597d443f0a11fd73f3cde676f96a05d66eb Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 24 Jul 2023 11:31:10 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA,=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AF=B7=E6=B1=82=E7=9A=84=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=9A=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 36 +++++++++---------- .../adc/da/sync/service/SyncUserService.java | 8 ++--- 2 files changed, 22 insertions(+), 22 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 96474c70..82da91a4 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 @@ -5031,25 +5031,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl onlineFileLogs = onlineFileLogDao.selectList(onlineFileLogWrapper); if(!onlineFileLogs.isEmpty()){ //在线编辑的情况下，判断是否有web - QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); - objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID", sarBussStandFiles.get(0).getOriAttId()); - objectQueryWrapperSarBussStandFile.eq("USE_MODEL", "WEB_FILE"); - List sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); - if(!sarBussStandFilesList.isEmpty()){ +// QueryWrapper objectQueryWrapperSarBussStandFile = new QueryWrapper<>(); +// objectQueryWrapperSarBussStandFile.eq("ORI_ATT_ID", sarBussStandFiles.get(0).getOriAttId()); +// objectQueryWrapperSarBussStandFile.eq("USE_MODEL", "WEB_FILE"); +// List sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); +// if(!sarBussStandFilesList.isEmpty()){ //删除当前pdf文件 - AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFilesList.get(0).getAttId()); - logger.info("要删除的文件ID：{}，文件名：{}，文件路径：{}",fileInfo.getId(),fileInfo.getFileName(),fileInfo.getFilePath()); - if(fileInfo!=null) { - File file = new File(filePath + fileInfo.getFilePath() + fileInfo.getFileName()); - if(file.exists()){ - logger.info("删除PDF文件,文件路径：" + file.getAbsolutePath()); - boolean deleted = file.delete(); - logger.info("删除结果：{}", deleted); - } - attFileEOService.deleteById(sarBussStandFilesList.get(0).getAttId()); - sarBussStandFileEODao.deleteById(sarBussStandFilesList.get(0).getId()); - } - } +// AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFilesList.get(0).getAttId()); +// logger.info("要删除的文件ID：{}，文件名：{}，文件路径：{}",fileInfo.getId(),fileInfo.getFileName(),fileInfo.getFilePath()); +// if(fileInfo!=null) { +// File file = new File(filePath + fileInfo.getFilePath() + fileInfo.getFileName()); +// if(file.exists()){ +// logger.info("删除PDF文件,文件路径：" + file.getAbsolutePath()); +// boolean deleted = file.delete(); +// logger.info("删除结果：{}", deleted); +// } +// attFileEOService.deleteById(sarBussStandFilesList.get(0).getAttId()); +// sarBussStandFileEODao.deleteById(sarBussStandFilesList.get(0).getId()); +// } +// } if(StringUtils.isNotBlank(onlineFileLogs.get(0).getOLdFileName()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilekey()) && StringUtils.isNotBlank(onlineFileLogs.get(0).getFilePath())){ try { logger.info("======================================远程调用转换开始启动================================="); diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java index 8184a61e..2a8b4c82 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java @@ -128,10 +128,10 @@ public class SyncUserService { Map params = new HashMap(); params.put("cookie", Base64.encodeBase64String(cookie)); // params.put("timestamp", System.currentTimeMillis()); - Calendar calendar = Calendar.getInstance(); - String timestamp = sdf.format(calendar.getTime()); - params.put("timestamp", timestamp); - +// Calendar calendar = Calendar.getInstance(); +// String timestamp = sdf.format(calendar.getTime()); +// params.put("timestamp", timestamp); + params.put("timestamp",""); // 组织参数 params.put("filter", "(orgNumber=*)"); params.put("basedn", "ou=Organizations,o=foton.com.cn,o=isp");