From bce2d3dc563ab97d7ac734b592e214867539b73d Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 20 Jul 2023 17:45:41 +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 --- .../service/impl/DataSyncServiceImpl.java | 17 +++++++++-------- .../impl/SarBussionessStandServiceImpl.java | 1 + .../adc/da/sync/service/SyncUserService.java | 12 +++++++----- .../java/com/adc/da/sync/util/AuthUtils.java | 9 +++++++++ 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java index a9aab548..2c23db83 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java @@ -532,14 +532,15 @@ public class DataSyncServiceImpl implements IDataSyncService { tsInstitutionService.updateBatchById(updateTsInstitutionList); } //需要删除的数据 - if(!delTsInstitutionList.isEmpty()){ - logger.debug("本次删除的组织机构为："+JSONObject.toJSONString(delTsInstitutionList)); - List delIdList = new ArrayList<>(); - for(TsInstitution data : delTsInstitutionList){ - delIdList.add(data.getId()); - } - tsInstitutionService.removeByIds(delIdList); - } + // 先行注释，会删除所有部门 +// if(!delTsInstitutionList.isEmpty()){ +// logger.debug("本次删除的组织机构为："+JSONObject.toJSONString(delTsInstitutionList)); +// List delIdList = new ArrayList<>(); +// for(TsInstitution data : delTsInstitutionList){ +// delIdList.add(data.getId()); +// } +// tsInstitutionService.removeByIds(delIdList); +// } //全部部门 List allTsInstitutionListForPids = new ArrayList<>(addTsInstitutionList); allTsInstitutionListForPids.addAll(updateTsInstitutionList); 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 56f5420c..96474c70 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 @@ -5021,6 +5021,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("ORI_ATT_ID",fileId); objectQueryWrapper.eq("USE_MODEL","SOURCE_FILE"); + objectQueryWrapper.eq("VALID_FLAG","0"); //objectQueryWrapper.ne("FILE_SUFFIX","docx"); List sarBussStandFiles = sarBussStandFileEODao.selectList(objectQueryWrapper); if(!sarBussStandFiles.isEmpty()) { 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 ea51206b..8184a61e 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 @@ -10,10 +10,8 @@ import net.sf.json.JSONSerializer; import org.apache.commons.codec.binary.Base64; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; @Service("syncUserService") @Slf4j @@ -121,6 +119,7 @@ public class SyncUserService { public List syncFotonOrg()throws Exception{ String appuser = "app_slrs"; String appkey = "Fxi5LHbI5yGbQQDpVp86GcCdXeC5Bjfe"; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss'Z'"); AuthUtils util = new AuthUtils(appuser, appkey, null); byte[] cookie = null; @@ -128,7 +127,10 @@ public class SyncUserService { do { Map params = new HashMap(); params.put("cookie", Base64.encodeBase64String(cookie)); - params.put("timestamp", System.currentTimeMillis()); +// params.put("timestamp", System.currentTimeMillis()); + Calendar calendar = Calendar.getInstance(); + String timestamp = sdf.format(calendar.getTime()); + params.put("timestamp", timestamp); // 组织参数 params.put("filter", "(orgNumber=*)"); diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/util/AuthUtils.java b/adc-da-sys/src/main/java/com/adc/da/sync/util/AuthUtils.java index 3a085b1f..a5cf5057 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/util/AuthUtils.java +++ b/adc-da-sys/src/main/java/com/adc/da/sync/util/AuthUtils.java @@ -4,6 +4,7 @@ import net.sf.json.JSONObject; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.http.Header; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpUriRequest; @@ -13,12 +14,15 @@ import org.apache.http.entity.ContentType; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Map; public class AuthUtils { + Logger logger = LoggerFactory.getLogger(AuthUtils.class); private static SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss'Z'"); @@ -36,6 +40,7 @@ public class AuthUtils { HttpPost httpPost = new HttpPost(url); createSignHeader(httpPost, params); JSONObject object = JSONObject.fromObject(params); + params.forEach((key,value) -> logger.info("请求参数：{}：{}",key,value)); httpPost.setEntity(new ByteArrayEntity(object.toString().getBytes(), ContentType.APPLICATION_JSON)); return execute(httpPost); } @@ -45,6 +50,10 @@ public class AuthUtils { CloseableHttpResponse resp = null; try { client = HttpClientBuilder.create().build(); + logger.info("请求地址："+request.getURI().toString()); + for (Header header : request.getAllHeaders()) { + logger.info("请求头:"+header.toString()); + } resp = client.execute(request); return EntityUtils.toString(resp.getEntity()); } finally {