From fbc92756155983c8feb6d65895e87c7800d2fe67 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 11 Dec 2020 11:08:14 +0800
Subject: [PATCH] =?UTF-8?q?game=E8=AF=B7=E6=B1=82WPS=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=B9=E4=B8=BA=E7=9B=B4=E6=8E=A5http?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/game/service/ScreenService.java    | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/game/src/main/java/com/ccsens/game/service/ScreenService.java b/game/src/main/java/com/ccsens/game/service/ScreenService.java
index 835a3af5..1be35067 100644
--- a/game/src/main/java/com/ccsens/game/service/ScreenService.java
+++ b/game/src/main/java/com/ccsens/game/service/ScreenService.java
@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ccsens.cloudutil.bean.tall.dto.WpsDto;
@@ -1282,14 +1283,13 @@ public class ScreenService implements IScreenService {
         visitWpsUrl.setBusinessType(businessType);
         visitWpsUrl.setUserId(params.getUserId());
 
-//        String result = RestTemplateUtil.postBody(PropUtil.gatewayUrl + PropUtil.queryVisitUrls, visitWpsUrl);
-//        log.info("调用tall查看游戏已有配置表：{}",result);
-//        if(StrUtil.isNotEmpty(result)){
-//            JSONObject json = JSONObject.parseObject(result);
-//            wpsPath.add(result);
-////            wpsPath = (List<String>) json;
-//        }
-        wpsPath = tallFeignClient.queryVisitUrls(visitWpsUrl);
+        String result = RestTemplateUtil.postBody(PropUtil.gatewayUrl + PropUtil.queryVisitUrls, visitWpsUrl);
+        log.info("调用tall查看游戏已有配置表：{}",result);
+        if(StrUtil.isNotEmpty(result)){
+            List<String> list = JSONUtil.toList(JSONUtil.parseArray(result), String.class);
+            wpsPath.addAll(list);
+        }
+//        wpsPath = tallFeignClient.queryVisitUrls(visitWpsUrl);
         log.info("是否已有创建的游戏配置：{}",wpsPath);
         //有配置直接返回
         if (CollectionUtil.isNotEmpty(wpsPath)) {
@@ -1334,14 +1334,15 @@ public class ScreenService implements IScreenService {
         business.setFileSize(tmpFile.length());
         business.setOperation(WebConstant.Wps.USER_OPERATION_NEW);
         business.setPrivilege(WebConstant.Wps.PROJECT_PRIVILEGE_WRITE);
-//        RestTemplateUtil.postBody(PropUtil.gatewayUrl + PropUtil.saveWpsFile, business);
-        tallFeignClient.saveWpsFile(business);
-//        String s = RestTemplateUtil.postBody(PropUtil.gatewayUrl + PropUtil.queryVisitUrls, visitWpsUrl);
-//        if(StrUtil.isNotEmpty(s)){
-//            JSONObject json = JSONObject.parseObject(s);
-//            wpsPath = (List<String>) json;
-//        }
-        wpsPath = tallFeignClient.queryVisitUrls(visitWpsUrl);
+        RestTemplateUtil.postBody(PropUtil.gatewayUrl + PropUtil.saveWpsFile, business);
+//        tallFeignClient.saveWpsFile(business);
+        String result1 = RestTemplateUtil.postBody(PropUtil.gatewayUrl + PropUtil.queryVisitUrls, visitWpsUrl);
+        log.info("调用tall查看游戏已有配置表：{}",result1);
+        if(StrUtil.isNotEmpty(result1)){
+            List<String> list = JSONUtil.toList(JSONUtil.parseArray(result1), String.class);
+            wpsPath.addAll(list);
+        }
+//        wpsPath = tallFeignClient.queryVisitUrls(visitWpsUrl);
         return  wpsPath;
     }