From 8690fcb35f1cc76bdaf28a306f211e82348e247f Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 14 Jun 2023 14:32:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=95=B0=E6=8D=AE=E7=9A=84=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/sync/service/SyncUserService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5e01e973..031142f7 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 @@ -29,12 +29,14 @@ public class SyncUserService { String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe"; AuthUtils util = new AuthUtils(appuser, appkey, null); + Long haoMiaoChuo = System.currentTimeMillis(); + Long chuo = haoMiaoChuo / 1000; List json=new ArrayList<>(); byte[] cookie = null; do { Map params = new HashMap(); params.put("cookie", Base64.encodeBase64String(cookie)); - params.put("timestamp", System.currentTimeMillis()); + params.put("timestamp", chuo); // 用户参数 params.put("filter", "(userid=*)"); From a67f4a1ce4d38ae3f06ae0b32596c20d84d99dd8 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 14 Jun 2023 15:57:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?pdf=E8=BD=AC=E6=8D=A2=EF=BC=88=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 58 +++++++++++++------ 1 file changed, 40 insertions(+), 18 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 7b5498fb..e1c1b058 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 @@ -4920,27 +4920,49 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussStandFilesList = sarBussStandFileEODao.selectList(objectQueryWrapperSarBussStandFile); if(sarBussStandFilesList.isEmpty() && sarBussStandFilesList.size()==0){ - AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFiles.get(0).getOriAttId()); - if(fileInfo!=null){ - String fileName = ""; - if(StringUtils.isNotBlank(fileInfo.getFileName())){ - String[] splitInfo = fileInfo.getFileName().split("\\."); - fileName = splitInfo[0]; - } - - Map bussMap = new HashMap<>(); - bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); - bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); - bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); - bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); - bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); - bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); - bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); - bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); - createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); + AttFileVo attFileVo = attFileEOService.wordConversionFilePdf(sarBussStandFiles.get(0).getOriAttId()); + if(attFileVo!=null){ + SarBussStandFile sarBussStandFile = new SarBussStandFile(); + //sarBussStandFile.setId(); + String uuId = com.adc.da.util.utils.UUID.randomUUID(20); + sarBussStandFile.setId(uuId); + sarBussStandFile.setStandId(sarBussStandFiles.get(0).getStandId()); + sarBussStandFile.setStandFileClassify(sarBussStandFiles.get(0).getStandFileClassify()); + sarBussStandFile.setAttId(attFileVo.getId()); + sarBussStandFile.setFileName(filePath+attFileVo.getFilePath()+attFileVo.getFileName()); + sarBussStandFile.setFileSuffix(attFileVo.getFileSuffix()); + sarBussStandFile.setUseModel(UseModuleEnum.WEB_FILE.getValue()); + sarBussStandFile.setPassword(sarBussStandFiles.get(0).getPassword()); + sarBussStandFile.setValidFlag(0); + sarBussStandFile.setCreationTime(new Date()); + sarBussStandFile.setModifyTime(new Date()); + sarBussStandFile.setOriAttId(sarBussStandFiles.get(0).getOriAttId()); + sarBussStandFileEODao.insert(sarBussStandFile); }else { logger.info("======================================word.doc转换失败================================="); } +// AttFileEO fileInfo = attFileEOService.getFileInfo(sarBussStandFiles.get(0).getOriAttId()); +// if(fileInfo!=null){ +// String fileName = ""; +// if(StringUtils.isNotBlank(fileInfo.getFileName())){ +// String[] splitInfo = fileInfo.getFileName().split("\\."); +// fileName = splitInfo[0]; +// } +// +// Map bussMap = new HashMap<>(); +// bussMap.put("FILE_SUFFIX",sarBussStandFiles.get(0).getFileSuffix()); +// bussMap.put("CONVERFILENAME",filePath+fileInfo.getFilePath()+fileInfo.getFileName()); +// bussMap.put("SAVEPDFPATH",filePath+fileInfo.getFilePath()+fileName+".pdf"); +// bussMap.put("STANDID",sarBussStandFiles.get(0).getStandId()); +// bussMap.put("STANDFILECLASSIFY",sarBussStandFiles.get(0).getStandFileClassify()); +// bussMap.put("FILENAME",filePath+fileInfo.getFilePath()+fileName+".pdf"); +// bussMap.put("PASSWORD",sarBussStandFiles.get(0).getPassword()); +// bussMap.put("OAIATTID",sarBussStandFiles.get(0).getOriAttId()); +// logger.info("======================================word.doc发送mq================================="); +// createOnlineEditingFileMQService.OnlineEditingFileMQ(bussMap); +// }else { +// logger.info("======================================word.doc转换失败================================="); +// } } } From 12b642f0a8e4b5c048c2bdffe586e4f2c2ede457 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Thu, 15 Jun 2023 09:22:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=80=E5=9B=9Epdf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 e1c1b058..754e34af 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 @@ -1361,13 +1361,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl