From c5c486b4465c37f348589b5794ddedd49c832adc Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 5 Aug 2024 11:35:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E9=94=81=20key=20=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aspect/JobAnnotationAspect.java | 15 ++++++++------ .../basicdata/aspect/JobAnnotationAspect.java | 15 ++++++++------ .../aspect/ChangeAsyncAnnotationAspect.java | 20 ++++++++++--------- .../aspect/ChangeAsyncAnnotationAspect.java | 20 ++++++++++--------- .../jinpai/aspect/JobAnnotationAspect.java | 15 ++++++++------ .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ .../olo/aspect/JobAnnotationAspect.java | 15 ++++++++------ .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ .../factory/aspect/JobAnnotationAspect.java | 16 ++++++++------- .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ .../jobhandler/OpFailPackageRetryJob.java | 2 +- .../java/com/logpm/factory/TestService.java | 11 ++++++---- .../patch/aspect/JobAnnotationAspect.java | 15 ++++++++------ .../LocalServerLoginAccountsInterceptor.java | 17 +++++++++------- .../aspect/ChangeAsyncAnnotationAspect.java | 20 ++++++++++--------- .../LocalServerLoginAccountsInterceptor.java | 15 ++++++++------ 21 files changed, 186 insertions(+), 130 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/aspect/JobAnnotationAspect.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/aspect/JobAnnotationAspect.java index 9d2d5e5e1..bd8f9adae 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/aspect/JobAnnotationAspect.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/aspect/JobAnnotationAspect.java @@ -65,15 +65,18 @@ public class JobAnnotationAspect { private JSONObject mockLogin() throws InterruptedException { String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/JobAnnotationAspect.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/JobAnnotationAspect.java index 8efaac5fe..223dbf174 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/JobAnnotationAspect.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/aspect/JobAnnotationAspect.java @@ -64,15 +64,18 @@ public class JobAnnotationAspect { private JSONObject mockLogin() throws InterruptedException { String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/aspect/ChangeAsyncAnnotationAspect.java b/blade-service/logpm-business/src/main/java/com/logpm/business/aspect/ChangeAsyncAnnotationAspect.java index 68adae5a1..cfe9aa07b 100644 --- a/blade-service/logpm-business/src/main/java/com/logpm/business/aspect/ChangeAsyncAnnotationAspect.java +++ b/blade-service/logpm-business/src/main/java/com/logpm/business/aspect/ChangeAsyncAnnotationAspect.java @@ -71,15 +71,17 @@ public class ChangeAsyncAnnotationAspect { } // 执行模拟登录 if (StringUtil.isNotBlank(tenantId)) { - JSONObject data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account); - if (Objects.isNull(data)) { - boolean flag = redisLockClient.tryLock("local_server_user" + tenantId, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); - if (flag) { - data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account); - if (Objects.isNull(data)) { - data = mockLoginService.mockToken(tenantId, account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account, data, 2591990L); - redisLockClient.unLock("local_server_user" + tenantId, LockType.FAIR); + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); + if(Objects.isNull(data)){ + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + if(flag){ + data =bladeRedis.get(key); + if(Objects.isNull(data)){ + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/aspect/ChangeAsyncAnnotationAspect.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/aspect/ChangeAsyncAnnotationAspect.java index 0c71ce197..c14214b2e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/aspect/ChangeAsyncAnnotationAspect.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/aspect/ChangeAsyncAnnotationAspect.java @@ -73,15 +73,17 @@ public class ChangeAsyncAnnotationAspect { } // 执行模拟登录 if (StringUtil.isNotBlank(tenantId)) { - JSONObject data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account); - if (Objects.isNull(data)) { - boolean flag = redisLockClient.tryLock("local_server_user" + tenantId, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); - if (flag) { - data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account); - if (Objects.isNull(data)) { - data = mockLoginService.mockToken(tenantId, account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account, data, 2591990L); - redisLockClient.unLock("local_server_user" + tenantId, LockType.FAIR); + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); + if(Objects.isNull(data)){ + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + if(flag){ + data =bladeRedis.get(key); + if(Objects.isNull(data)){ + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/aspect/JobAnnotationAspect.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/aspect/JobAnnotationAspect.java index f20d87566..3489986ce 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/aspect/JobAnnotationAspect.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/aspect/JobAnnotationAspect.java @@ -64,15 +64,18 @@ public class JobAnnotationAspect { private JSONObject mockLogin() throws InterruptedException { String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/LocalServerLoginAccountsInterceptor.java index 229b2582c..1fb696878 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/interceptor/LocalServerLoginAccountsInterceptor.java @@ -45,15 +45,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { org.springblade.common.wrapper.CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/interceptor/LocalServerLoginAccountsInterceptor.java index ddd3c3d8f..6f7eb3152 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-linsy/src/main/java/com/logpm/factorydata/linsy/interceptor/LocalServerLoginAccountsInterceptor.java @@ -45,15 +45,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { org.springblade.common.wrapper.CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/interceptor/LocalServerLoginAccountsInterceptor.java index e6af2dcf0..a4a353f76 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/interceptor/LocalServerLoginAccountsInterceptor.java @@ -40,15 +40,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/interceptor/LocalServerLoginAccountsInterceptor.java index f1c0d7eb1..924d06775 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-mwh/src/main/java/com/logpm/factorydata/mwh/interceptor/LocalServerLoginAccountsInterceptor.java @@ -45,15 +45,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { org.springblade.common.wrapper.CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/JobAnnotationAspect.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/JobAnnotationAspect.java index f51b4515b..981288d42 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/JobAnnotationAspect.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/aspect/JobAnnotationAspect.java @@ -64,15 +64,18 @@ public class JobAnnotationAspect { private JSONObject mockLogin() throws InterruptedException { String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/interceptor/LocalServerLoginAccountsInterceptor.java index b54dfe272..f63b4f636 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/interceptor/LocalServerLoginAccountsInterceptor.java @@ -45,15 +45,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/LocalServerLoginAccountsInterceptor.java index 8f64503e3..d9385aff8 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/interceptor/LocalServerLoginAccountsInterceptor.java @@ -45,15 +45,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { org.springblade.common.wrapper.CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/interceptor/LocalServerLoginAccountsInterceptor.java index 454a094d4..74e209f02 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-zbom/src/main/java/com/logpm/factorydata/zbom/interceptor/LocalServerLoginAccountsInterceptor.java @@ -45,15 +45,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { org.springblade.common.wrapper.CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/aspect/JobAnnotationAspect.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/aspect/JobAnnotationAspect.java index 896698111..a038cc1a0 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/aspect/JobAnnotationAspect.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/aspect/JobAnnotationAspect.java @@ -56,17 +56,19 @@ public class JobAnnotationAspect { } private JSONObject mockLogin() throws InterruptedException { - String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java index 67af8ebfd..58f9dc95c 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/interceptor/LocalServerLoginAccountsInterceptor.java @@ -45,15 +45,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java index edc18a098..a6ce75355 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java @@ -53,7 +53,7 @@ public class OpFailPackageRetryJob { opFailRetryPushPackageService.retry(batchData); - if (batchData.size() == quantity) { + if (batchData.size()== quantity) { batchHandleData(batchData.get(quantity - 1).getId(), quantity); } } diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java index d1a15041a..aaeba9c9c 100644 --- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java +++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java @@ -1101,12 +1101,15 @@ public class TestService { } public static void main(String[] args) throws IOException, InterruptedException { + Integer a = new Integer("22222"); - Date data1 = DateUtil.parse("2024-07-23 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS"); - Date data2 = DateUtil.parse("2024-07-24 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS"); + System.out.println(22222==a); - System.out.println(data1.getTime()); - System.out.println(data2.getTime()); +// Date data1 = DateUtil.parse("2024-07-23 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS"); +// Date data2 = DateUtil.parse("2024-07-24 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS"); +// +// System.out.println(data1.getTime()); +// System.out.println(data2.getTime()); diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/aspect/JobAnnotationAspect.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/aspect/JobAnnotationAspect.java index e64602118..12df4b310 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/aspect/JobAnnotationAspect.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/aspect/JobAnnotationAspect.java @@ -64,15 +64,18 @@ public class JobAnnotationAspect { private JSONObject mockLogin() throws InterruptedException { String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/interceptor/LocalServerLoginAccountsInterceptor.java index e1c23bab7..2bc52908f 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/interceptor/LocalServerLoginAccountsInterceptor.java @@ -47,15 +47,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } @@ -68,7 +71,7 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt wrappedRequest.addHeader("Blade-Auth", "bearer "+data.getString("access_token")); HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.add("Blade-Auth","bearer "+data.get("access_token") ); - httpHeaders.add( "Authorization", "Basic c2FiZXI6c2FiZXJfc2VjcmV0"); + httpHeaders.add( "Authorization", "Basic bG9jYWw6bG9jYWxfc2VjcmV0"); ThreadLocalUtil.put("bladeContext", httpHeaders); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/aspect/ChangeAsyncAnnotationAspect.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/aspect/ChangeAsyncAnnotationAspect.java index bc17b4c73..be3e04955 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/aspect/ChangeAsyncAnnotationAspect.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/aspect/ChangeAsyncAnnotationAspect.java @@ -71,15 +71,17 @@ public class ChangeAsyncAnnotationAspect { } // 执行模拟登录 if (StringUtil.isNotBlank(tenantId)) { - JSONObject data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account); - if (Objects.isNull(data)) { - boolean flag = redisLockClient.tryLock("local_server_user" + tenantId, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); - if (flag) { - data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account); - if (Objects.isNull(data)) { - data = mockLoginService.mockToken(tenantId, account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account, data, 2591990L); - redisLockClient.unLock("local_server_user" + tenantId, LockType.FAIR); + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); + if(Objects.isNull(data)){ + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + if(flag){ + data =bladeRedis.get(key); + if(Objects.isNull(data)){ + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/interceptor/LocalServerLoginAccountsInterceptor.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/interceptor/LocalServerLoginAccountsInterceptor.java index 515c3e11d..1e1e46913 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/interceptor/LocalServerLoginAccountsInterceptor.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/config/interceptor/LocalServerLoginAccountsInterceptor.java @@ -44,15 +44,18 @@ public class LocalServerLoginAccountsInterceptor extends HandlerInterceptorAdapt try { CustomHttpServletRequestWrapper wrappedRequest = new CustomHttpServletRequestWrapper(request); String account ="shujutongbu"; - JSONObject data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + String tenantId ="627683"; + String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account; + String lockKey =key+":lock"; + JSONObject data =bladeRedis.get(key); if(Objects.isNull(data)){ - boolean flag = redisLockClient.tryLock("local_server_user", LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); + boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS); if(flag){ - data =bladeRedis.get(CacheNames.LOCAL_SERVER_USER+account); + data =bladeRedis.get(key); if(Objects.isNull(data)){ - data = mockLoginService.mockToken("627683",account); - bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L); - redisLockClient.unLock("local_server_user", LockType.FAIR); + data = mockLoginService.mockToken(tenantId,account); + bladeRedis.setEx(key,data,2591990L); + redisLockClient.unLock(lockKey, LockType.FAIR); } } } From e6bc229252e42c7b919317d1c032764efea82a41 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 5 Aug 2024 12:05:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=AC=A7=E6=B4=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E6=8E=A8=E6=9F=A5=E8=AF=A2=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factory/jobhandler/OpFailPackageRetryJob.java | 5 ++++- .../factory/oupai/mapper/OpFailRetryPushPackageMapper.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java index a6ce75355..b40f1c260 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java @@ -51,8 +51,11 @@ public class OpFailPackageRetryJob { private void batchHandleData(Long startId, Integer quantity) { List batchData = opFailRetryPushPackageMapper.selectWaitData(quantity, startId); - opFailRetryPushPackageService.retry(batchData); + log.info("OpFailPackageRetryJob batchHandleData startId:{},quantity:{}",startId,quantity); +// opFailRetryPushPackageService.retry(batchData); + log.info("OpFailPackageRetryJob batchHandleData end"); + log.info("batchData.size {}",batchData.size()); if (batchData.size()== quantity) { batchHandleData(batchData.get(quantity - 1).getId(), quantity); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/OpFailRetryPushPackageMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/OpFailRetryPushPackageMapper.xml index 825e5078b..6edbdc657 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/OpFailRetryPushPackageMapper.xml +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/mapper/OpFailRetryPushPackageMapper.xml @@ -24,7 +24,7 @@ SELECT * FROM logpm_factory.op_fail_retry_push_package WHERE push_status = 1 - id > #{startId} + and id > #{startId} ORDER BY id LIMIT #{limit} From 244f97815634d931f51e823117d024dcf34da777 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Mon, 5 Aug 2024 14:25:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(all):=20=E8=87=AA=E6=8F=90=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=92=8C=E9=85=8D=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=AD=BE=E6=94=B6=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/report/mapper/ReportBillLoadingMapper.xml | 6 ++++++ .../java/com/logpm/report/mapper/ReportDeliverMapper.xml | 5 +++++ .../main/java/com/logpm/report/vo/BillLoadingDetailsVO.java | 4 ++++ .../src/main/java/com/logpm/report/vo/ReportDetailVO.java | 4 ++++ 4 files changed, 19 insertions(+) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml index a6d28ac2f..13a0a41b5 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml @@ -11,6 +11,7 @@ order_code, packet_bar_code, train_number, + sign_num, firsts, second, third_product, @@ -31,6 +32,7 @@ dsa.order_code, t.packet_bar_code, dsa.train_number, + 1 sign_num, dpl.firsts, dpl.second, dpl.third_product, @@ -59,6 +61,7 @@ order_code, packet_bar_code, train_number, + sign_num, firsts, second, third_product, @@ -79,6 +82,7 @@ dsa.order_code, '' packet_bar_code, dsa.train_number, + 1 sign_num, '' firsts, '' second, '' third_product, @@ -108,6 +112,7 @@ order_code, packet_bar_code, train_number, + sign_num, firsts, second, third_product, @@ -128,6 +133,7 @@ dsa.order_code, dpl.order_package_code packet_bar_code, dsa.train_number, + dbls.quantity sign_num, dpl.firsts, dpl.second, dpl.third_product, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml index 63144e956..93cdc687b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportDeliverMapper.xml @@ -342,6 +342,7 @@ lds_signee_name, signing_status, signing_time, + sign_num, examine_user_name, abnormal_signing, abnormal_loading, @@ -374,6 +375,7 @@ ldsa.customer_telephone delivery_phone, ldsa.customer_address delivery_address, wi.consignee consignee, + 1 sign_num, wi.consignee_name consignee_name, wi.consignee_mobile consignee_mobile, dpl.waybill_number waybill_no, @@ -495,6 +497,7 @@ conditions, firsts, decond, + third_product, material_code, material_name, @@ -509,6 +512,7 @@ lds_signee_name, signing_status, signing_time, + sign_num, examine_user_name, abnormal_signing, abnormal_loading, @@ -573,6 +577,7 @@ WHEN ldl.signfor_state = 2 THEN '已签收' END driver_signing, + ldl.received_quantity sign_num, ldl.scan_time unload_time, ldl.scan_user un_administrators_name, diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingDetailsVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingDetailsVO.java index 50250913a..65d2fa2fa 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingDetailsVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/BillLoadingDetailsVO.java @@ -101,4 +101,8 @@ public class BillLoadingDetailsVO implements Serializable { @ExcelProperty("文员复核人") private String examineUser; + @ApiModelProperty(value = "签收数量") + @ExcelProperty("签收数量") + private String signNum; + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java index 6c8014dcc..67c955615 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportDetailVO.java @@ -161,6 +161,10 @@ public class ReportDetailVO implements Serializable { @ExcelProperty("签收人") private String ldsSigneeName; + @ApiModelProperty(value = "签收数量") + @ExcelProperty("签收数量") + private String signNum; + @ApiModelProperty(value = "文员审核状态") @ExcelProperty("文员审核状态") private String signingStatus;