Browse Source

报表、图表、数据源、数据连接模板标识字段添加

chenw 6 years ago
parent
commit
da76a8237b
18 changed files with 245 additions and 53 deletions
  1. 1 0
      bi-server-starter/src/main/java/com/usoftchina/bi/starter/error/GlobalException.java
  2. 5 5
      bi-server/src/main/java/com/usoftchina/bi/server/controller/chart/ChartsConfigController.java
  3. 6 9
      bi-server/src/main/java/com/usoftchina/bi/server/controller/dashboard/DashboardsController.java
  4. 2 2
      bi-server/src/main/java/com/usoftchina/bi/server/controller/dataSource/DataBasesController.java
  5. 3 3
      bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ChartsConfigMapper.java
  6. 2 2
      bi-server/src/main/java/com/usoftchina/bi/server/dao/dashboard/DashboardsMapper.java
  7. 7 5
      bi-server/src/main/java/com/usoftchina/bi/server/dao/dataSource/DataConnectorMapper.java
  8. 8 0
      bi-server/src/main/java/com/usoftchina/bi/server/model/po/BaseConfig.java
  9. 9 0
      bi-server/src/main/java/com/usoftchina/bi/server/model/po/ChartConfig.java
  10. 9 0
      bi-server/src/main/java/com/usoftchina/bi/server/model/po/ChartConfigList.java
  11. 18 0
      bi-server/src/main/java/com/usoftchina/bi/server/model/po/Dashboards.java
  12. 9 0
      bi-server/src/main/java/com/usoftchina/bi/server/model/po/DataConnector.java
  13. 9 0
      bi-server/src/main/java/com/usoftchina/bi/server/model/po/DataConnectorList.java
  14. 10 0
      bi-server/src/main/java/com/usoftchina/bi/server/model/po/Databases.java
  15. 11 23
      bi-server/src/test/java/com/usoftchina/bi/test/server/controller/chart/ChartsConfigControllerTest.java
  16. 81 0
      bi-server/src/test/java/com/usoftchina/bi/test/server/controller/dashboard/DashboardsServiceTest.java
  17. 54 0
      bi-server/src/test/java/com/usoftchina/bi/test/server/controller/dataSource/DataBasesControllerTest.java
  18. 1 4
      bi-server/src/test/java/com/usoftchina/bi/test/server/controller/dataSource/DataConnectorControllerTest.java

+ 1 - 0
bi-server-starter/src/main/java/com/usoftchina/bi/starter/error/GlobalException.java

@@ -18,6 +18,7 @@ public class GlobalException {
         Map<String, Object> result = new HashMap<String, Object>();
         result.put("code" , "-502");
         result.put("msg" , e.getMessage());
+        e.printStackTrace();
         return result;
     }
 

+ 5 - 5
bi-server/src/main/java/com/usoftchina/bi/server/controller/chart/ChartsConfigController.java

