Merge remote-tracking branch 'origin/MVP1.6.4' into MVP1.6.4

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialConfig.java

@@ -30,6 +30,7 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -175,9 +176,16 @@ public class SocialConfig {
 			if (!"200".equals(code)) {
 				throw new CheckedException("获取社保士兵【可执行的设备接口】失败，code="+code);
 			}
-			JSONArray dataArr = (JSONArray) bodyObject.get("data");
-			if (dataArr != null && !dataArr.isEmpty()) {
-				terminalId = ((JSONObject)dataArr.get(0)).getString("value");
+			List<HashMap> dataList = JSON.parseArray(bodyObject.getString("data"), HashMap.class);
+			String label;
+			if (dataList != null && !dataList.isEmpty()) {
+				for (HashMap data : dataList) {
+					terminalId = String.valueOf(data.get("value"));
+					label = String.valueOf(data.get("label"));
+					if (Common.isNotNull(label) && label.contains("空闲")) {
+						break;
+					}
+				}
 			}
 		}
 		if (Common.isEmpty(terminalId)) {

yifu-social/yifu-social-biz/src/main/resources/application-prd.yml

@@ -53,5 +53,5 @@ spring:
     password: '@yf_2022'
 #社保士兵相关属性配置
 soldier:
-    authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmODA2ZjRlYzYzZjY0NjVlOGFlZjRmZmVlOTYwMzcxNiIsInN1YiI6IjIiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLmtYvor5UiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiMiIsIm5iZiI6MTcxMjg5Mjk1OCwiZXhwIjoxNzIzMjYwOTU4LCJpYXQiOjE3MTI4OTI5NTh9.oTmhLfv1tLq8aPOfO3LeqM1IDYT76YGXkqpz3dwBX4M
-    urlPre: http://172.16.24.66:55555
+  authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MzcwYWIyZDRhZTI0NjQ2YTg0MTE0Mzk1Y2M2MTkzMiIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcxNjE3OTIxOSwiZXhwIjoxNzI2NTQ3MjE5LCJpYXQiOjE3MTYxNzkyMTl9.Ei-52hRlfMLXLzpzmbP2xCVFZKE5sHHexzfX5PtmZ_M
+  urlPre: http://60.168.131.18:55555
\ No newline at end of file