Merge branch 'dev' into pre-production

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);
+					data = mockLoginService.mockToken(tenantId,account);
-					bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+					bladeRedis.setEx(key,data,2591990L);
-					redisLockClient.unLock("local_server_user", LockType.FAIR);
+					redisLockClient.unLock(lockKey, LockType.FAIR);
 				}
 			}
 		}

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);
+					data = mockLoginService.mockToken(tenantId,account);
-					bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+					bladeRedis.setEx(key,data,2591990L);
-					redisLockClient.unLock("local_server_user", LockType.FAIR);
+					redisLockClient.unLock(lockKey, LockType.FAIR);
 				}
 			}
 		}

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);
+			String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account;
-			if (Objects.isNull(data)) {
+			String lockKey =key+":lock";
-				boolean flag = redisLockClient.tryLock("local_server_user" + tenantId, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
+			JSONObject data =bladeRedis.get(key);
-				if (flag) {
+			if(Objects.isNull(data)){
-					data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account);
+				boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
-					if (Objects.isNull(data)) {
+				if(flag){
-						data = mockLoginService.mockToken(tenantId, account);
+					data =bladeRedis.get(key);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account, data, 2591990L);
+					if(Objects.isNull(data)){
-						redisLockClient.unLock("local_server_user" + tenantId, LockType.FAIR);
+						data = mockLoginService.mockToken(tenantId,account);
+						bladeRedis.setEx(key,data,2591990L);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+			String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account;
-			if (Objects.isNull(data)) {
+			String lockKey =key+":lock";
-				boolean flag = redisLockClient.tryLock("local_server_user" + tenantId, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
+			JSONObject data =bladeRedis.get(key);
-				if (flag) {
+			if(Objects.isNull(data)){
-					data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account);
+				boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
-					if (Objects.isNull(data)) {
+				if(flag){
-						data = mockLoginService.mockToken(tenantId, account);
+					data =bladeRedis.get(key);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account, data, 2591990L);
+					if(Objects.isNull(data)){
-						redisLockClient.unLock("local_server_user" + tenantId, LockType.FAIR);
+						data = mockLoginService.mockToken(tenantId,account);
+						bladeRedis.setEx(key,data,2591990L);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+					data = mockLoginService.mockToken(tenantId,account);
-					bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+					bladeRedis.setEx(key,data,2591990L);
-					redisLockClient.unLock("local_server_user", LockType.FAIR);
+					redisLockClient.unLock(lockKey, LockType.FAIR);
 				}
 			}
 		}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+					data = mockLoginService.mockToken(tenantId,account);
-					bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+					bladeRedis.setEx(key,data,2591990L);
-					redisLockClient.unLock("local_server_user", LockType.FAIR);
+					redisLockClient.unLock(lockKey, LockType.FAIR);
 				}
 			}
 		}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+					data = mockLoginService.mockToken(tenantId,account);
-					bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+					bladeRedis.setEx(key,data,2591990L);
-					redisLockClient.unLock("local_server_user", LockType.FAIR);
+					redisLockClient.unLock(lockKey, LockType.FAIR);
 				}
 			}
 		}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java

@@ -51,9 +51,12 @@ public class OpFailPackageRetryJob {
 	private void batchHandleData(Long startId, Integer quantity) {
 		List<OpFailRetryPushPackageEntity> batchData = opFailRetryPushPackageMapper.selectWaitData(quantity, startId);
 
-		opFailRetryPushPackageService.retry(batchData);
+		log.info("OpFailPackageRetryJob batchHandleData startId:{},quantity:{}",startId,quantity);
+//		opFailRetryPushPackageService.retry(batchData);
 
-		if (batchData.size() == quantity) {
+		log.info("OpFailPackageRetryJob batchHandleData end");
+		log.info("batchData.size {}",batchData.size());
+		if (batchData.size()== quantity) {
 			batchHandleData(batchData.get(quantity - 1).getId(), quantity);
 		}
 	}

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
         <if test="startId != null">
-            id > #{startId}
+            and id > #{startId}
         </if>
         ORDER BY id
         LIMIT #{limit}

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");
+		System.out.println(22222==a);
-		Date data2 = DateUtil.parse("2024-07-24 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS");
 
-		System.out.println(data1.getTime());
+//		Date data1 = DateUtil.parse("2024-07-23 17:07:23.123","yyyy-MM-dd hh:mm:ss.SSS");
-		System.out.println(data2.getTime());
+//		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());
 
 
 

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);
+					data = mockLoginService.mockToken(tenantId,account);
-					bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+					bladeRedis.setEx(key,data,2591990L);
-					redisLockClient.unLock("local_server_user", LockType.FAIR);
+					redisLockClient.unLock(lockKey, LockType.FAIR);
 				}
 			}
 		}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						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);
 
 

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,

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,
 

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;
+
 }

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;

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);
+			String key =CacheNames.LOCAL_SERVER_USER+tenantId+":"+account;
-			if (Objects.isNull(data)) {
+			String lockKey =key+":lock";
-				boolean flag = redisLockClient.tryLock("local_server_user" + tenantId, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
+			JSONObject data =bladeRedis.get(key);
-				if (flag) {
+			if(Objects.isNull(data)){
-					data = bladeRedis.get(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account);
+				boolean flag = redisLockClient.tryLock(lockKey, LockType.FAIR, 5000, 10000, TimeUnit.MILLISECONDS);
-					if (Objects.isNull(data)) {
+				if(flag){
-						data = mockLoginService.mockToken(tenantId, account);
+					data =bladeRedis.get(key);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER + tenantId + ":" + account, data, 2591990L);
+					if(Objects.isNull(data)){
-						redisLockClient.unLock("local_server_user" + tenantId, LockType.FAIR);
+						data = mockLoginService.mockToken(tenantId,account);
+						bladeRedis.setEx(key,data,2591990L);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}

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);
+						data = mockLoginService.mockToken(tenantId,account);
-						bladeRedis.setEx(CacheNames.LOCAL_SERVER_USER+account,data,2591990L);
+						bladeRedis.setEx(key,data,2591990L);
-						redisLockClient.unLock("local_server_user", LockType.FAIR);
+						redisLockClient.unLock(lockKey, LockType.FAIR);
 					}
 				}
 			}