钻取支持分享界面

bi-server/src/main/java/com/usoftchina/bi/server/aspect/JwtTokenAspect.java

@@ -15,6 +15,7 @@ import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Calendar;
@@ -82,6 +83,9 @@ public class JwtTokenAspect {
 
         Object[] arg = joinPoint.getArgs();
         String token = (String) arg[0];
+        if( StringUtils.isEmpty(token) || "null".equals(token) ){
+            return null;
+        }
 
         JWTVerifier verifier = null;
         try {

bi-server/src/main/java/com/usoftchina/bi/server/controller/chart/ShowChartsController.java

@@ -44,7 +44,7 @@ public class ShowChartsController {
     @ApiOperation(value = "展示柱状图", notes = "展示柱状图", response = RepEntity.class)
     @CheckToken
     @PostMapping("/showHistogram")
-    public RepEntity showHistogram(@RequestHeader String token,@RequestBody HistogramConfigInfo body){
+    public RepEntity showHistogram(@RequestHeader(required = false) String token,@RequestBody HistogramConfigInfo body){
         return showHistogramService.showHistogram(body, token, 0);
     }
 
@@ -54,7 +54,7 @@ public class ShowChartsController {
     @ApiOperation(value = "展示饼图", notes = "展示图表", response = RepEntity.class)
     @CheckToken
     @PostMapping("/showPie")
-    public RepEntity showPie(@RequestHeader String token,@RequestBody PieConfigInfo body){
+    public RepEntity showPie(@RequestHeader(required = false) String token,@RequestBody PieConfigInfo body){
         return showPieService.showPie(body, token, 0, null);
     }
 
@@ -64,7 +64,7 @@ public class ShowChartsController {
     @ApiOperation(value = "展示line", notes = "展示line", response = RepEntity.class)
     @CheckToken
     @PostMapping("/showLine")
-    public RepEntity showLine(@RequestHeader String token,@RequestBody LineConfigInfo body){
+    public RepEntity showLine(@RequestHeader(required = false) String token,@RequestBody LineConfigInfo body){
         return showLineService.showLine(body, token, 0, null);
     }
 

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowHistogramService.java

@@ -4,13 +4,18 @@ import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.utils.CalculationJudgeUtil;
 import com.usoftchina.bi.core.utils.CollectionUtils;
+import com.usoftchina.bi.core.utils.EncryUtil;
 import com.usoftchina.bi.server.dao.chart.ChartsConfigMapper;
 import com.usoftchina.bi.server.dao.chart.ShowChartsMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.usoftchina.bi.server.dao.dashboard.DashboardsMapper;
 import com.usoftchina.bi.server.model.bo.*;
+import com.usoftchina.bi.server.model.po.User;
 import com.usoftchina.bi.server.model.vo.configVo.HistogramConfigInfo;
+import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
 import com.usoftchina.bi.server.model.vo.dataVo.ChartsDataInfo;
 import com.usoftchina.bi.core.jdbc.DynamicDataSourceContextHolder;
+import com.usoftchina.bi.server.service.user.UserService;
 import com.usoftchina.bi.server.utils.ScreenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -36,12 +41,19 @@ public class ShowHistogramService {
     ScreenUtil screenUtil;
     @Autowired
     ChartsUtilService chartsUtilService;
+    @Autowired
+    UserService userService;
 
     /*
     柱状图数据展示
      */
     @Cacheable(value = "Histogram", key = "#histogramConfigInfo.toString()+#dashId")
     public RepEntity<ChartsDataInfo> showHistogram(HistogramConfigInfo histogramConfigInfo, String token, int dashId){
+        if (StringUtils.isEmpty(token) || "null".equals(token)) {
+            User user = userService.getUserById(chartsConfigMapper.getCreateId(histogramConfigInfo.getId())).getData();
+            LoginInfo loginInfo = new LoginInfo(user.getUserName(), EncryUtil.decryptPassword(user.getPassWord()));
+            token = userService.login(loginInfo).getData().getToken();
+        }
         Assert.notNull(histogramConfigInfo, "请求参数不能为空");
         /* 变量定义 */
         ChartsDataInfo chartsDataInfo = new ChartsDataInfo();

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowLineService.java

@@ -4,12 +4,17 @@ import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.utils.CalculationJudgeUtil;
 import com.usoftchina.bi.core.utils.CollectionUtils;
+import com.usoftchina.bi.core.utils.EncryUtil;
 import com.usoftchina.bi.server.dao.chart.ChartsConfigMapper;
 import com.usoftchina.bi.server.dao.chart.ShowChartsMapper;
+import com.usoftchina.bi.server.dao.dashboard.DashboardsMapper;
 import com.usoftchina.bi.server.model.bo.*;
+import com.usoftchina.bi.server.model.po.User;
 import com.usoftchina.bi.server.model.vo.configVo.LineConfigInfo;
+import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
 import com.usoftchina.bi.server.model.vo.dataVo.ChartsDataInfo;
 import com.usoftchina.bi.core.jdbc.DynamicDataSourceContextHolder;
+import com.usoftchina.bi.server.service.user.UserService;
 import com.usoftchina.bi.server.utils.ScreenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,11 +37,17 @@ public class ShowLineService {
     ScreenUtil screenUtil;
     @Autowired
     ChartsUtilService chartsUtilService;
-
+    @Autowired
+    UserService userService;
     /*
     Line数据展示
      */
     public RepEntity showLine(LineConfigInfo lineConfigInfo, String token, int dashId, String styleConfig){
+        if (StringUtils.isEmpty(token) || "null".equals(token)) {
+            User user = userService.getUserById(chartsConfigMapper.getCreateId(lineConfigInfo.getId())).getData();
+            LoginInfo loginInfo = new LoginInfo(user.getUserName(), EncryUtil.decryptPassword(user.getPassWord()));
+            token = userService.login(loginInfo).getData().getToken();
+        }
         Assert.notNull(lineConfigInfo, "请求参数不能为空");
          /* 变量定义 */
         ChartsDataInfo chartsDataInfo = new ChartsDataInfo();

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowPieService.java

@@ -4,12 +4,17 @@ import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.utils.CalculationJudgeUtil;
 import com.usoftchina.bi.core.utils.CollectionUtils;
+import com.usoftchina.bi.core.utils.EncryUtil;
 import com.usoftchina.bi.server.dao.chart.ChartsConfigMapper;
 import com.usoftchina.bi.server.dao.chart.ShowChartsMapper;
+import com.usoftchina.bi.server.dao.dashboard.DashboardsMapper;
 import com.usoftchina.bi.server.model.bo.*;
+import com.usoftchina.bi.server.model.po.User;
+import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
 import com.usoftchina.bi.server.model.vo.configVo.PieConfigInfo;
 import com.usoftchina.bi.server.model.vo.dataVo.ChartsDataInfo;
 import com.usoftchina.bi.core.jdbc.DynamicDataSourceContextHolder;
+import com.usoftchina.bi.server.service.user.UserService;
 import com.usoftchina.bi.server.utils.ScreenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,11 +37,18 @@ public class ShowPieService {
     GetChartsDataUtilService getChartsDataUtilService;
     @Autowired
     ChartsUtilService chartsUtilService;
+    @Autowired
+    UserService userService;
 
     /*
     Pie数据展示
      */
     public RepEntity showPie(PieConfigInfo pieConfigInfo, String token, int dashId, String styleConfig){
+        if (StringUtils.isEmpty(token) || "null".equals(token)) {
+            User user = userService.getUserById(chartsConfigMapper.getCreateId(pieConfigInfo.getId())).getData();
+            LoginInfo loginInfo = new LoginInfo(user.getUserName(), EncryUtil.decryptPassword(user.getPassWord()));
+            token = userService.login(loginInfo).getData().getToken();
+        }
         Assert.notNull(pieConfigInfo, "请求参数不能为空");
         /* 变量定义 */
         ChartsDataInfo<PieSeries> chartsDataInfo = new ChartsDataInfo();

bi-server/src/main/resources/static/index.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>BI 商业智能平台</title>
-<link rel="shortcut icon" href="favicon.png"><link href="index.76220087.css" rel="stylesheet"></head>
+<link rel="shortcut icon" href="favicon.png"><link href="index.61211014.css" rel="stylesheet"></head>
 <body>
   <div id="root"></div>
-<script type="text/javascript" src="index.f8ae6dee.js"></script></body>
+<script type="text/javascript" src="index.216820f4.js"></script></body>
 </html>