chore: bug

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualComponentController.java

@@ -1,6 +1,5 @@
 package com.cloud.kicc.system.bigscreen.controller;
 
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
@@ -15,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Arrays;
-import java.util.Map;
 
 /**
  *<p>
@@ -47,13 +45,6 @@ public class VisualComponentController {
 		return R.ok(detail);
 	}
 
-	@GetMapping("/content")
-	@ApiOperation(value = "组件详情", notes = "传入id")
-	public Map<String, Object> content(String id) {
-		VisualComponent detail = visualComponentService.getById(id);
-		return JSONUtil.toBean(detail.getContent(), Map.class);
-	}
-
 	@PostMapping("/save")
 	@ApiOperation(value = "新增", notes = "传入visualComponent")
 	public R save(@Valid @RequestBody VisualComponent visualComponent) {

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualMapController.java

@@ -1,9 +1,6 @@
 package com.cloud.kicc.system.bigscreen.controller;
 
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
@@ -12,13 +9,11 @@ import com.cloud.kicc.system.api.bigscreen.entity.VisualMap;
 import com.cloud.kicc.system.bigscreen.service.IVisualMapService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Arrays;
-import java.util.Map;
 
 
 /**
@@ -51,13 +46,6 @@ public class VisualMapController {
 		return R.ok(detail);
 	}
 
-	@GetMapping("/data")
-	@ApiOperation(value = "数据详情", notes = "传入id")
-	public Map<String, Object> data(String id) {
-		VisualMap detail = visualMapService.getById(id);
-		return JSONUtil.toBean(detail.getData(), Map.class);
-	}
-
 	@PostMapping("/save")
 	@ApiOperation(value = "新增", notes = "传入visualMap")
 	public R save(@Valid @RequestBody VisualMap visualMap) {

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/controller/VisualProxyController.java

@@ -1,11 +1,10 @@
 package com.cloud.kicc.system.bigscreen.controller;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.cloud.kicc.common.core.api.R;
 import com.cloud.kicc.common.core.constant.AppConstants;
 import com.cloud.kicc.common.core.constant.StringPool;
 import com.cloud.kicc.system.api.bigscreen.dto.VisualProxyDto;
@@ -39,7 +38,7 @@ public class VisualProxyController {
 
 	@RequestMapping("/proxy")
 	@ApiOperation(value = "接口代理", notes = "接口代理")
-	public Object proxy(@RequestBody VisualProxyDto proxy) {
+	public R proxy(@RequestBody VisualProxyDto proxy) {
 		// 获取参数
 		String url = proxy.getUrl();
 		String method = proxy.getMethod();
@@ -62,10 +61,9 @@ public class VisualProxyController {
 		}
 		// 判断返回结果集
 		if (StrUtil.isBlank(request)) {
-			return MapUtil.<String, Object>builder("code", 400).put("msg", "获取数据失败,请检查参数配置!").build();
+			return R.error("获取数据失败,请检查参数配置!");
 		} else {
-			Map<String, Object> result = JSONUtil.toBean(request, Map.class);
+			return R.ok(request);
-			return CollectionUtil.isEmpty(result) ? request : result;
 		}
 	}
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/util/RequestUtil.java

@@ -5,6 +5,8 @@ import com.cloud.kicc.common.core.constant.StringPool;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.util.Map;
 
 /**
@@ -147,7 +149,13 @@ public class RequestUtil {
 			OkHttpClient okHttpClient = new OkHttpClient();
 			response = okHttpClient.newCall(request).execute();
 			if (response.isSuccessful()) {
-				return response.body().string();
+				BufferedReader rd = new BufferedReader(new InputStreamReader(response.body().byteStream()));
+				StringBuffer result = new StringBuffer();
+				String line;
+				while ((line = rd.readLine()) != null) {
+					result.append(line);
+				}
+				return result.toString();
 			}
 		} catch (Exception e) {
 			log.error("okhttp3 post error >> ex = {}", e.getMessage());