1.修改部分bug

2.添加swagger动态接口文档
3.添加分页功能

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>BI</groupId>
   <artifactId>BI</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.3-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <name>BI Maven Webapp</name>
@@ -111,12 +111,13 @@
     <dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-swagger2</artifactId>
-      <version>2.7.0</version>
+      <version>2.6.1</version>
     </dependency>
+
     <dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-swagger-ui</artifactId>
-      <version>2.7.0</version>
+      <version>2.6.1</version>
     </dependency>
 
     <dependency>

src/main/java/com/Application.java

@@ -6,9 +6,11 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Import;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
 //@ComponentScan(basePackages={"com.util"})
+@EnableSwagger2
 @Import({DynamicDataSourceRegister.class})
 public class Application {
     public static void main(String[] args) {

src/main/java/com/Swagger2.java

@@ -0,0 +1,33 @@
+package com;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+@Configuration
+public class Swagger2 {
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("BI项目api文档")
+//                .description("简单优雅的restfun风格，http://blog.csdn.net/saytime")
+//                .termsOfServiceUrl("http://blog.csdn.net/saytime")
+                .version("1.0.2")
+                .build();
+    }
+}

src/main/java/com/config/exception/GlobalException.java

@@ -1,52 +1,52 @@
-package com.config.exception;
-
-import com.auth0.jwt.exceptions.InvalidClaimException;
-import org.apache.ibatis.binding.BindingException;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.management.OperationsException;
-import java.util.HashMap;
-import java.util.Map;
-
-@ControllerAdvice
-public class GlobalException {
-    @ExceptionHandler(RuntimeException.class)
-    @ResponseBody
-    public Map<String, Object> exceptionHandle(){
-        Map<String, Object> result = new HashMap<String, Object>();
-        result.put("code" , "-502");
-        result.put("msg" , "服务器异常");
-        return result;
-    }
-
-    @ExceptionHandler(OperationsException.class)
-    @ResponseBody
-    public Map<String, Object> operationsException(){
-        Map<String, Object> result = new HashMap<String, Object>();
-        result.put("code" , "-503");
-        result.put("msg", "权限不足");
-        return result;
-    }
-
-
-    @ExceptionHandler(BindingException.class)
-    @ResponseBody
-    public Map<String, Object> BindingException(){
-        Map<String, Object> result = new HashMap<String, Object>();
-        result.put("code" , "-504");
-        result.put("msg" , "数据为空");
-        return result;
-    }
-
-    @ExceptionHandler(InvalidClaimException.class)
-    @ResponseBody
-    public Map<String, Object> InvalidClaimException(){
-        Map<String, Object> result = new HashMap<String, Object>();
-        result.put("code" , "-505");
-        result.put("msg" , "token过期");
-        return result;
-    }
-
-}
+//package com.config.exception;
+//
+//import com.auth0.jwt.exceptions.InvalidClaimException;
+//import org.apache.ibatis.binding.BindingException;
+//import org.springframework.web.bind.annotation.ControllerAdvice;
+//import org.springframework.web.bind.annotation.ExceptionHandler;
+//import org.springframework.web.bind.annotation.ResponseBody;
+//
+//import javax.management.OperationsException;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//@ControllerAdvice
+//public class GlobalException {
+//    @ExceptionHandler(RuntimeException.class)
+//    @ResponseBody
+//    public Map<String, Object> exceptionHandle(){
+//        Map<String, Object> result = new HashMap<String, Object>();
+//        result.put("code" , "-502");
+//        result.put("msg" , "服务器异常");
+//        return result;
+//    }
+//
+//    @ExceptionHandler(OperationsException.class)
+//    @ResponseBody
+//    public Map<String, Object> operationsException(){
+//        Map<String, Object> result = new HashMap<String, Object>();
+//        result.put("code" , "-503");
+//        result.put("msg", "权限不足");
+//        return result;
+//    }
+//
+//
+//    @ExceptionHandler(BindingException.class)
+//    @ResponseBody
+//    public Map<String, Object> BindingException(){
+//        Map<String, Object> result = new HashMap<String, Object>();
+//        result.put("code" , "-504");
+//        result.put("msg" , "数据为空");
+//        return result;
+//    }
+//
+//    @ExceptionHandler(InvalidClaimException.class)
+//    @ResponseBody
+//    public Map<String, Object> InvalidClaimException(){
+//        Map<String, Object> result = new HashMap<String, Object>();
+//        result.put("code" , "-505");
+//        result.put("msg" , "token过期");
+//        return result;
+//    }
+//
+//}

src/main/java/com/controller/chart/ChartsConfigController.java

@@ -1,22 +1,24 @@
 package com.controller.chart;
 
-import com.model.pojo.annotation.CheckToken;
 import com.model.bo.GroupUpdateId;
 import com.model.pojo.RepEntity;
 import com.model.pojo.TestPage;
+import com.model.pojo.annotation.CheckToken;
 import com.model.vo.configVo.ChangeOrderInfo;
 import com.model.vo.configVo.ChartConfigInfo;
 import com.model.vo.configVo.GroupInfo;
 import com.server.chart.ChartsConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
+@Api(description = "图表配置相关接口")
 public class ChartsConfigController {
     @Autowired
     ChartsConfigService chartsConfigService;
@@ -24,17 +26,23 @@ public class ChartsConfigController {
    /*
    添加
     */
+    @ApiOperation(value = "添加图表", notes = "添加图表", response = RepEntity.class)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String",paramType = "header"),
+            @ApiImplicitParam(name = "body", value = "图表配置", required = true, dataType = "ChartConfigInfo", paramType = "body")
+    })
     @CheckToken
-    @RequestMapping("/inputCharts")
-    public RepEntity inputCharts(@RequestHeader String token,@RequestBody ChartConfigInfo body){
+    @PostMapping("/inputCharts")
+    public RepEntity inputCharts(@RequestHeader String token, @RequestBody ChartConfigInfo body){
         return chartsConfigService.setChartsConfig(body, token);
     }
 
     /*
    更新
     */
+    @ApiOperation(value = "更新图表", notes = "更新图表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/updateCharts")
+    @PostMapping("/updateCharts")
     public RepEntity updateCharts(@RequestHeader String token,@RequestBody ChartConfigInfo body){
         return chartsConfigService.updateChartsConfig(body, token);
     }
@@ -42,8 +50,9 @@ public class ChartsConfigController {
     /*
     移交图表
      */
+    @ApiOperation(value = "移交图表", notes = "移交图表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/changeChartOrder")
+    @PostMapping("/changeChartOrder")
     public RepEntity changeChartOrder(@RequestHeader String token, @RequestBody ChangeOrderInfo body){
         return chartsConfigService.changeChartOrder(body, token);
     }
@@ -51,8 +60,9 @@ public class ChartsConfigController {
     /*
     更新图表的分组
      */
+    @ApiOperation(value = "更新图表分组", notes = "更新图表分组", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/updateChartConfigGroup")
+    @PostMapping("/updateChartConfigGroup")
     public RepEntity updateConfigGroup(@RequestHeader String token, @RequestBody GroupUpdateId body){
         return chartsConfigService.updateConfigGroup(body);
     }
@@ -60,8 +70,9 @@ public class ChartsConfigController {
     /*
     删除
      */
+    @ApiOperation(value = "删除图表", notes = "删除图表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/delChartsConfig")
+    @PostMapping("/delChartsConfig")
     public RepEntity delChartsConfig(@RequestHeader String token,@RequestBody List<Integer> body){
         return chartsConfigService.delChartsConfig(body);
     }
@@ -69,8 +80,9 @@ public class ChartsConfigController {
     /*
     查询图表列表
      */
+    @ApiOperation(value = "查询图表列表", notes = "查询图表列表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getListCharts")
+    @PostMapping("/getListCharts")
     public RepEntity getListCharts(@RequestHeader String token, @RequestBody TestPage body){
         return chartsConfigService.getListCharts(token, body);
     }
@@ -78,8 +90,9 @@ public class ChartsConfigController {
     /*
     查询单个图表
      */
+    @ApiOperation(value = "查询单个图表", notes = "查询单个图表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getChartsConfig")
+    @PostMapping("/getChartsConfig")
     public RepEntity getChartsConfig(@RequestHeader String token,@RequestBody int body){
         return chartsConfigService.getOneCharts(body);
     }
@@ -87,8 +100,9 @@ public class ChartsConfigController {
     /*
     添加图表分组
      */
+    @ApiOperation(value = "添加图表分组", notes = "添加图表分组", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/setChartsGroup")
+    @PostMapping("/setChartsGroup")
     public RepEntity setChartsGroup(@RequestHeader String token, @RequestBody GroupInfo body){
         return chartsConfigService.setDataConnectorGroup(body);
     }
@@ -96,8 +110,9 @@ public class ChartsConfigController {
     /*
     更新图表分组
      */
+    @ApiOperation(value = "更新图表分组", notes = "更新图表分组", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/updataChartsGroup")
+    @PostMapping("/updataChartsGroup")
     public RepEntity updataChartsGroup(@RequestHeader String token,@RequestBody GroupInfo body){
         return chartsConfigService.updataDataConnectorGroup(body);
     }
@@ -105,8 +120,9 @@ public class ChartsConfigController {
     /*
     批量更新图表
      */
+    @ApiOperation(value = "批量更新图表", notes = "批量更新图表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/updataListGroup")
+    @PostMapping("/updataListGroup")
     public RepEntity updataListGroup(@RequestHeader String token,@RequestBody List<GroupInfo> body){
         return chartsConfigService.updataListGroup(body);
     }
@@ -114,8 +130,9 @@ public class ChartsConfigController {
     /*
     删除图表分组
      */
+    @ApiOperation(value = "删除图表分组", notes = "删除图表分组", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/delChartsGroup")
+    @PostMapping("/delChartsGroup")
     public RepEntity delChartsGroup(@RequestHeader String token,@RequestBody List<Integer> body){
         return chartsConfigService.delDataConnectorGroup(body);
     }
@@ -123,8 +140,9 @@ public class ChartsConfigController {
     /*
     查询图表分组
      */
+    @ApiOperation(value = "查询图表分组", notes = "查询图表分组", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getChartsGroup")
+    @PostMapping("/getChartsGroup")
     public RepEntity getChartsGroup(@RequestHeader String token){
         return chartsConfigService.getConnectorGroup();
     }

src/main/java/com/controller/chart/ShowChartsController.java

@@ -5,15 +5,18 @@ import com.model.pojo.RepEntity;
 import com.model.vo.configVo.*;
 import com.server.chart.*;
 import com.server.dataSource.ColumnScreenService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.sql.SQLException;
 
 @RestController
+@Api(description = "图表展现相关接口")
 public class ShowChartsController {
 
     @Autowired
@@ -35,8 +38,9 @@ public class ShowChartsController {
     /*
     展示柱状图
      */
+    @ApiOperation(value = "展示柱状图", notes = "展示柱状图", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/showHistogram")
+    @PostMapping("/showHistogram")
     public RepEntity showHistogram(@RequestHeader String token,@RequestBody HistogramConfigInfo body){
         return showHistogramService.showHistogram(body, token, 0);
     }
@@ -44,8 +48,9 @@ public class ShowChartsController {
     /*
     展示饼图
      */
+    @ApiOperation(value = "展示饼图", notes = "展示图表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/showPie")
+    @PostMapping("/showPie")
     public RepEntity showPie(@RequestHeader String token,@RequestBody PieConfigInfo body){
         return showPieService.showPie(body, token, 0);
     }
@@ -53,8 +58,9 @@ public class ShowChartsController {
     /*
     展示Line
      */
+    @ApiOperation(value = "展示line", notes = "展示line", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/showLine")
+    @PostMapping("/showLine")
     public RepEntity showLine(@RequestHeader String token,@RequestBody LineConfigInfo body){
         return showLineService.showLine(body, token, 0);
     }
@@ -62,8 +68,9 @@ public class ShowChartsController {
     /*
     showScatter
      */
+    @ApiOperation(value = "展示scatter", notes = "展示scatter", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/showScatter")
+    @PostMapping("/showScatter")
     public RepEntity showScatter(@RequestHeader String token,@RequestBody ScatterConfigInfo body){
         return showScatterService.showScatter(body, token, 0);
     }
@@ -71,8 +78,9 @@ public class ShowChartsController {
     /*
     show个体统计表
      */
+    @ApiOperation(value = "展示个体统计表", notes = "展示个体统计表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/showIndividual")
+    @PostMapping("/showIndividual")
     public RepEntity showIndividual(@RequestHeader String token,@RequestBody IndividualConfigInfo body){
         return showIndividualService.showIndividual(body, token, 0);
     }
@@ -80,26 +88,29 @@ public class ShowChartsController {
     /*
     show总体统计表
      */
+    @ApiOperation(value = "展示总体统计表", notes = "展示总体统计表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/showPopulation")
+    @PostMapping("/showPopulation")
     public RepEntity showPopulation(@RequestHeader String token,@RequestBody PopulationInfo body) throws SQLException {
         return showPopulationService.showPopulation(body, token, 0);
     }
 
     /*
-    展示单列数据
+    展示列数据
      */
+    @ApiOperation(value = "展示列数据", notes = "展示列数据", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/showScreenData")
+    @PostMapping("/showScreenData")
     public RepEntity showScreenData(@RequestHeader String token,@RequestBody ColumnScreenInfo body){
         return columnScreenService.getScreenData(body, token);
     }
 
     /*
-    展示单列数据（数据源）
+    展示列数据（数据源）
      */
+    @ApiOperation(value = "展示数据源列数据", notes = "展示数据源列数据", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getScreenByBaseId")
+    @PostMapping("/getScreenByBaseId")
     public RepEntity getScreenByBaseId(@RequestHeader String token,@RequestBody ColumnScreenInfo body){
         return columnScreenService.getScreenByBaseId(body, token);
     }
@@ -107,8 +118,9 @@ public class ShowChartsController {
     /*
     展示图表数据信息
      */
+    @ApiOperation(value = "展示图表数据信息", notes = "展示图表数据信息", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getChartsData")
+    @PostMapping("/getChartsData")
     public RepEntity getChartsData(@RequestHeader String token,@RequestBody ShowDataChartInfo body){
         return getChartsDataUtilService.getChartsData(token, body);
     }

src/main/java/com/controller/dashboard/DashboardsController.java

@@ -8,16 +8,19 @@ import com.model.vo.configVo.ChartsToDashInfo;
 import com.model.vo.configVo.DashboardsInfo;
 import com.server.dashboard.DashboardsService;
 import com.server.dashboard.DashboardsToChartsUtilService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.sql.SQLException;
 import java.util.List;
 
 @RestController
+@Api(description = "看板相关接口")
 public class DashboardsController {
     @Autowired
     DashboardsService dashboardsService;
@@ -27,8 +30,9 @@ public class DashboardsController {
     /*
     保存看板
      */
+    @ApiOperation(value = "保存看板", notes = "保存看板", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/inputDashboards")
+    @PostMapping("/inputDashboards")
     public RepEntity inputDashboards(@RequestHeader String token, @RequestBody DashboardsInfo body){
         return dashboardsService.setDashboards(token, body);
     }
@@ -36,16 +40,18 @@ public class DashboardsController {
     /*
     更新看板
      */
+    @ApiOperation(value = "更新看板", notes = "更新看板", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/updateDashboards")
+    @PostMapping("/updateDashboards")
     public RepEntity updateDashboards(@RequestHeader String token,@RequestBody DashboardsInfo body){
         return dashboardsService.updateDashboards(token, body);
     }
     /*
     删除看板
      */
+    @ApiOperation(value = "删除看板", notes = "删除看板", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/delDashboards")
+    @PostMapping("/delDashboards")
     public RepEntity delDashboards(@RequestHeader String token,@RequestBody List<Integer> body){
         return dashboardsService.delDashboards(token, body);
     }
@@ -53,8 +59,9 @@ public class DashboardsController {
     /*
     查看列表
      */
+    @ApiOperation(value = "查看列表", notes = "查看列表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getListDashboards")
+    @PostMapping("/getListDashboards")
     public RepEntity getListDashboards(@RequestHeader String token, @RequestBody TestPage body){
         return dashboardsService.getListDashboards(token, body);
     }
@@ -62,8 +69,9 @@ public class DashboardsController {
     /*
     查看单个看板
      */
+    @ApiOperation(value = "单个看板", notes = "单个看板", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getDashboards")
+    @PostMapping("/getDashboards")
     public RepEntity getDashboards(@RequestHeader String token,@RequestBody int body){
         return dashboardsService.getDashboards(token, body);
     }
@@ -71,8 +79,9 @@ public class DashboardsController {
     /*
     转交看板
      */
+    @ApiOperation(value = "转交看板", notes = "转交看板", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/changeDashOrder")
+    @PostMapping("/changeDashOrder")
     public RepEntity changeDashOrder(@RequestHeader String token,@RequestBody ChangeOrderInfo body){
         return dashboardsService.changeDashOrder(token, body);
     }
@@ -80,8 +89,9 @@ public class DashboardsController {
     /*
     查看看板分发列表
      */
+    @ApiOperation(value = "查看看板分发列表", notes = "查看看板分发列表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getDashOrder")
+    @PostMapping("/getDashOrder")
     public RepEntity getDashOrder(@RequestHeader String token,@RequestBody int body){
         return dashboardsService.getDashOrder(token, body);
     }
@@ -89,7 +99,8 @@ public class DashboardsController {
     /*
     看板生成图表
      */
-    @RequestMapping("/showChartsInDash")
+    @ApiOperation(value = "看板生成图表", notes = "看板生成图表", response = RepEntity.class)
+    @PostMapping("/showChartsInDash")
     public RepEntity showChartsInDash(@RequestHeader String token, @RequestBody ChartsToDashInfo body) throws SQLException {
         return dashboardsToChartsUtilService.getChartsInDash(body, token);
     }

src/main/java/com/controller/dataSource/DataBasesController.java

@@ -8,16 +8,16 @@ import com.model.vo.configVo.DatabasesInfo;
 import com.server.dataSource.DataBasesService;
 import com.server.dataSource.ImplementSqlService;
 import com.config.RoleInterceptor.Auth;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
 @RequestMapping("/DataBase")
+@Api(description = "数据连接相关接口")
 public class DataBasesController {
     @Autowired
     DataBasesService dataBasesService;
@@ -27,9 +27,10 @@ public class DataBasesController {
    数据库
    保存数据库配置
    */
+    @ApiOperation(value = "保存数据库配置", notes = "保存数据库配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/inputDatabases")
+    @PostMapping("/inputDatabases")
     public RepEntity inputDatabases(@RequestHeader String token, @RequestBody DatabasesInfo body){
         return dataBasesService.inputDatabases(body);
     }
@@ -37,9 +38,10 @@ public class DataBasesController {
     /*
     查看数据库配置列表
      */
+    @ApiOperation(value = "查看数据库配置列表", notes = "查看数据库配置列表", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/getDatabases")
+    @PostMapping("/getDatabases")
     public RepEntity getDatabases(@RequestHeader String token, @RequestBody TestPage body){
         return dataBasesService.getListDatabases(body);
     }
@@ -47,9 +49,10 @@ public class DataBasesController {
     /*
     删除数据库配置
      */
+    @ApiOperation(value = "删除数据库配置", notes = "删除数据库配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/delDatabases")
+    @PostMapping("/delDatabases")
     public RepEntity delDatabases(@RequestHeader String token,@RequestBody List<Integer> body){
         return dataBasesService.delDatabases(body);
     }
@@ -57,9 +60,10 @@ public class DataBasesController {
     /*
     更新数据库配置
      */
+    @ApiOperation(value = "更新数据库配置", notes = "更新数据库配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/updatabases")
+    @PostMapping("/updatabases")
     public RepEntity updatabases(@RequestHeader String token,@RequestBody DatabasesInfo databasesInfo){
         return dataBasesService.updatabases(databasesInfo);
     }
@@ -67,8 +71,9 @@ public class DataBasesController {
     /*
     查看列
      */
+    @ApiOperation(value = "查看列", notes = "查看列", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getColumnData")
+    @PostMapping("/getColumnData")
     public RepEntity getColumnData(@RequestHeader String token,@RequestBody int body){
         return dataBasesService.getColumnData(body);
     }
@@ -76,8 +81,9 @@ public class DataBasesController {
     /*
     通过图表Id查看列数据
      */
+    @ApiOperation(value = "通过图表ID查看列数据", notes = "通过图表ID查看列数据", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getColumnByChartId")
+    @PostMapping("/getColumnByChartId")
     public RepEntity getColumnByChartId(@RequestHeader String token,@RequestBody int body){
         return dataBasesService.getColumnByChartId(body);
     }
@@ -86,9 +92,10 @@ public class DataBasesController {
     /*
     测试数据库连接
      */
+    @ApiOperation(value = "测试数据库连接", notes = "测试数据库连接", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/testConnect")
+    @PostMapping("/testConnect")
     public RepEntity testConnect(@RequestHeader String token,@RequestBody Databases body){
         return implementSqlService.connectTest(body);
     }

src/main/java/com/controller/dataSource/DataConnectorController.java

@@ -13,16 +13,16 @@ import com.server.dataSource.DataConnectorService;
 import com.server.dataSource.ImplementSqlService;
 import com.model.pojo.annotation.TargetDataSource;
 import com.config.RoleInterceptor.Auth;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
 @RequestMapping("/Connector")
+@Api(description = "数据源相关接口")
 public class DataConnectorController {
     @Autowired
     DataConnectorService dataConnectorService;
@@ -33,9 +33,10 @@ public class DataConnectorController {
     /*
     保存数据源配置
      */
+    @ApiOperation(value = "保存数据源配置", notes = "保存数据源配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/inputDataConnector")
+    @PostMapping("/inputDataConnector")
     public RepEntity inputDataConnector(@RequestHeader String token, @RequestBody DataConnectorInfo body) {
         System.out.println("-----------");
         System.out.println(body);
@@ -45,8 +46,9 @@ public class DataConnectorController {
     /*
     查看数据源列表
      */
+    @ApiOperation(value = "查看数据源列表", notes = "查看数据源列表", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getListDataConnector")
+    @PostMapping("/getListDataConnector")
     public RepEntity getListDataConnector(@RequestHeader String token, @RequestBody TestPage body){
         return dataConnectorService.getListConnector(token, body);
     }
@@ -54,9 +56,10 @@ public class DataConnectorController {
     /*
     查看单个数据源配置
      */
+    @ApiOperation(value = "查看单个数据源配置", notes = "查看单个数据源配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/getDataConnector")
+    @PostMapping("/getDataConnector")
     public RepEntity getDataConnector(@RequestHeader String token,@RequestBody int body){
         return dataConnectorService.getConnector(body);
     }
@@ -64,9 +67,10 @@ public class DataConnectorController {
     /*
     更新数据源配置
      */
+    @ApiOperation(value = "更新数据源配置", notes = "更新数据源配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/updateData")
+    @PostMapping("/updateData")
     public RepEntity updateData(@RequestHeader String token,@RequestBody DataConnectorInfo body){
         return dataConnectorService.updateData(body);
     }
@@ -74,8 +78,9 @@ public class DataConnectorController {
     /*
     转交数据源
      */
+    @ApiOperation(value = "转交数据源", notes = "转交数据源", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/changeDbOrder")
+    @PostMapping("/changeDbOrder")
     public RepEntity changeDbOrder(@RequestHeader String token,@RequestBody ChangeOrderInfo body){
         return dataConnectorService.changeOrder(body, token);
     }
@@ -83,9 +88,10 @@ public class DataConnectorController {
     /*
     更新数据源配置的分组
      */
+    @ApiOperation(value = "更新数据源配置分组", notes = "更新数据源配置分组", response = RepEntity.class)
     @Auth(user = "admin")
     @CheckToken
-    @RequestMapping("/updateConnectConfigGroup")
+    @PostMapping("/updateConnectConfigGroup")
     public RepEntity updateConConfigGroup(@RequestHeader String token,@RequestBody GroupUpdateId body){
         return dataConnectorService.updateConfigGroup(body);
     }
@@ -94,9 +100,10 @@ public class DataConnectorController {
     /*
     删除配置
      */
+    @ApiOperation(value = "删除配置", notes = "删除配置", response = RepEntity.class)
     @Auth(user = "admin")
     @CheckToken
-    @RequestMapping("/delDataConnector")
+    @PostMapping("/delDataConnector")
     public RepEntity delDataConnector(@RequestHeader String token,@RequestBody List<Integer> body){
         return dataConnectorService.delDataConnector(body);
     }
@@ -104,9 +111,10 @@ public class DataConnectorController {
     /*
     执行数据源配置
     */
+    @ApiOperation(value = "执行数据源配置", notes = "执行数据源配置", response = RepEntity.class)
     @TargetDataSource
     @CheckToken
-    @RequestMapping("/implementSql")
+    @PostMapping("/implementSql")
     @Auth(user = "admin")
     public RepEntity implementSql(@RequestHeader String token,@RequestBody ToSql body){
         return implementSqlService.implementSql(body);
@@ -115,8 +123,9 @@ public class DataConnectorController {
     /*
     添加数据源分组
      */
+    @ApiOperation(value = "添加数据源分组", notes = "添加数据源分组", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/setConnectorGroup")
+    @PostMapping("/setConnectorGroup")
     @Auth(user = "admin")
     public RepEntity setConnectorGroup(@RequestHeader String token,@RequestBody GroupInfo body){
         return dataConnectorService.setDataConnectorGroup(body);
@@ -125,9 +134,10 @@ public class DataConnectorController {
     /*
     更新数据源分组
      */
+    @ApiOperation(value = "更新数据源分组", notes = "更新数据源分组", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/updataDataConnectorGroup")
+    @PostMapping("/updataDataConnectorGroup")
     public RepEntity updataDataConnectorGroup(@RequestHeader String token,@RequestBody GroupInfo body){
         return dataConnectorService.updataDataConnectorGroup(body);
     }
@@ -135,9 +145,10 @@ public class DataConnectorController {
     /*
     批量更新数据源分组
      */
+    @ApiOperation(value = "批量更新数据源分组", notes = "批量更新数据源分组", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @RequestMapping("/updataConnectorGroup")
+    @PostMapping("/updataConnectorGroup")
     public RepEntity updataConnectorGroup(@RequestHeader String token,@RequestBody List<GroupInfo> body){
         return dataConnectorService.updataConnectorGroups(body);
     }
@@ -145,9 +156,10 @@ public class DataConnectorController {
     /*
     删除数据源分组
      */
+    @ApiOperation(value = "删除数据源分组", notes = "删除数据源分组", response = RepEntity.class)
     @Auth(user = "admin")
     @CheckToken
-    @RequestMapping("/delDataConnectorGroup")
+    @PostMapping("/delDataConnectorGroup")
     public RepEntity delDataConnectorGroup(@RequestHeader String token,@RequestBody List<Integer> body){
         return dataConnectorService.delDataConnectorGroup(body);
     }
@@ -155,8 +167,9 @@ public class DataConnectorController {
     /*
     查询数据源分组
      */
+    @ApiOperation(value = "查询数据源分组", notes = "查询数据源分组", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getConnectorGroup")
+    @PostMapping("/getConnectorGroup")
     public RepEntity getConnectorGroup(@RequestHeader String token){
         return dataConnectorService.getConnectorGroup();
     }
@@ -164,8 +177,9 @@ public class DataConnectorController {
     /*
     查询数据源数据
      */
+    @ApiOperation(value = "查询数据源数据", notes = "查询数据源数据", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getConnectorData")
+    @PostMapping("/getConnectorData")
     public RepEntity getConnectorData(@RequestHeader String token, @RequestBody BaseToDataInfo body){
         return dataConnectorService.getConnectorData(token, body);
     }

src/main/java/com/controller/strategy/StrategysController.java

@@ -4,21 +4,25 @@ import com.model.pojo.RepEntity;
 import com.model.vo.configVo.ObjectInfo;
 import com.model.vo.configVo.StrategysInfo;
 import com.server.strategy.StrategysService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 @RestController
+@Api(description = "策略相关接口")
 public class StrategysController {
     @Autowired
     StrategysService strategysService;
     /*
    添加数据源策略
     */
-    @RequestMapping("/addStrategys")
+    @ApiOperation(value = "添加数据源策略", notes = "添加数据源策略", response = RepEntity.class)
+    @PostMapping("/addStrategys")
     public RepEntity addStrategys(@RequestBody StrategysInfo body){
         return strategysService.addStrategys(body);
     }
@@ -26,7 +30,8 @@ public class StrategysController {
     /*
     删除数据源策略
      */
-    @RequestMapping("/delDbStrategys")
+    @ApiOperation(value = "删除数据源策略", notes = "删除数据源策略", response = RepEntity.class)
+    @PostMapping("/delDbStrategys")
     public RepEntity delDbStrategys(@RequestBody List<Integer> body){
         return strategysService.delDbStrategys(body);
     }
@@ -34,7 +39,8 @@ public class StrategysController {
     /*
     删除图表策略
      */
-    @RequestMapping("/delChartStrategys")
+    @ApiOperation(value = "删除图表策略", notes = "删除图表策略", response = RepEntity.class)
+    @PostMapping("/delChartStrategys")
     public RepEntity delChartStrategys(@RequestBody List<Integer> body){
         return strategysService.delChartStrategys(body);
     }
@@ -42,7 +48,8 @@ public class StrategysController {
     /*
     更新数据源策略
      */
-    @RequestMapping("/updateStrategys")
+    @ApiOperation(value = "更新数据源策略", notes = "更新数据源策略", response = RepEntity.class)
+    @PostMapping("/updateStrategys")
     public RepEntity updateStrategys(@RequestBody StrategysInfo body){
         return strategysService.updateStrategys(body);
     }
@@ -50,7 +57,8 @@ public class StrategysController {
     /*
     查询数据源策略
      */
-    @RequestMapping("/getDbStrategys")
+    @ApiOperation(value = "查询数据源策略", notes = "查询数据源策略", response = RepEntity.class)
+    @PostMapping("/getDbStrategys")
     public RepEntity getDbStrategys(@RequestBody int body){
         return strategysService.getDbStrategys(body);
     }
@@ -58,7 +66,8 @@ public class StrategysController {
     /*
     添加用户或用户组
      */
-    @RequestMapping("/addObject")
+    @ApiOperation(value = "添加用户或用户组", notes = "添加用户或用户组", response = RepEntity.class)
+    @PostMapping("/addObject")
     public RepEntity addObject(@RequestBody ObjectInfo body){
         return strategysService.addObject(body);
     }
@@ -66,7 +75,7 @@ public class StrategysController {
     /*
     删除对象
      */
-//    @RequestMapping("/delObject")
+//    @PostMapping("/delObject")
 //    public RepEntity delObject(@RequestBody ObjectInfo body){
 //        return strategysService.delObject(body);
 //    }
@@ -74,7 +83,8 @@ public class StrategysController {
     /*
     查询图表策略
      */
-    @RequestMapping("/getChartStrategys")
+    @ApiOperation(value = "查询图表策略", notes = "查询图表策略", response = RepEntity.class)
+    @PostMapping("/getChartStrategys")
     public RepEntity getChartStrategys(@RequestBody int body){
         return strategysService.getChartStrategys(body);
     }

src/main/java/com/controller/user/RecodeController.java

@@ -6,33 +6,41 @@ import com.model.pojo.RepEntity;
 import com.model.vo.configVo.RecordInfo;
 import com.server.chart.ChartsUtilService;
 import com.server.user.RecodeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@Api(description = "浏览纪录相关接口")
 public class RecodeController {
     @Autowired
     RecodeService recodeService;
     @Autowired
     ChartsUtilService chartsUtilService;
 
+    @ApiOperation(value = "查看图表浏览纪录", notes = "查看图表浏览纪录", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getChartRecord")
+    @PostMapping("/getChartRecord")
     public RepEntity getChartRecord(@RequestHeader String token){
         return recodeService.getChartRecord(token);
     }
 
+
+    @ApiOperation(value = "看板浏览纪录", notes = "看板浏览纪录", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/getDashRecord")
+    @PostMapping("/getDashRecord")
     public RepEntity getDashRecord(@RequestHeader String token){
         return recodeService.getDashRecord(token);
     }
 
+
+    @ApiOperation(value = "添加浏览纪录", notes = "添加浏览纪录", response = RepEntity.class)
     @CheckToken
-    @RequestMapping("/addRecord")
+    @PostMapping("/addRecord")
     public RepEntity inputRecord(@RequestHeader String token,@RequestBody RecordInfo body){
         chartsUtilService.inputRecord(token, body);
         return new RepEntity(RepCode.success);

src/main/java/com/controller/user/UserController.java

@@ -8,16 +8,19 @@ import com.model.vo.configVo.LoginInfo;
 import com.model.vo.configVo.UserGroupInfo;
 import com.model.vo.configVo.UserGroupSetInfo;
 import com.server.user.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 @RestController
-//@RequestMapping("/User")
+//@PostMapping("/User")
+@Api(description = "用户相关接口")
 public class UserController {
     @Autowired
     UserService userService;
@@ -25,19 +28,19 @@ public class UserController {
     /*
     登录(生成token)
      */
-    @RequestMapping("/login")
+    @ApiOperation(value = "登录", notes = "登录", response = RepEntity.class)
+    @PostMapping("/login")
     public RepEntity login(@RequestBody LoginInfo body){
-//        userService.login(body);
         return userService.login(body);
-//        return new RepEntity(RepCode.success);
     }
 
     /*
     更新用户信息
      */
+    @ApiOperation(value = "更新用户信息", notes = "更新用户信息", response = RepEntity.class)
     @Auth(user = "admin")
     @CheckToken
-    @RequestMapping("/updateUser")
+    @PostMapping("/updateUser")
     public RepEntity updateUser(@RequestHeader String token, @RequestBody User body){
         return userService.updateUser(body);
     }
@@ -45,8 +48,9 @@ public class UserController {
     /*
     查询用户列表
      */
+    @ApiOperation(value = "查询用户列表", notes = "查询用户列表", response = RepEntity.class)
     @Auth(user = "admin")
-    @RequestMapping("/getUserList")
+    @PostMapping("/getUserList")
     public RepEntity getUserList(){
         return userService.getUserList();
     }
@@ -54,7 +58,8 @@ public class UserController {
     /*
     查询匹配用户
      */
-    @RequestMapping("/getNameList")
+    @ApiOperation(value = "查询匹配用户", notes = "查询匹配用户", response = RepEntity.class)
+    @PostMapping("/getNameList")
     public RepEntity getNameList(@RequestBody String body){
         return userService.getNameList(body);
     }
@@ -62,8 +67,9 @@ public class UserController {
     /*
     创建用户组
      */
+    @ApiOperation(value = "创建用户组", notes = "创建用户组", response = RepEntity.class)
     @Auth(user = "admin")
-    @RequestMapping("/createUserGroup")
+    @PostMapping("/createUserGroup")
     public RepEntity createUserGroup(@RequestBody UserGroupInfo body){
         return userService.createUserGroup(body);
     }
@@ -71,8 +77,9 @@ public class UserController {
     /*
     更新用户组
      */
+    @ApiOperation(value = "更新用户组", notes = "更新用户组", response = RepEntity.class)
     @Auth(user = "admin")
-    @RequestMapping("/updateUserGroup")
+    @PostMapping("/updateUserGroup")
     public RepEntity updateUserGroup(@RequestBody UserGroupInfo body){
         return userService.updateUserGroup(body);
     }
@@ -80,8 +87,9 @@ public class UserController {
     /*
     查询用户组列表
      */
+    @ApiOperation(value = "查询用户组列表", notes = "查询用户组列表", response = RepEntity.class)
     @Auth(user = "admin")
-    @RequestMapping("/getUserGroupList")
+    @PostMapping("/getUserGroupList")
     public RepEntity getUserGroupList(){
         return userService.getUserGroup();
     }
@@ -89,8 +97,9 @@ public class UserController {
     /*
     删除用户组
      */
+    @ApiOperation(value = "删除用户组", notes = "删除用户组", response = RepEntity.class)
     @Auth(user = "admin")
-    @RequestMapping("/delUserGroup")
+    @PostMapping("/delUserGroup")
     public RepEntity delUserGroup(@RequestBody List<Integer> body){
         return userService.delUserGroup(body);
     }
@@ -98,8 +107,9 @@ public class UserController {
     /*
     用户组添加用户
      */
+    @ApiOperation(value = "用户组添加用户", notes = "用户组添加用户", response = RepEntity.class)
     @Auth(user = "admin")
-    @RequestMapping("/setUserInto")
+    @PostMapping("/setUserInto")
     public RepEntity setUserInto(@RequestBody UserGroupSetInfo body){
         return userService.setUserInto(body);
     }
@@ -107,8 +117,9 @@ public class UserController {
     /*
     查询用户组下的用户
      */
+    @ApiOperation(value = "查询用户组下的用户", notes = "查询用户组下的用户", response = RepEntity.class)
     @Auth(user = "admin")
-    @RequestMapping("/getUserInGroup")
+    @PostMapping("/getUserInGroup")
     public RepEntity getUserInGroup(@RequestBody int body){
         return userService.getUserInGroup(body);
     }
@@ -116,8 +127,9 @@ public class UserController {
     /*
     删除用户组下的用户
      */
+    @ApiOperation(value = "删除用户组下的用户", notes = "删除用户组下的用户", response = RepEntity.class)
     @Auth(user = "admin")
-    @RequestMapping("/delUserInGroup")
+    @PostMapping("/delUserInGroup")
     public RepEntity delUserInGroup(@RequestBody UserGroupSetInfo body){
         return userService.delUserInGroup(body);
     }

src/main/java/com/dao/chart/ChartsConfigMapper.java

@@ -183,8 +183,8 @@ public interface ChartsConfigMapper {
             "bc_group_name = #{groupName}" +
             "<if test=\"groupIndex != null\"> , bc_index = #{groupIndex} </if>" +
             "<if test=\"fatherId != null\"> , bc_father_id = #{fatherId} </if>" +
-            "<if test=\"createBy != null\"> , create_by = #{createBy} ,</if>" +
-            "updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
+            "<if test=\"createBy != null\"> , create_by = #{createBy} </if>" +
+            "，updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
             " where bc_id = #{id}" +
             "</script>")
     void updataChartsGroup(GroupInfo groupInfo);

src/main/java/com/dao/chart/ShowChartsMapper.java

@@ -20,7 +20,7 @@ public interface ShowChartsMapper {
     int getNumForX(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName);
 
     //x轴
-    @Select("select * from (select DISTINCT ${xAxisName} from ${tableName}) where rownum <= #{num}")
+    @Select("select * from (select DISTINCT ${xAxisName} from ${tableName} ${screenToColumn}) where rownum <= #{num}")
     List<String> getXAxis(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName, @Param("screenToColumn") String screenToColumn, @Param("num") int num);
 
 

src/main/java/com/dao/dashboard/DashboardsMapper.java

@@ -17,8 +17,8 @@ public interface DashboardsMapper {
     插入
      */
     @Insert("insert into " +
-            "bi_dashboards(id, bd_name,bd_note,CONFIGURATION,create_by,create_date, BD_THUMBNAIL,relation_columns, create_id)" +
-            "values(#{id}, #{bdName},#{bdNote},#{bdConfiguration},#{createBy}," +
+            "bi_dashboards(id, bd_name,bd_note,CONFIGURATION,create_by, filters, create_date, BD_THUMBNAIL,relation_columns, create_id)" +
+            "values(#{id}, #{bdName},#{bdNote},#{bdConfiguration},#{createBy}, #{filters}, " +
             "to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'), #{thumbnail},#{relationColumns}, #{createId})")
     @SelectKey(before=true,keyProperty="id",resultType=Integer.class,statement="SELECT BI_DASHBOARDS_SEQUENCE.nextval from dual",keyColumn = "id")
     void setDashboards(Dashboards dashboards);
@@ -33,6 +33,7 @@ public interface DashboardsMapper {
             "<if test=\"bdConfiguration != null\"> , CONFIGURATION = #{bdConfiguration} </if>" +
             "<if test=\"thumbnail != null\"> , BD_THUMBNAIL = #{thumbnail} </if>" +
             "<if test=\"relationColumns != null\">, relation_columns = #{relationColumns} </if>"+
+            "<if test=\"filters != null\">, filters = #{filters} </if>"+
             " ,UPDATE_DATE = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') " +
             "where id = #{id}" +
             "</script>")
@@ -54,7 +55,7 @@ public interface DashboardsMapper {
     /*
     查询看板列表
      */
-    @Select("select id, bd_note as bdNote, bd_name as bdName, CONFIGURATION as bdConfiguration, CREATE_BY as createBy, create_id as createId, CREATE_DATE as createDate, BD_THUMBNAIL as thumbnail " +
+    @Select("select id, bd_note as bdNote, bd_name as bdName, CONFIGURATION as bdConfiguration, CREATE_BY as createBy, create_id as createId, CREATE_DATE as createDate, BD_THUMBNAIL as thumbnail, filters " +
             "from BI_DASHBOARDS where id in " +
             " (select bo_da_id from bi_DASHBOARDS_object " +
             "where (bo_type = '0' and bo_ob_id in (select br_user_group from bi_user_rel_groups where br_user_id= #{userId})) " +
@@ -64,7 +65,7 @@ public interface DashboardsMapper {
     /*
     查询看板
      */
-    @Select("select id, bd_note as bdNote, bd_name as bdName, CONFIGURATION as bdConfiguration, CREATE_BY as createBy, create_id as createId, CREATE_DATE as createDate, BD_THUMBNAIL as thumbnail, relation_columns as relationColumns" +
+    @Select("select id, bd_note as bdNote, bd_name as bdName, CONFIGURATION as bdConfiguration, CREATE_BY as createBy, create_id as createId, CREATE_DATE as createDate, BD_THUMBNAIL as thumbnail, relation_columns as relationColumns, filters " +
             " from BI_DASHBOARDS where (id in " +
             " (select bo_da_id from bi_DASHBOARDS_object " +
             " where (bo_type = '0' and bo_ob_id in (select br_user_group from bi_user_rel_groups where br_user_id= #{userId}))" +

src/main/java/com/dao/dataSource/DataConnectorMapper.java

@@ -110,7 +110,7 @@ public interface DataConnectorMapper {
     保存数据库连接
      */
     @Insert("insert into BI_DATABASES(id,ADDRASS, CREATE_DATE, DATABASE_TYPE, DATA_NAME, bases_NAME, PASS_WORD, PORT, USER_NAME, note)" +
-            "values(#{id},#{addrass}, to_date(#{createDate},'YYYY-MM-DD hh24:mi:ss'), #{databaseType}, #{dataName}, #{name}, #{passWord}, #{port}, #{userName}, #{note})")
+            "values(#{id},#{addrass}, to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'), #{databaseType}, #{dataName}, #{name}, #{passWord}, #{port}, #{userName}, #{note})")
     @SelectKey(before=true,keyProperty="id",resultType=int.class,statement="SELECT BI_DATABASES_SEQUENCE.nextval from dual",keyColumn = "id")
     void inputDataBases(Databases databases);
 

src/main/java/com/dao/strategy/StrategysChartMapper.java

@@ -17,7 +17,7 @@ public interface StrategysChartMapper {
     @Insert("insert into bi_chart_strategys(bc_id, bc_chart_id, bc_rule, rule_str, bc_name, is_open, create_date) values" +
             "(#{id}, #{tarId}, #{rule}, #{ruleStr}, #{name}, #{isOpen}," +
             "to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'))")
-    @SelectKey(before=true,keyProperty="id",resultType=int.class,statement="SELECT bi_chart_strategys_squence.nextval from dual",keyColumn = "bc_id")
+    @SelectKey(before=true,keyProperty="id",resultType=int.class,statement="SELECT bi_chart_strategys_sequence.nextval from dual",keyColumn = "bc_id")
     void addStrategys(Strategys strategys);
 
     /*

src/main/java/com/model/po/Dashboards.java

@@ -17,6 +17,15 @@ public class Dashboards {
     private String createDate;
     private String updateDate;
     private Date reDate;
+    private String filters;
+
+    public String getFilters() {
+        return filters;
+    }
+
+    public void setFilters(String filters) {
+        this.filters = filters;
+    }
 
     public Date getReDate() {
         return reDate;

src/main/java/com/model/vo/configVo/ChartsToDashInfo.java

@@ -1,12 +1,22 @@
 package com.model.vo.configVo;
 
 import com.model.bo.Screen;
+import com.model.pojo.TestPage;
 
 import java.util.List;
 
 public class ChartsToDashInfo {
     private int dashCreateId;
     private List<Screen> filters;
+    private TestPage testPage;
+
+    public TestPage getTestPage() {
+        return testPage;
+    }
+
+    public void setTestPage(TestPage testPage) {
+        this.testPage = testPage;
+    }
 
     public int getDashCreateId() {
         return dashCreateId;

src/main/java/com/model/vo/configVo/DashboardsInfo.java

@@ -9,6 +9,15 @@ public class DashboardsInfo {
     private String createBy;
     private int createId;
     private String relationColumns;
+    private String filters;
+
+    public String getFilters() {
+        return filters;
+    }
+
+    public void setFilters(String filters) {
+        this.filters = filters;
+    }
 
     public String getRelationColumns() {
         return relationColumns;

src/main/java/com/server/chart/ChartsUtilService.java

@@ -55,7 +55,6 @@ public class ChartsUtilService {
                 }
             } else {
                 //先拿图表创建者权限，在取分发权限
-                System.out.println("你他妈的去哪里了");
                 String sql = columnNameUtil(createID, baseId, tableName, true, id, -1);
                 return columnNameUtil(userId, baseId, sql, false, id, -1);
             }

src/main/java/com/server/dashboard/DashboardsService.java

@@ -44,6 +44,9 @@ public class DashboardsService {
         BeanUtils.copyProperties(dashboardsInfo, dashboards);
         dashboards.setCreateBy(name);
         dashboards.setCreateId(userId);
+        if (dashboardsInfo.getFilters() == null){
+            dashboardsInfo.setFilters("");
+        }
         dashboardsMapper.setDashboards(dashboards);
         int id = dashboards.getId();
         return new RepEntity(RepCode.success, id);
@@ -64,7 +67,9 @@ public class DashboardsService {
         BeanUtils.copyProperties(dashboardsInfo, dashboards);
         dashboards.setCreateBy(name);
         dashboards.setCreateId(userId);
-
+        if (dashboardsInfo.getFilters() == null){
+            dashboardsInfo.setFilters("");
+        }
         dashboardsMapper.updateDashboards(dashboards);
         return new RepEntity(RepCode.success);
     }

src/main/java/com/server/dashboard/DashboardsToChartsUtilService.java

@@ -6,6 +6,7 @@ import com.model.bo.Screen;
 import com.model.po.ChartsConfigToDash;
 import com.model.pojo.RepCode;
 import com.model.pojo.RepEntity;
+import com.model.pojo.TestPage;
 import com.model.vo.configVo.*;
 import com.server.chart.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,7 +67,7 @@ public class DashboardsToChartsUtilService {
             return getPopulation(fetchConfig, token, filters);
 
         }else if ("individual".equals(chartType)){
-            return getIndividual(fetchConfig, token, filters);
+            return getIndividual(fetchConfig, token, filters, chartsToDashInfo.getTestPage());
 
         }else if("scatter".equals(chartType)){
             return getScatter(fetchConfig, token, filters);
@@ -121,12 +122,13 @@ public class DashboardsToChartsUtilService {
         return showPopulationService.showPopulation(populationInfo, token, chartId);
     }
 
-    public RepEntity getIndividual(String fetchConfig, String token, List<Screen> filters) throws SQLException {
+    public RepEntity getIndividual(String fetchConfig, String token, List<Screen> filters, TestPage testPage) throws SQLException {
         IndividualConfigInfo individualConfigInfo = new IndividualConfigInfo();
         try {
             System.out.println(fetchConfig);
             individualConfigInfo = objectMapper.readValue(fetchConfig,IndividualConfigInfo.class);
             individualConfigInfo.setFilters(filters);
+            individualConfigInfo.setTestPage(testPage);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/com/util/JwtTokenUtil.java

@@ -39,7 +39,7 @@ public class JwtTokenUtil {
 
         //过期时间
         Calendar nowTime = Calendar.getInstance();
-        nowTime.add(Calendar.MINUTE, 30);
+        nowTime.add(Calendar.MINUTE, 120);
         Date expiresDate = nowTime.getTime();
 
         //转换成时间戳