数据新增、修改、读取接口调整

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

@@ -14,10 +14,10 @@ import java.util.Map;
 public class GlobalException {
     @ExceptionHandler(RuntimeException.class)
     @ResponseBody
-    public Map<String, Object> exceptionHandle(){
+    public Map<String, Object> exceptionHandle(Exception e){
         Map<String, Object> result = new HashMap<String, Object>();
         result.put("code" , "-502");
-        result.put("msg" , "服务器异常");
+        result.put("msg" , e.getMessage());
         return result;
     }
 

bi-server/src/main/java/com/usoftchina/bi/server/controller/dataSource/DataConnectorController.java

@@ -37,7 +37,7 @@ public class DataConnectorController {
     @CheckToken
     @Auth(user = "admin")
     @PostMapping("/inputDataConnector")
-    public RepEntity inputDataConnector(@RequestHeader String token, @RequestBody DataConnectorInfo body) {
+    public RepEntity saveDataConnector(@RequestHeader String token, @RequestBody DataConnectorInfo body) {
         return dataConnectorService.setDataConnector(token,body);
     }
 
@@ -46,9 +46,9 @@ public class DataConnectorController {
      */
     @ApiOperation(value = "查看数据源列表", notes = "查看数据源列表", response = RepEntity.class)
     @CheckToken
-    @PostMapping("/getListDataConnector")
-    public RepEntity getListDataConnector(@RequestHeader String token, @RequestBody TestPage body){
-        return dataConnectorService.getListConnector(token, body);
+    @GetMapping("/getListDataConnector")
+    public RepEntity getListDataConnector(@RequestHeader String token, TestPage page){
+        return dataConnectorService.getListConnector(token, page);
     }
 
     /*
@@ -57,9 +57,9 @@ public class DataConnectorController {
     @ApiOperation(value = "查看单个数据源配置", notes = "查看单个数据源配置", response = RepEntity.class)
     @CheckToken
     @Auth(user = "admin")
-    @PostMapping("/getDataConnector")
-    public RepEntity getDataConnector(@RequestHeader String token,@RequestBody int body){
-        return dataConnectorService.getConnector(body);
+    @GetMapping("/getDataConnector")
+    public RepEntity getDataConnector(@RequestHeader String token,@RequestParam("id") int id){
+        return dataConnectorService.getConnector(id);
     }
 
     /*

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

@@ -1,5 +1,6 @@
 package com.usoftchina.bi.server.dao.dataSource;
 
+import com.usoftchina.bi.server.model.po.BaseConfig;
 import com.usoftchina.bi.server.model.po.DataConnector;
 import com.usoftchina.bi.server.model.po.DataConnectorList;
 import com.usoftchina.bi.server.model.po.Databases;
@@ -7,6 +8,7 @@ import com.usoftchina.bi.core.base.TestPage;
 import com.usoftchina.bi.server.model.vo.configVo.DatabasesInfo;
 import com.usoftchina.bi.server.model.vo.configVo.GroupInfo;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.JdbcType;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -32,10 +34,35 @@ 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 userNumber, CREATE_DATE as createDate,DB_CONFIG as dbConfig, BD_group as connectorGroup," +
+            "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}")
+    @Results(id = "DataConnectorResultMap", value = {
+            @Result(column = "dataId", property = "dataId", jdbcType = JdbcType.BIGINT),
+            @Result(column = "dataName", property = "dataName", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "note", property = "note", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "dataTag", property = "dataTag", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "columnConfig", property = "columnConfig", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "loadObject", property = "loadObject", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "createBy", property = "createBy", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "createId", property = "createId", jdbcType = JdbcType.INTEGER),
+            @Result(column = "usedNumber", property = "usedNumber", jdbcType = JdbcType.INTEGER),
+            @Result(column = "createDate", property = "createDate", jdbcType = JdbcType.VARCHAR),
+            @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 = "type", property = "type", jdbcType = JdbcType.VARCHAR)
+    })
     DataConnector getOneData(int id);
 
+    /**
+     * 获取BaseConfig
+     * @param id
+     * @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}")
+    BaseConfig getDataBaseConfig(int id);
+
     /*
     查询自己创建的,权限分配的数据源列表,已经启用
      */
@@ -49,6 +76,19 @@ public interface DataConnectorMapper {
             "  ( select br_user_group from bi_user_rel_groups where br_user_id = #{id} ) " +
             "   )" +
             ")and is_open = '1')) and is_open = '1'")
+    @Results(id = "DataConnectorListResultMap", value = {
+            @Result(column = "dataId", property = "dataId", jdbcType = JdbcType.BIGINT),
+            @Result(column = "dataName", property = "dataName", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "note", property = "note", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "dataTag", property = "dataTag", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "createBy", property = "createBy", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "createId", property = "createId", jdbcType = JdbcType.INTEGER),
+            @Result(column = "usedNumber", property = "usedNumber", jdbcType = JdbcType.INTEGER),
+            @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)
+    })
     List<DataConnectorList> getDataConnectorList(@Param("id") int id, TestPage testPage);
 
 
@@ -62,7 +102,7 @@ public interface DataConnectorMapper {
     插入数据源配置
      */
     @Insert("INSERT INTO bi_data_connectors(id,data_name,data_note,data_tag,con_type,LOAD_OBJECT,DB_CONFIG,columns_config,used_number,create_by,create_date, table_name, BD_GROUP, create_id) " +
-            "VALUES (#{dataId},#{dataName}, #{note}, #{dataTag}, #{type}, #{loadObject}, #{dbConfig},#{columnConfig}, #{usedNumber},#{createBy}, to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'), #{tableName}, #{connectorGroup},#{createId})")
+            "VALUES (#{dataId},#{dataName}, #{note}, #{dataTag}, #{type}, #{loadObject}, #{dbConId},#{columnConfig}, #{userNumber},#{createBy}, to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'), #{tableName}, #{connectorGroup},#{createId})")
     @SelectKey(before=true,keyProperty="dataId",resultType=int.class,statement="SELECT bi_data_connectors_sequence.nextval from dual",keyColumn = "id")
     void insertDataConnector(DataConnector dataConnector);
 

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

@@ -7,7 +7,8 @@ public class DataConnector {
     private int dataId;
     private String dataName;
     private String tableName;
-    private String dbConfig;         //数据库配置
+    private String dbConId;         //数据库配置ID
+    private BaseConfig dbConfig;         //数据库配置
     private String loadObject;    //加载对象
     private int connectorGroup;
     private String note;
@@ -20,14 +21,6 @@ public class DataConnector {
     private String createDate;
     private String updateDate;
 
-    public int getConnectorGroup() {
-        return connectorGroup;
-    }
-
-    public void setConnectorGroup(int connectorGroup) {
-        this.connectorGroup = connectorGroup;
-    }
-
     public int getDataId() {
         return dataId;
     }
@@ -44,11 +37,27 @@ public class DataConnector {
         this.dataName = dataName;
     }
 
-    public String getDbConfig() {
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    public String getDbConId() {
+        return dbConId;
+    }
+
+    public void setDbConId(String dbConId) {
+        this.dbConId = dbConId;
+    }
+
+    public BaseConfig getDbConfig() {
         return dbConfig;
     }
 
-    public void setDbConfig(String dbConfig) {
+    public void setDbConfig(BaseConfig dbConfig) {
         this.dbConfig = dbConfig;
     }
 
@@ -60,6 +69,14 @@ public class DataConnector {
         this.loadObject = loadObject;
     }
 
+    public int getConnectorGroup() {
+        return connectorGroup;
+    }
+
+    public void setConnectorGroup(int connectorGroup) {
+        this.connectorGroup = connectorGroup;
+    }
+
     public String getNote() {
         return note;
     }
@@ -92,6 +109,14 @@ public class DataConnector {
         this.usedNumber = usedNumber;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public String getCreateBy() {
         return createBy;
     }
@@ -100,6 +125,14 @@ public class DataConnector {
         this.createBy = createBy;
     }
 
+    public int getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(int createId) {
+        this.createId = createId;
+    }
+
     public String getCreateDate() {
         return createDate;
     }
@@ -116,44 +149,23 @@ public class DataConnector {
         this.updateDate = updateDate;
     }
 
-    public String getTableName() {
-        return tableName;
-    }
-
-    public void setTableName(String tableName) {
-        this.tableName = tableName;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public int getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(int createId) {
-        this.createId = createId;
-    }
-
     @Override
     public String toString() {
         return "DataConnector{" +
                 "dataId=" + dataId +
                 ", dataName='" + dataName + '\'' +
                 ", tableName='" + tableName + '\'' +
+                ", dbConId=" + dbConId +
                 ", dbConfig='" + dbConfig + '\'' +
                 ", loadObject='" + loadObject + '\'' +
+                ", connectorGroup=" + connectorGroup +
                 ", note='" + note + '\'' +
                 ", columnConfig='" + columnConfig + '\'' +
                 ", dataTag='" + dataTag + '\'' +
                 ", usedNumber=" + usedNumber +
                 ", type='" + type + '\'' +
                 ", createBy='" + createBy + '\'' +
+                ", createId=" + createId +
                 ", createDate='" + createDate + '\'' +
                 ", updateDate='" + updateDate + '\'' +
                 '}';

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

@@ -6,7 +6,7 @@ public class DataConnectorList {
     private String note;
     private String type;
     private String dataTag;
-    private String dbConfig;
+    private BaseConfig dbConfig;
     private int connectorGroup;
     private int usedNumber;
     private String createBy;
@@ -94,11 +94,11 @@ public class DataConnectorList {
         this.dataTag = dataTag;
     }
 
-    public String getDbConfig() {
+    public BaseConfig getDbConfig() {
         return dbConfig;
     }
 
-    public void setDbConfig(String dbConfig) {
+    public void setDbConfig(BaseConfig dbConfig) {
         this.dbConfig = dbConfig;
     }
 

bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/DataConnectorInfo.java

@@ -8,7 +8,7 @@ import java.util.List;
 public class DataConnectorInfo<T> {
     private int dataId;
     private String dataName;
-    private DatabaseConfig dbConfig;         //数据库配置
+    private String dbConId;         //数据库配置ID
     private String loadObject;    //加载对象
     private String note;
     private List<ColumnRenameInfo> columnConfig;
@@ -43,12 +43,12 @@ public class DataConnectorInfo<T> {
         this.dataName = dataName;
     }
 
-    public DatabaseConfig getDbConfig() {
-        return dbConfig;
+    public String getDbConId() {
+        return dbConId;
     }
 
-    public void setDbConfig(DatabaseConfig dbConfig) {
-        this.dbConfig = dbConfig;
+    public void setDbConId(String dbConId) {
+        this.dbConId = dbConId;
     }
 
     public String getLoadObject() {
@@ -120,7 +120,7 @@ public class DataConnectorInfo<T> {
         return "DataConnectorInfo{" +
                 "dataId=" + dataId +
                 ", dataName='" + dataName + '\'' +
-                ", dbConfig=" + dbConfig +
+                ", dbConId=" + dbConId +
                 ", loadObject='" + loadObject + '\'' +
                 ", note='" + note + '\'' +
                 ", columnConfig=" + columnConfig +

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/DataConnectorService.java

@@ -1,6 +1,7 @@
 package com.usoftchina.bi.server.service.dataSource;
 
 import com.usoftchina.bi.core.utils.GetTokenDataUtil;
+import com.usoftchina.bi.core.utils.JsonUtils;
 import com.usoftchina.bi.server.dao.chart.ChartsConfigMapper;
 import com.usoftchina.bi.server.dao.dataSource.DataConnectorMapper;
 import com.usoftchina.bi.server.dao.user.UserMapper;
@@ -17,10 +18,7 @@ import com.usoftchina.bi.server.model.po.DataConnectorList;
 import com.usoftchina.bi.core.base.RepCode;
 import com.usoftchina.bi.core.base.RepEntity;
 import com.usoftchina.bi.core.base.TestPage;
-import com.usoftchina.bi.server.model.vo.configVo.ChangeOrderInfo;
-import com.usoftchina.bi.server.model.vo.configVo.ColumnRenameInfo;
-import com.usoftchina.bi.server.model.vo.configVo.DataConnectorInfo;
-import com.usoftchina.bi.server.model.vo.configVo.GroupInfo;
+import com.usoftchina.bi.server.model.vo.configVo.*;
 import com.usoftchina.bi.server.model.vo.dataVo.ColumnValuesInfo;
 import com.usoftchina.bi.server.service.chart.GetChartsDataUtilService;
 import com.usoftchina.bi.server.service.strategy.StrategysService;
@@ -65,29 +63,22 @@ public class DataConnectorService {
     /*
     保存数据源
      */
-    public RepEntity setDataConnector(String token, DataConnectorInfo dataConnectorInfo){
+    public RepEntity setDataConnector(String token, DataConnectorInfo dataConnectorInfo) {
 
         Map<String, String> resultMap = GetTokenDataUtil.getTokenData(token);
         int id = Integer.parseInt(resultMap.get("id"));
         String userName = resultMap.get("name");
 
-        if (dataConnectorInfo == null || "".equals(dataConnectorInfo)){
+        if (dataConnectorInfo == null || "".equals(dataConnectorInfo)) {
             return new RepEntity(RepCode.Null);
         }
         DataConnector dataConnector = new DataConnector();
-        BeanUtils.copyProperties(dataConnectorInfo,dataConnector);
-
-        //取出数据库连接ID
-        DatabaseConfig dbConfig = dataConnectorInfo.getDbConfig();
-        int dbConId = dbConfig.getId();
-        String pw = dataConnectorMapper.getBasesById(dbConId);
-        dbConfig.setPassWord(pw);
+        BeanUtils.copyProperties(dataConnectorInfo, dataConnector);
 
         dataConnector.setTableName(dataConnector.getLoadObject());
 
-         String columnConfig = null;
-         String databaseConfig = null;
-         String dataTag = null;
+        String columnConfig = null;
+        String dataTag = null;
 
         try {
             columnConfig = objectmapper.writeValueAsString(dataConnectorInfo.getColumnConfig());
@@ -95,12 +86,6 @@ public class DataConnectorService {
             e.printStackTrace();
         }
 
-        try {
-            databaseConfig = objectmapper.writeValueAsString(dbConfig);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-
         try {
             dataTag = objectmapper.writeValueAsString(dataConnectorInfo.getDataTag());
         } catch (JsonProcessingException e) {
@@ -108,13 +93,12 @@ public class DataConnectorService {
         }
 
         dataConnector.setColumnConfig(columnConfig);
-        dataConnector.setDbConfig(databaseConfig);
         dataConnector.setDataTag(dataTag);
-        if (dataConnector.getConnectorGroup() == 0){
+        if (dataConnector.getConnectorGroup() == 0) {
             dataConnector.setConnectorGroup(-1);
         }
 
-        if (dataConnectorInfo.getNote() == null || "".equals(dataConnectorInfo)){
+        if (dataConnectorInfo.getNote() == null || "".equals(dataConnectorInfo)) {
             dataConnector.setNote("");
         }
 
@@ -122,38 +106,28 @@ public class DataConnectorService {
         dataConnector.setCreateId(id);
         dataConnectorMapper.insertDataConnector(dataConnector);
         int dataId = dataConnector.getDataId();
-        return new RepEntity(RepCode.success,dataId);
+        return new RepEntity(RepCode.success, dataId);
     }
 
     /**
      * 查看数据源列表
+     *
      * @param token
      * @param testPage
      * @return
      */
-    @Cacheable(value = "dataConnector", key = "#testPage.pageNum")
-    public RepEntity getListConnector(String token, TestPage testPage){
+//    @Cacheable(value = "dataConnector", key = "#testPage.pageNum")
+    public RepEntity getListConnector(String token, TestPage testPage) {
         Map<String, String> resultMap = GetTokenDataUtil.getTokenData(token);
         String id = resultMap.get("id");
         List<DataConnectorList> listConnector = dataConnectorMapper.getDataConnectorList(Integer.parseInt(id), testPage.enablePaging());
         List<DataConnectorList> listConnectors = new ArrayList<>();
         Iterator isList = listConnector.iterator();
-        while (isList.hasNext()){
+        while (isList.hasNext()) {
             DataConnectorList dataConnectorList = (DataConnectorList) isList.next();
-            BaseConfig baseConfig = new BaseConfig();
-            String dbConfig = dataConnectorList.getDbConfig();
-            try {
-                baseConfig = objectmapper.readValue(dbConfig, BaseConfig.class);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            BaseConfig baseConfig = dataConnectorList.getDbConfig();
             baseConfig.setPassWord("");
-            try{
-                dbConfig = objectmapper.writeValueAsString(baseConfig);
-            }catch (Exception e) {
-                e.printStackTrace();
-            }
-            dataConnectorList.setDbConfig(dbConfig);
+            dataConnectorList.setDbConfig(baseConfig);
             listConnectors.add(dataConnectorList);
         }
         PageInfo<DataConnectorList> pageInfo = new PageInfo<>(listConnectors);
@@ -164,40 +138,26 @@ public class DataConnectorService {
     /*
     查看单个数据源配置
      */
-    @Cacheable(value = "singleDataConnector", key = "#body")
-    public RepEntity getConnector(int id){
+//    @Cacheable(value = "singleDataConnector", key = "#body")
+    public RepEntity getConnector(int id) {
         DataConnector dataConnector = dataConnectorMapper.getOneData(id);
-        if (dataConnector == null){
+        if (dataConnector == null) {
             return new RepEntity(RepCode.DataNonExistent);
         }
-        BaseConfig baseConfig = new BaseConfig();
-        String dbConfig = dataConnector.getDbConfig();
-        try {
-            baseConfig = objectmapper.readValue(dbConfig, BaseConfig.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        baseConfig.setPassWord("");
-        try{
-            dbConfig = objectmapper.writeValueAsString(baseConfig);
-        }catch (Exception e) {
-            e.printStackTrace();
-        }
-        dataConnector.setDbConfig(dbConfig);
         return new RepEntity(RepCode.success, dataConnector);
     }
 
     /*
     更新数据源配置
      */
-    @CacheEvict(value = "singleDataConnector", key = "#body.dataId")
-    public RepEntity updateData(DataConnectorInfo dataConnectorInfo){
+    //@CacheEvict(value = "singleDataConnector", key = "#body.dataId")
+    public RepEntity updateData(DataConnectorInfo dataConnectorInfo) {
 
-        if (dataConnectorInfo == null && "".equals(dataConnectorInfo)){
+        if (dataConnectorInfo == null && "".equals(dataConnectorInfo)) {
             return new RepEntity(RepCode.Null);
         }
         DataConnector dataConnector = new DataConnector();
-        BeanUtils.copyProperties(dataConnectorInfo,dataConnector);
+        BeanUtils.copyProperties(dataConnectorInfo, dataConnector);
         //获取表名
         dataConnector.setTableName(dataConnector.getLoadObject());
         List<ColumnRenameInfo> columnConfig = dataConnectorInfo.getColumnConfig();
@@ -205,10 +165,9 @@ public class DataConnectorService {
 
 
         String columnConfigJson = null;
-        String dbConfigJson = null;
         String dataTagJson = null;
 
-        if (!("".equals(columnConfig)) && columnConfig != null){
+        if (!("".equals(columnConfig)) && columnConfig != null) {
             try {
                 columnConfigJson = objectmapper.writeValueAsString(columnConfig);
             } catch (JsonProcessingException e) {
@@ -216,9 +175,7 @@ public class DataConnectorService {
             }
             dataConnector.setColumnConfig(columnConfigJson);
         }
-
-        dataConnector.setDbConfig(dbConfigJson);
-        if (dataTag != null){
+        if (dataTag != null) {
             try {
                 dataTagJson = objectmapper.writeValueAsString(dataTag);
             } catch (JsonProcessingException e) {
@@ -227,7 +184,7 @@ public class DataConnectorService {
             dataConnector.setDataTag(dataTagJson);
         }
 
-        if (dataConnector.getConnectorGroup() == 0){
+        if (dataConnector.getConnectorGroup() == 0) {
             dataConnector.setConnectorGroup(-1);
         }
 
@@ -238,12 +195,12 @@ public class DataConnectorService {
     /*
     转交数据源
      */
-    public RepEntity changeOrder(ChangeOrderInfo changeOrderInfo, String token){
+    public RepEntity changeOrder(ChangeOrderInfo changeOrderInfo, String token) {
         Map<String, String> resMap = GetTokenDataUtil.getTokenData(token);
         int userId = Integer.parseInt(resMap.get("id"));
         String name = userMapper.getName(changeOrderInfo.getUserId());
         int createId = dataConnectorMapper.getCreateIdById(changeOrderInfo.getId());
-        if (createId != userId){
+        if (createId != userId) {
             return new RepEntity(RepCode.NoAuthority);
         }
         dataConnectorMapper.updataOrder(name, changeOrderInfo.getUserId(), changeOrderInfo.getId());
@@ -254,7 +211,7 @@ public class DataConnectorService {
     更新数据源分组
      */
     @CacheEvict(value = "singleDataConnector", key = "#body.id")
-    public RepEntity updateConfigGroup(GroupUpdateId groupUpdateId){
+    public RepEntity updateConfigGroup(GroupUpdateId groupUpdateId) {
         int id = groupUpdateId.getId();
         int groupId = groupUpdateId.getGroupId();
         dataConnectorMapper.updateConfigGroup(id, groupId);
@@ -265,7 +222,7 @@ public class DataConnectorService {
     删除数据源
      */
     @CacheEvict(value = "singleDataConnector")
-    public RepEntity delDataConnector(List<Integer> idList){
+    public RepEntity delDataConnector(List<Integer> idList) {
         Iterator isList = idList.iterator();
 //        while (isList.hasNext()){
 //            int id = (int) isList.next();
@@ -281,8 +238,8 @@ public class DataConnectorService {
     /*
     创建数据源分组
      */
-    public RepEntity setDataConnectorGroup(GroupInfo groupInfo){
-        if (groupInfo == null || "".equals(groupInfo)){
+    public RepEntity setDataConnectorGroup(GroupInfo groupInfo) {
+        if (groupInfo == null || "".equals(groupInfo)) {
             return new RepEntity(RepCode.Null);
         }
         dataConnectorMapper.setConnectorGroup(groupInfo);
@@ -294,7 +251,7 @@ public class DataConnectorService {
     更新数据源分组
      */
     @CacheEvict(value = "singleDataConnector", key = "#body.id")
-    public RepEntity updataDataConnectorGroup(GroupInfo groupInfo){
+    public RepEntity updataDataConnectorGroup(GroupInfo groupInfo) {
         dataConnectorMapper.updataConnectorGroup(groupInfo);
         return new RepEntity(RepCode.success);
     }
@@ -303,10 +260,10 @@ public class DataConnectorService {
    批量更新数据源分组
     */
     @CacheEvict(value = "singleDataConnector")
-    public RepEntity updataConnectorGroups(List<GroupInfo> groupInfoList){
+    public RepEntity updataConnectorGroups(List<GroupInfo> groupInfoList) {
         Iterator isList = groupInfoList.iterator();
         GroupInfo groupInfo = new GroupInfo();
-        while (isList.hasNext()){
+        while (isList.hasNext()) {
             groupInfo = (GroupInfo) isList.next();
             dataConnectorMapper.updataConnectorGroup(groupInfo);
         }
@@ -318,17 +275,17 @@ public class DataConnectorService {
     删除数据源分组
      */
     @CacheEvict(value = "singleDataConnector")
-    public RepEntity delDataConnectorGroup(List<Integer> idList){
+    public RepEntity delDataConnectorGroup(List<Integer> idList) {
         List<Integer> integerList = idList;
         Iterator isList = integerList.iterator();
-        while (isList.hasNext()){
+        while (isList.hasNext()) {
             int id = (int) isList.next();
             List<String> groupName = dataConnectorMapper.getFatherId(id);
-            if (groupName.size() != 0){
+            if (groupName.size() != 0) {
                 return new RepEntity(RepCode.hasGroupUsing);
             }
             List<String> chartName = dataConnectorMapper.getConName(id);
-            if (chartName.size() != 0){
+            if (chartName.size() != 0) {
                 return new RepEntity(RepCode.hasConUsing);
             }
         }
@@ -339,14 +296,14 @@ public class DataConnectorService {
     /*
     查询数据源分组列表
      */
-    public RepEntity getConnectorGroup(){
+    public RepEntity getConnectorGroup() {
         return new RepEntity(RepCode.success, dataConnectorMapper.getConnectorGroup());
     }
 
     /*
     查询数据源数据
      */
-    public RepEntity getConnectorData(String token, BaseToDataInfo baseToDataInfo){
+    public RepEntity getConnectorData(String token, BaseToDataInfo baseToDataInfo) {
 
         int dataId = baseToDataInfo.getId();
         int baseId = getChartsDataUtilService.getBaseIdByConnect(dataId);
@@ -362,33 +319,33 @@ public class DataConnectorService {
         columnValuesInfo.setColumnConfig(columnConfig);
         String sqls = chartsUtilService.columnNameUtil(id, dataId, sql, true, 0, createId);
 
-            try {
-                if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                    logger.info("数据源:{} 不存在, 使用默认的数据源", baseId);
-                } else {
-                    logger.info("使用数据源：", baseId);
-                    DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
-                }
-                List<Map<String, Object>> val = new ArrayList<>();
-                if (id == createId) {
-                    val = dataConnectorMapper.getValues(sql, baseToDataInfo.getTestPage().enablePaging());
-                } else {
-                    if ("".equals(sqls)) {
-                        return new RepEntity(RepCode.NoAuthority);
-                    }
-                    val = dataConnectorMapper.getValues(sql, baseToDataInfo.getTestPage().enablePaging());
+        try {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+                logger.info("数据源:{} 不存在, 使用默认的数据源", baseId);
+            } else {
+                logger.info("使用数据源：", baseId);
+                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+            }
+            List<Map<String, Object>> val = new ArrayList<>();
+            if (id == createId) {
+                val = dataConnectorMapper.getValues(sql, baseToDataInfo.getTestPage().enablePaging());
+            } else {
+                if ("".equals(sqls)) {
+                    return new RepEntity(RepCode.NoAuthority);
                 }
-
-                PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(val);
-                columnValuesInfo.setValues(pageInfo);
-            } catch (Exception e) {
-                e.printStackTrace();
-                logger.error("异常");
-                return new RepEntity(RepCode.erro);
-            } finally {
-                logger.info("关闭数据源");
-                DynamicDataSourceContextHolder.clearDataSourceType();
+                val = dataConnectorMapper.getValues(sql, baseToDataInfo.getTestPage().enablePaging());
             }
+
+            PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(val);
+            columnValuesInfo.setValues(pageInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("异常");
+            return new RepEntity(RepCode.erro);
+        } finally {
+            logger.info("关闭数据源");
+            DynamicDataSourceContextHolder.clearDataSourceType();
+        }
         return new RepEntity(RepCode.success, columnValuesInfo);
     }
 

bi-server/src/test/java/com/usoftchina/bi/test/server/controller/ChartsConfigControllerTest.java → bi-server/src/test/java/com/usoftchina/bi/test/server/controller/chat/ChartsConfigControllerTest.java

@@ -1,4 +1,4 @@
-package com.usoftchina.bi.test.server.controller;
+package com.usoftchina.bi.test.server.controller.chat;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.bi.core.base.RepEntity;