From 5c008256dbae86f43320860a69a097ad93da99c7 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 2 Mar 2022 11:23:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BEapi=E7=BC=BA=E5=B0=91=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/controller/panel/api/LinkApi.java     | 10 ++++------
 .../dataease/controller/panel/server/LinkServer.java  | 11 +++--------
 frontend/src/api/link/index.js                        |  4 ++--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java b/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java
index 0a8094aa22..48fd91e51d 100644
--- a/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java
+++ b/backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java
@@ -1,6 +1,5 @@
 package io.dataease.controller.panel.api;
 
-
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.auth.annotation.DePermission;
 import io.dataease.commons.constants.DePermissionType;
@@ -19,7 +18,6 @@ import java.util.Map;
 @RequestMapping("/api/link")
 public interface LinkApi {
 
-
     @DePermission(type = DePermissionType.PANEL, value = "resourceId")
     @ApiOperation("重置密码")
     @PostMapping("/resetPwd")
@@ -45,7 +43,6 @@ public interface LinkApi {
     @PostMapping("/currentGenerate/{resourceId}")
     GenerateDto currentGenerate(String resourceId);
 
-
     @ApiOperation("验证访问")
     @PostMapping("/validate")
     ValidateDto validate(LinkValidateRequest request) throws Exception;
@@ -59,10 +56,11 @@ public interface LinkApi {
     Object resourceDetail(@PathVariable String resourceId);
 
     @ApiOperation("视图详息")
-    @PostMapping("/viewDetail/{viewId}")
-    Object viewDetail(@PathVariable String viewId, @RequestBody ChartExtRequest requestList) throws Exception;
+    @PostMapping("/viewDetail/{viewId}/{panelId}")
+    Object viewDetail(@PathVariable("viewId") String viewId, @PathVariable("panelId") String panelId,
+            @RequestBody ChartExtRequest requestList) throws Exception;
 
     @ApiOperation("压缩链接")
     @PostMapping("/shortUrl")
-    String shortUrl(@RequestBody Map<String,String> param);
+    String shortUrl(@RequestBody Map<String, String> param);
 }
diff --git a/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java b/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java
index 43ab59b9a0..56f0e7fa0e 100644
--- a/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java
+++ b/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java
@@ -1,6 +1,5 @@
 package io.dataease.controller.panel.server;
 
-
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import io.dataease.auth.filter.F2CLinkFilter;
@@ -25,18 +24,15 @@ import javax.servlet.http.HttpServletRequest;
 import java.net.URLDecoder;
 import java.util.Map;
 
-
 @RestController
 public class LinkServer implements LinkApi {
 
-
     @Autowired
     private PanelLinkService panelLinkService;
 
     @Resource
     private ChartViewService chartViewService;
 
-
     @Override
     public void replacePwd(@RequestBody PasswordRequest request) {
         panelLinkService.password(request);
@@ -47,7 +43,6 @@ public class LinkServer implements LinkApi {
         panelLinkService.changeEnablePwd(request);
     }
 
-
     @Override
     public void resetOverTime(@RequestBody OverTimeRequest request) {
         panelLinkService.overTime(request);
@@ -96,8 +91,9 @@ public class LinkServer implements LinkApi {
     }
 
     @Override
-    public Object viewDetail(String viewId, ChartExtRequest requestList) throws Exception {
-        HttpServletRequest request =((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+    public Object viewDetail(String viewId, String panelId, ChartExtRequest requestList) throws Exception {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
         String linkToken = request.getHeader(F2CLinkFilter.LINK_TOKEN_KEY);
         DecodedJWT jwt = JWT.decode(linkToken);
         Long userId = jwt.getClaim("userId").asLong();
@@ -105,7 +101,6 @@ public class LinkServer implements LinkApi {
         return chartViewService.getData(viewId, requestList);
     }
 
-
     @Override
     public String shortUrl(Map<String, String> param) {
         String resourceId = param.get("resourceId");
diff --git a/frontend/src/api/link/index.js b/frontend/src/api/link/index.js
index 7cf27c9bff..eaa5133cfa 100644
--- a/frontend/src/api/link/index.js
+++ b/frontend/src/api/link/index.js
@@ -64,9 +64,9 @@ export function loadResource(resourceId) {
   })
 }
 
-export function viewInfo(id, data) {
+export function viewInfo(id, panelId, data) {
   return request({
-    url: 'api/link/viewDetail/' + id,
+    url: 'api/link/viewDetail/' + id + '/' + panelId,
     method: 'post',
     hideMsg: true,
     data