@@ -82,8 +82,8 @@ public class ChartsConfigController {
      */
     @ApiOperation(value = "查询图表列表", notes = "查询图表列表", response = RepEntity.class)
     @CheckToken
-    @PostMapping("/getListCharts")
-    public RepEntity getListCharts(@RequestHeader String token, @RequestBody TestPage body){
+    @GetMapping("/getListCharts")
+    public RepEntity getListCharts(@RequestHeader String token, TestPage body){
         return chartsConfigService.getListCharts(token, body);
     }
 
@@ -92,9 +92,9 @@ public class ChartsConfigController {
      */
     @ApiOperation(value = "查询单个图表", notes = "查询单个图表", response = RepEntity.class)
     @CheckToken
-    @PostMapping("/getChartsConfig")
-    public RepEntity getChartsConfig(@RequestHeader String token,@RequestBody int body){
-        return chartsConfigService.getOneCharts(body);
+    @GetMapping("/getChartsConfig")
+    public RepEntity getChartsConfig(@RequestHeader String token, @RequestParam("id") int id){
+        return chartsConfigService.getOneCharts(id);
     }
 
     /*

+ 6 - 9
bi-server/src/main/java/com/usoftchina/bi/server/controller/dashboard/DashboardsController.java

@@ -11,10 +11,7 @@ import com.usoftchina.bi.server.service.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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -61,8 +58,8 @@ public class DashboardsController {
      */
     @ApiOperation(value = "查看列表", notes = "查看列表", response = RepEntity.class)
     @CheckToken
-    @PostMapping("/getListDashboards")
-    public RepEntity getListDashboards(@RequestHeader String token, @RequestBody TestPage body){
+    @GetMapping("/getListDashboards")
+    public RepEntity getListDashboards(@RequestHeader String token, TestPage body){
         return dashboardsService.getListDashboards(token, body);
     }
 
@@ -71,9 +68,9 @@ public class DashboardsController {
      */
     @ApiOperation(value = "单个看板", notes = "单个看板", response = RepEntity.class)
     @CheckToken
-    @PostMapping("/getDashboards")
-    public RepEntity getDashboards(@RequestHeader String token,@RequestBody int body){
-        return dashboardsService.getDashboards(token, body);
+    @GetMapping("/getDashboards")
+    public RepEntity getDashboards(@RequestHeader String token,@RequestParam("id") int id){
+        return dashboardsService.getDashboards(token, id);
     }
 
     /*

+ 2 - 2
bi-server/src/main/java/com/usoftchina/bi/server/controller/dataSource/DataBasesController.java

@@ -41,8 +41,8 @@ public class DataBasesController {
     @ApiOperation(value = "查看数据库配置列表", notes = "查看数据库配置列表", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @PostMapping("/getDatabases")
-    public RepEntity getDatabases(@RequestHeader String token, @RequestBody TestPage body){
+    @GetMapping("/getDatabases")
+    public RepEntity getDatabases(@RequestHeader String token, TestPage body){
         return dataBasesService.getListDatabases(body);
     }
 

+ 3 - 3
bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ChartsConfigMapper.java

@@ -38,7 +38,7 @@ public interface ChartsConfigMapper {
     @Select("select bc.id as chartId, chart_name as chartName, chart_type as chartType, bc.create_by as createBy, bc.create_date as createDate, bc_charts_group as chartsGroup" +
             "            ,bc.bc_filters as filters, bc.BD_DATA_ID as dataId, bc_table_name as tableName, CHART_CONFIG as chartConfig, bc.GROUP_BY as groupBy, bc_charts_option as chartOption, " +
             "            bc.ACCESS_AUTHORITY as accessAuthority, UPDATE_AUTHORITY as updateAuthority, CHART_DESCRIBES as describes, BC_CHART_STYLE as style, BC_FILTERS as filters " +
-            "            ,bc.create_id as createId, bd.DATA_NAME as dataName from bi_charts bc left join BI_DATA_CONNECTORS bd on bc.BD_DATA_ID = bd.id" +
+            "            ,bc.create_id as createId, bd.DATA_NAME as dataName, bc.demo from bi_charts bc left join BI_DATA_CONNECTORS bd on bc.BD_DATA_ID = bd.id" +
             "             where bc.id = #{id}")
     ChartConfig getOneChart(int id);
 
@@ -49,7 +49,7 @@ public interface ChartsConfigMapper {
     查看图表列表
      */
     @Select("select id as chartId, chart_name as chartName, chart_type as chartType, create_by as createBy, create_date as createDate" +
-            ",bc_filters as filters, CHART_DESCRIBES as describes, bc_charts_group as chartsGroup, bc_charts_option as chartOption from bi_charts")
+            ",bc_filters as filters, CHART_DESCRIBES as describes, bc_charts_group as chartsGroup, bc_charts_option as chartOption, demo from bi_charts")
     List<ChartConfigList> getListCharts();
 
     /*
@@ -96,7 +96,7 @@ public interface ChartsConfigMapper {
             "        ) and bs2.BS_DB_ID = bc.BD_DATA_ID" +
             "    ) = 0 then '0'" +
             "    else null end authority, case when bc.BD_DATA_ID not in(select id from bi_data_connectors) then '1' else '0' end dbStatus, bc.id as chartId, bc.chart_name as chartName, bc.chart_type as chartType, bc.create_by as createBy, bc.create_date as createDate" +
-            "    ,bc.bc_filters as filters, bc.CHART_DESCRIBES as describes, bc.bc_charts_group as chartsGroup, bc.bc_charts_option as chartOption ,bc.bd_data_id as dataId,bd.data_name as dataName, bc.create_id as createId  " +
+            "    ,bc.bc_filters as filters, bc.CHART_DESCRIBES as describes, bc.bc_charts_group as chartsGroup, bc.bc_charts_option as chartOption ,bc.bd_data_id as dataId,bd.data_name as dataName, bc.create_id as createId, bc.demo  " +
             "     from bi_charts bc left join bi_data_connectors bd on bc.bd_data_id=bd.id where (bc.create_id = #{id} or bc.id in (" +
             "      select bc_chart_id from bi_chart_strategys where BC_ID in (" +
             "        select BO_ST_ID from BI_CHART_OBJECT where (BO_TYPE='1' and BO_OB_ID = #{id})" +

+ 2 - 2
bi-server/src/main/java/com/usoftchina/bi/server/dao/dashboard/DashboardsMapper.java

@@ -55,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, filters " +
+    @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, demo  " +
             "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})) " +
@@ -65,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, filters " +
+    @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, demo " +
             " 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}))" +

+ 7 - 5
bi-server/src/main/java/com/usoftchina/bi/server/dao/dataSource/DataConnectorMapper.java

@@ -35,7 +35,7 @@ public interface DataConnectorMapper {
      */
     @Select("select ID as dataId, DATA_NAME as dataName, DATA_NOTE as note, DATA_TAG as dataTag, COLUMNS_CONFIG as columnConfig, LOAD_OBJECT as loadObject," +
             "CREATE_BY as createBy, create_id as createId, USED_NUMBER as usedNumber, CREATE_DATE as createDate,DB_CONFIG as dbConId,DB_CONFIG as dbConfig, BD_group as connectorGroup," +
-            "CON_TYPE as type from bi_data_connectors where id = #{id}")
+            "CON_TYPE as type, demo from bi_data_connectors where id = #{id}")
     @Results(id = "DataConnectorResultMap", value = {
             @Result(column = "dataId", property = "dataId", jdbcType = JdbcType.BIGINT),
             @Result(column = "dataName", property = "dataName", jdbcType = JdbcType.VARCHAR),
@@ -50,6 +50,7 @@ public interface DataConnectorMapper {
             @Result(column = "dbConId", property = "dbConId", jdbcType = JdbcType.VARCHAR),
             @Result(column = "connectorGroup", property = "connectorGroup", jdbcType = JdbcType.INTEGER),
             @Result(column = "dbConfig", property = "dbConfig", one = @One(select = "getDataBaseConfig")),
+            @Result(column = "demo", property = "demo", jdbcType = JdbcType.BOOLEAN),
             @Result(column = "type", property = "type", jdbcType = JdbcType.VARCHAR)
     })
     DataConnector getOneData(int id);
@@ -60,7 +61,7 @@ public interface DataConnectorMapper {
      * @return
      */
     @Select("select id, bases_name as name, note, addrass, data_name as dataName, DATABASE_TYPE as databaseType," +
-            " PASS_WORD as passWord, USER_NAME as userName, PORT, CREATE_DATE as createDate from bi_databases where id = #{id}")
+            " PASS_WORD as passWord, USER_NAME as userName, PORT, CREATE_DATE as createDate, demo from bi_databases where id = #{id}")
     BaseConfig getDataBaseConfig(int id);
 
     /*
@@ -69,7 +70,7 @@ public interface DataConnectorMapper {
     @Select("select id as dataId, con_type as type, data_name as dataName, data_tag as dataTag, data_note as note, " +
             "bc.create_by as createBy, bc.create_date as createDate," +
             "used_number as usedNumber, db_config as dbConfig ,BD_group as connectorGroup, " +
-            "create_id as createId from bi_data_connectors bc where CREATE_ID = #{id} or ( id in ( select distinct bs_db_id from BI_DB_STRATEGYS where bs_id in (" +
+            "create_id as createId, demo from bi_data_connectors bc where CREATE_ID = #{id} or ( id in ( select distinct bs_db_id from BI_DB_STRATEGYS where bs_id in (" +
             "  select bo_st_id from bi_db_object  where " +
             "  (BO_TYPE='1' and bo_ob_id = #{id} ) or " +
             "  ( bo_type='0' and bo_ob_id in " +
@@ -87,7 +88,8 @@ public interface DataConnectorMapper {
             @Result(column = "createDate", property = "createDate", jdbcType = JdbcType.VARCHAR),
             @Result(column = "connectorGroup", property = "connectorGroup", jdbcType = JdbcType.INTEGER),
             @Result(column = "dbConfig", property = "dbConfig", one = @One(select = "getDataBaseConfig")),
-            @Result(column = "type", property = "type", jdbcType = JdbcType.VARCHAR)
+            @Result(column = "type", property = "type", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "demo", property = "demo", jdbcType = JdbcType.BOOLEAN)
     })
     List<DataConnectorList> getDataConnectorList(@Param("id") int id, TestPage testPage);
 
@@ -171,7 +173,7 @@ public interface DataConnectorMapper {
     查询数据库配置列表
      */
     @Select("select id, bases_name as name, note, addrass, data_name as dataName, DATABASE_TYPE as databaseType," +
-            " PASS_WORD as passWord, USER_NAME as userName, PORT, CREATE_DATE as createDate from bi_databases")
+            " PASS_WORD as passWord, USER_NAME as userName, PORT, CREATE_DATE as createDate, demo from bi_databases")
     List<Databases> getDatabasesList(TestPage testPage);
 
     /*

+ 8 - 0
bi-server/src/main/java/com/usoftchina/bi/server/model/po/BaseConfig.java

@@ -9,7 +9,15 @@ public class BaseConfig {
     private String dataName;           //数据库名称
     private String userName;
     private String passWord;
+    private boolean demo;
 
+    public boolean isDemo() {
+        return demo;
+    }
+
+    public void setDemo(boolean demo) {
+        this.demo = demo;
+    }
 
     public int getId() {
         return id;

+ 9 - 0
bi-server/src/main/java/com/usoftchina/bi/server/model/po/ChartConfig.java

@@ -23,6 +23,15 @@ public class ChartConfig {
     private String chartOption;      //列表缩略图数据
     private String dataName;
     private String fetchConfig;
+    private boolean demo;
+
+    public boolean isDemo() {
+        return demo;
+    }
+
+    public void setDemo(boolean demo) {
+        this.demo = demo;
+    }
 
     public String getFetchConfig() {
         return fetchConfig;

+ 9 - 0
bi-server/src/main/java/com/usoftchina/bi/server/model/po/ChartConfigList.java

@@ -19,6 +19,15 @@ public class ChartConfigList {
     private int row_id;
     private Date reDate;
     private String dbStatus;
+    private boolean demo;
+
+    public boolean isDemo() {
+        return demo;
+    }
+
+    public void setDemo(boolean demo) {
+        this.demo = demo;
+    }
 
     public String getDbStatus() {
         return dbStatus;

+ 18 - 0
bi-server/src/main/java/com/usoftchina/bi/server/model/po/Dashboards.java

@@ -18,6 +18,24 @@ public class Dashboards {
     private String updateDate;
     private Date reDate;
     private String filters;
+    private String chartIds;
+    private boolean demo;
+
+    public String getChartIds() {
+        return chartIds;
+    }
+
+    public void setChartIds(String chartIds) {
+        this.chartIds = chartIds;
+    }
+
+    public boolean isDemo() {
+        return demo;
+    }
+
+    public void setDemo(boolean demo) {
+        this.demo = demo;
+    }
 
     public String getFilters() {
         return filters;

+ 9 - 0
bi-server/src/main/java/com/usoftchina/bi/server/model/po/DataConnector.java

@@ -20,6 +20,15 @@ public class DataConnector {
     private int createId;
     private String createDate;
     private String updateDate;
+    private boolean demo;
+
+    public boolean isDemo() {
+        return demo;
+    }
+
+    public void setDemo(boolean demo) {
+        this.demo = demo;
+    }
 
     public int getDataId() {
         return dataId;

+ 9 - 0
bi-server/src/main/java/com/usoftchina/bi/server/model/po/DataConnectorList.java

@@ -12,6 +12,15 @@ public class DataConnectorList {
     private String createBy;
     private int createId;
     private String createDate;
+    private boolean demo;
+
+    public boolean isDemo() {
+        return demo;
+    }
+
+    public void setDemo(boolean demo) {
+        this.demo = demo;
+    }
 
     public int getCreateId() {
         return createId;

+ 10 - 0
bi-server/src/main/java/com/usoftchina/bi/server/model/po/Databases.java

@@ -12,6 +12,15 @@ public class Databases {
     private String note;
     private String createDate;
     private String updateDate;
+    private boolean demo;
+
+    public boolean isDemo() {
+        return demo;
+    }
+
+    public void setDemo(boolean demo) {
+        this.demo = demo;
+    }
 
     public int getId() {
         return id;
@@ -115,6 +124,7 @@ public class Databases {
                 ", note='" + note + '\'' +
                 ", createDate='" + createDate + '\'' +
                 ", updateDate='" + updateDate + '\'' +
+                ", demo=" + demo +
                 '}';
     }
 }

+ 11 - 23
bi-server/src/test/java/com/usoftchina/bi/test/server/controller/chat/ChartsConfigControllerTest.java → bi-server/src/test/java/com/usoftchina/bi/test/server/controller/chart/ChartsConfigControllerTest.java

@@ -1,13 +1,9 @@
-package com.usoftchina.bi.test.server.controller.chat;
+package com.usoftchina.bi.test.server.controller.chart;
 
-import com.github.pagehelper.PageInfo;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.core.utils.JsonUtils;
 import com.usoftchina.bi.server.Application;
-import com.usoftchina.bi.server.model.po.ChartConfig;
 import com.usoftchina.bi.server.model.po.TokenData;
-import com.usoftchina.bi.server.model.vo.configVo.ChartConfigInfo;
 import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
 import com.usoftchina.bi.server.service.user.UserService;
 import com.usoftchina.bi.starter.test.BaseControllerTest;
@@ -19,14 +15,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.servlet.MvcResult;
-
-import java.util.List;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest( classes = Application.class)
-@WebAppConfiguration
 public class ChartsConfigControllerTest extends BaseControllerTest {
 
     @Autowired
@@ -39,8 +30,8 @@ public class ChartsConfigControllerTest extends BaseControllerTest {
     public void init(){
         if (token == null) {
             LoginInfo loginInfo = new LoginInfo();
-            loginInfo.setUserName("U0818");
-            loginInfo.setPassWord("cw111111");
+            loginInfo.setUserName("ZHUTH");
+            loginInfo.setPassWord("1111qqqq");
             RepEntity<TokenData> repEntity = userService.login(loginInfo);
             token = repEntity.getData().getToken();
             logger.info("token={}", token);
@@ -49,10 +40,10 @@ public class ChartsConfigControllerTest extends BaseControllerTest {
 
     @Test
     public void testA_inputCharts() throws Exception {
-        ChartConfigInfo chartConfigInfo = new ChartConfigInfo();
+        /*ChartConfigInfo chartConfigInfo = new ChartConfigInfo();
         mockMvc.perform(requestBody("/inputCharts", chartConfigInfo)
                         .header("token", token))
-                .andReturn();
+                .andReturn();*/
     }
 
     @Test
@@ -74,20 +65,17 @@ public class ChartsConfigControllerTest extends BaseControllerTest {
     @Test
     public void testF_getListCharts() throws Exception {
         TestPage page = new TestPage();
-        MvcResult result = mockMvc.perform(requestBody("/getListCharts", page)
+        mockMvc.perform(get("/getListCharts", page)
                         .header("token", token))
                 .andReturn();
-        RepEntity<PageInfo> repEntity = result(result, PageInfo.class);
-        logger.info("result={}", JsonUtils.toJsonString(repEntity.getData()));
     }
 
     @Test
     public void testG_getChartsConfig() throws Exception {
-        MvcResult result = mockMvc.perform(requestBody("/getListCharts", 1)
-                .header("token", token))
+        mockMvc.perform(get("/getChartsConfig")
+                .header("token", token)
+                .param("id", "451"))
                 .andReturn();
-        RepEntity<ChartConfig> repEntity = result(result, ChartConfig.class);
-        logger.info("result={}", JsonUtils.toJsonString(repEntity.getData()));
     }
 
     @Test
@@ -106,13 +94,13 @@ public class ChartsConfigControllerTest extends BaseControllerTest {
     public void testK_delChartsGroup() throws Exception {
     }
 
-    @Test
+    /*@Test
     public void testL_getChartsGroup() throws Exception {
         MvcResult result = mockMvc.perform(post("/getListCharts")
                 .header("token", token))
                 .andReturn();
         RepEntity<List> repEntity = result(result, List.class);
         logger.info("result={}", JsonUtils.toJsonString(repEntity.getData()));
-    }
+    }*/
 
 }

+ 81 - 0
bi-server/src/test/java/com/usoftchina/bi/test/server/controller/dashboard/DashboardsServiceTest.java

@@ -0,0 +1,81 @@
+package com.usoftchina.bi.test.server.controller.dashboard;
+
+import com.usoftchina.bi.core.base.RepEntity;
+import com.usoftchina.bi.core.base.TestPage;
+import com.usoftchina.bi.server.Application;
+import com.usoftchina.bi.server.model.po.TokenData;
+import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
+import com.usoftchina.bi.server.service.user.UserService;
+import com.usoftchina.bi.starter.test.BaseControllerTest;
+import com.usoftchina.bi.test.server.controller.chart.ChartsConfigControllerTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest( classes = Application.class)
+public class DashboardsServiceTest extends BaseControllerTest {
+
+    @Autowired
+    private UserService userService;
+
+    private static String token = null;
+    private static final Logger logger = LoggerFactory.getLogger(ChartsConfigControllerTest.class);
+
+    @Before
+    public void init(){
+        if (token == null) {
+            LoginInfo loginInfo = new LoginInfo();
+            loginInfo.setUserName("ZHUTH");
+            loginInfo.setPassWord("1111qqqq");
+            RepEntity<TokenData> repEntity = userService.login(loginInfo);
+            token = repEntity.getData().getToken();
+            logger.info("token={}", token);
+        }
+    }
+
+    @Test
+    public void testA_setDashboards() throws Exception {
+    }
+
+    @Test
+    public void testB_updateDashboards() throws Exception {
+    }
+
+    @Test
+    public void testC_delDashboards() throws Exception {
+    }
+
+    @Test
+    public void testD_getListDashboards() throws Exception {
+        TestPage page = new TestPage();
+        mockMvc.perform(get("/getListDashboards", page)
+                        .header("token", token))
+                .andReturn();
+    }
+
+    @Test
+    public void testE_getDashboards() throws Exception {
+        mockMvc.perform(get("/getDashboards")
+                .header("token", token)
+                .param("id", "381"))
+                .andReturn();
+    }
+
+    @Test
+    public void testF_changeDashOrder() throws Exception {
+    }
+
+    @Test
+    public void testG_getDashOrder() throws Exception {
+    }
+
+}

+ 54 - 0
bi-server/src/test/java/com/usoftchina/bi/test/server/controller/dataSource/DataBasesControllerTest.java

@@ -0,0 +1,54 @@
+package com.usoftchina.bi.test.server.controller.dataSource;
+
+import com.usoftchina.bi.core.base.RepEntity;
+import com.usoftchina.bi.server.Application;
+import com.usoftchina.bi.server.model.po.TokenData;
+import com.usoftchina.bi.server.model.vo.configVo.LoginInfo;
+import com.usoftchina.bi.server.service.user.UserService;
+import com.usoftchina.bi.starter.test.BaseControllerTest;
+import com.usoftchina.bi.test.server.controller.chart.ChartsConfigControllerTest;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+public class DataBasesControllerTest extends BaseControllerTest {
+
+    @Autowired
+    private UserService userService;
+
+    private static String token = null;
+    private static final Logger logger = LoggerFactory.getLogger(ChartsConfigControllerTest.class);
+
+    @Before
+    public void init(){
+        if (token == null) {
+            LoginInfo loginInfo = new LoginInfo();
+            loginInfo.setUserName("U0818");
+            loginInfo.setPassWord("cw111111");
+            RepEntity<TokenData> repEntity = userService.login(loginInfo);
+            token = repEntity.getData().getToken();
+            logger.info("token={}", token);
+        }
+    }
+
+    /**
+     * 获取数据连接列表
+     * @throws Exception
+     */
+    @Test
+    public void testA_getDatabases() throws Exception {
+        mockMvc.perform(get("/DataBase/getDatabases")
+                            .header("token", token)
+                            .param("pageNum", "1")
+                            .param("pageSize", "10"))
+                    .andReturn();
+    }
+
+}

File diff suppressed because it is too large
+ 1 - 4
bi-server/src/test/java/com/usoftchina/bi/test/server/controller/dataSource/DataConnectorControllerTest.java


Some files were not shown because too many files changed in this diff