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