1.图表数据源的转交功能

2.获取列，获取列数据的接口整改
3.图表数据源的策略管理

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

@@ -2,6 +2,7 @@ package com.controller;
 
 import com.model.bo.GroupUpdateId;
 import com.model.pojo.RepEntity;
+import com.model.vo.configVo.ChangeOrderInfo;
 import com.model.vo.configVo.ChartConfigInfo;
 import com.model.vo.configVo.GroupInfo;
 import com.server.ChartsConfigService;
@@ -38,6 +39,14 @@ public class ChartsConfigController {
         return chartsConfigService.updateChartsConfig(body);
     }
 
+    /*
+    移交图表
+     */
+    @RequestMapping("/changeChartOrder")
+    public RepEntity changeChartOrder(@RequestBody ChangeOrderInfo body){
+        return chartsConfigService.changeChartOrder(body);
+    }
+
     /*
     更新图表的分组
      */

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

@@ -66,6 +66,16 @@ public class DataBasesController {
         return dataBasesService.getColumnData(body);
     }
 
+    /*
+    通过图表Id查看列数据
+     */
+//    @CheckToken
+    @RequestMapping("/getColumnByChartId")
+    public RepEntity getColumnByChartId(@RequestHeader String token,@RequestBody int body){
+        return dataBasesService.getColumnByChartId(body);
+    }
+
+
     /*
     测试数据库连接
      */

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

@@ -3,7 +3,7 @@ package com.controller;
 import com.model.bo.GroupUpdateId;
 import com.model.bo.ToSql;
 import com.model.pojo.RepEntity;
-import com.model.vo.configVo.BdStrategysInfo;
+import com.model.vo.configVo.ChangeOrderInfo;
 import com.model.vo.configVo.DataConnectorInfo;
 import com.model.vo.configVo.GroupInfo;
 import com.server.DataConnectorService;
@@ -63,6 +63,14 @@ public class DataConnectorController {
         return dataConnectorService.updateData(body);
     }
 
+    /*
+    转交数据源
+     */
+    @RequestMapping("/changeDbOrder")
+    public RepEntity changeDbOrder(@RequestBody ChangeOrderInfo body){
+        return dataConnectorService.changeOrder(body);
+    }
+
     /*
     更新数据源配置的分组
      */
@@ -136,36 +144,4 @@ public class DataConnectorController {
     public RepEntity getConnectorGroup(@RequestHeader String token){
         return dataConnectorService.getConnectorGroup();
     }
-
-    /*
-    添加数据源策略
-     */
-    @RequestMapping("/addDbStrategys")
-    public RepEntity addDbStrategys(@RequestBody BdStrategysInfo body){
-        return dataConnectorService.addDbStrategys(body);
-    }
-
-    /*
-    删除数据源策略
-     */
-    @RequestMapping("/delDbStrategys")
-    public RepEntity delDbStrategys(@RequestBody List<Integer> body){
-        return dataConnectorService.delDbStrategys(body);
-    }
-
-    /*
-    更新数据源策略
-     */
-    @RequestMapping("/updateDbStrategys")
-    public RepEntity updateDbStrategys(@RequestBody BdStrategysInfo body){
-        return dataConnectorService.updateDbStrategys(body);
-    }
-
-    /*
-    查询数据源策略
-     */
-    @RequestMapping("/getDbStrategys")
-    public RepEntity getDbStrategys(){
-        return dataConnectorService.getDbStrategys();
-    }
 }

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

@@ -90,4 +90,12 @@ public class ShowChartsController {
     public RepEntity showScreenData(@RequestHeader String token,@RequestBody ColumnScreenInfo body){
         return columnScreenService.getScreenData(body);
     }
+
+    /*
+    展示单列数据（数据源）
+     */
+    @RequestMapping("/getScreenByBaseId")
+    public RepEntity getScreenByBaseId(@RequestHeader String token,@RequestBody ColumnScreenInfo body){
+        return columnScreenService.getScreenByBaseId(body);
+    }
 }

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

@@ -0,0 +1,81 @@
+package com.controller;
+
+import com.model.pojo.RepEntity;
+import com.model.vo.configVo.ObjectInfo;
+import com.model.vo.configVo.StrategysInfo;
+import com.server.StrategysService;
+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.RestController;
+
+import java.util.List;
+
+@RestController
+public class StrategysController {
+    @Autowired
+    StrategysService strategysService;
+    /*
+   添加数据源策略
+    */
+    @RequestMapping("/addStrategys")
+    public RepEntity addStrategys(@RequestBody StrategysInfo body){
+        return strategysService.addStrategys(body);
+    }
+
+    /*
+    删除数据源策略
+     */
+    @RequestMapping("/delDbStrategys")
+    public RepEntity delDbStrategys(@RequestBody List<Integer> body){
+        return strategysService.delDbStrategys(body);
+    }
+
+    /*
+    删除图表策略
+     */
+    @RequestMapping("/delChartStrategys")
+    public RepEntity delChartStrategys(@RequestBody List<Integer> body){
+        return strategysService.delChartStrategys(body);
+    }
+
+    /*
+    更新数据源策略
+     */
+    @RequestMapping("/updateStrategys")
+    public RepEntity updateStrategys(@RequestBody StrategysInfo body){
+        return strategysService.updateStrategys(body);
+    }
+
+    /*
+    查询数据源策略
+     */
+    @RequestMapping("/getDbStrategys")
+    public RepEntity getDbStrategys(@RequestBody int body){
+        return strategysService.getDbStrategys(body);
+    }
+
+    /*
+    添加用户或用户组
+     */
+    @RequestMapping("/addObject")
+    public RepEntity addObject(@RequestBody ObjectInfo body){
+        return strategysService.addObject(body);
+    }
+
+    /*
+    删除对象
+     */
+//    @RequestMapping("/delObject")
+//    public RepEntity delObject(@RequestBody ObjectInfo body){
+//        return strategysService.delObject(body);
+//    }
+
+    /*
+    查询图表策略
+     */
+    @RequestMapping("/getChartStrategys")
+    public RepEntity getChartStrategys(@RequestBody int body){
+        return strategysService.getChartStrategys(body);
+    }
+}

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

@@ -33,6 +33,14 @@ public class UserController {
         return userService.getUserList();
     }
 
+    /*
+    查询匹配用户
+     */
+    @RequestMapping("/getNameList")
+    public RepEntity getNameList(@RequestBody String body){
+        return userService.getNameList(body);
+    }
+
     /*
     创建用户组
      */

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

@@ -52,11 +52,17 @@ public interface ChartsConfigMapper {
     @Select("select dc.db_config from bi_data_connectors dc left join bi_charts c on dc.id =c.bd_data_id where c.id=#{chartId}")
     String getBaseConifg(@Param("chartId") int id);
 
+    /*
+    通过ID查找数据源配置
+     */
+    @Select("select bd_data_id from bi_charts where id=#{chartId}")
+    int getBaseId(@Param("chartId") int id);
+
     /*
     通过ID查找数据库用户名
      */
-    @Select("select user_name from bi_databases where id = #{id}")
-    String getBaseUser(@Param("id") int id);
+    @Select("select table_name from bi_data_connectors where id = #{id}")
+    String getTableNameByBase(@Param("id") int id);
 
     /*
     更新图表配置
@@ -80,6 +86,12 @@ public interface ChartsConfigMapper {
             "</script>")
     void updateChartConfig(ChartConfig chartConfig);
 
+    /*
+    移交图表
+     */
+    @Update("update bi_charts set create_by = #{userId} where id = #{baseId}")
+    void changeChartOrder(@Param("userId") String userId, @Param("baseId") int baseId);
+
     /*
     更新图表分组
      */

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

@@ -1,6 +1,5 @@
 package com.dao;
 
-import com.model.po.BdStrategys;
 import com.model.po.DataConnector;
 import com.model.po.DataConnectorList;
 import com.model.po.Databases;
@@ -10,6 +9,7 @@ import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+
 @Mapper
 @Repository
 public interface DataConnectorMapper {
@@ -47,6 +47,12 @@ public interface DataConnectorMapper {
             " used_number as usedNumber, db_config as dbConfig ,BD_group as connectorGroup from bi_data_connectors")
     List<DataConnectorList> getDataConnectorList();
 
+    /*
+    转交数据源
+     */
+    @Update("updata bi_data_connectors set create_by = #{userId} where id = #{baseId}")
+    void updataOrder(@Param("userId") String userId, @Param("baseId") int baseId);
+
     /*
     插入数据源配置
      */
@@ -159,6 +165,12 @@ public interface DataConnectorMapper {
             " where id =#{id}")
     DataConnector getColumnData(int id);
 
+    /*
+    查询数据库配置
+     */
+    @Select("select db_config from bi_data_connectors where id = #{id}")
+    String getDbConfig(int id);
+
     /*
     创建数据源分组
      */
@@ -214,58 +226,9 @@ public interface DataConnectorMapper {
     List<GroupInfo> getConnectorGroup();
 
     /*
-    查询数据源是否关联图表
-     */
+   查询数据源是否关联图表
+    */
     @Select("select chart_name from bi_charts where bd_data_ID = #{id}")
     List<String> getChartsName(int id);
 
-     /*
-    保存数据源策略
-     */
-     @Insert("insert into bi_db_strategys(bs_id, bs_db_id, bs_rule, bs_name, createBy, create_date) values" +
-             "(#{id}, #{databaseId}, #{rule}, #{name}, #{createBy}, " +
-             "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_db_strategys_squence.nextval from dual",keyColumn = "bs_id")
-    void addStrategys(BdStrategys bdStrategys);
-
-     /*
-     更新数据源策略
-      */
-    @Update("<script>"+
-            "UPDATE bi_db_strategys set "+
-            "BS_DB_ID = #{datebaseId}" +
-            "<if test=\"rule != null\"> , BS_RULE = #{rule} </if>" +
-            "<if test=\"name != null\"> , BS_NAME = #{name} </if>" +
-            "<if test=\"createBy != null\"> , create_by = #{createBy} </if>" +
-            "<if test=\"isOpen != null\"> , IS_OPEN = #{isOpen} </if>" +
-            ",updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
-            " where bs_id = #{id}" +
-            "</script>")
-    void updataDbStrategys(BdStrategys bdStrategys);
-
-     /*
-     删除数据源策略
-      */
-     @Delete("<script>" +
-             "delete from bi_db_strategys where bs_id in" +
-             "(" +
-             "<foreach collection=\"list\" index=\"index\" item=\"item\"  separator=\",\">" +
-             "#{item, jdbcType = NUMERIC}" +
-             " </foreach>" +
-             ")" +
-             "</script>")
-    void delDbStrategys(List<Integer> idList);
-
-     /*
-     查询数据源Id
-      */
-     @Select("select bs_id as id where bs_id = #{id}")
-     List<Integer> getStrIdList();
-
-     /*
-    查询数据源策略
-     */
-     @Select(" select bs_id as id, bs_db_id as databaseId, bs_name as name, is_open as isOpen, bs_rule as rule, create_date as createDate,  " +
-             " updata_date as updataDate from bi_db_strategys where bs_id = #{id}")
-    List<BdStrategys> getDbStrategys();
 }

src/main/java/com/dao/StrategysBdMapper.java

@@ -0,0 +1,111 @@
+package com.dao;
+
+import com.model.po.Strategys;
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface StrategysBdMapper {
+
+    /*
+   保存数据源策略
+    */
+    @Insert("insert into bi_db_strategys(bs_id, bs_db_id, bs_rule,rule_str, bs_name, createBy, create_date) values" +
+            "(#{id}, #{tarId}, #{rule}, #{ruleStr}, #{name}, #{createBy}, " +
+            "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_db_strategys_squence.nextval from dual",keyColumn = "bs_id")
+    void addStrategys(Strategys strategys);
+
+    /*
+    更新数据源策略
+     */
+    @Update("<script>"+
+            "UPDATE bi_db_strategys set "+
+            "BS_DB_ID = #{tarId}" +
+            "<if test=\"rule != null\"> , BS_RULE = #{rule} </if>" +
+            "<if test=\"ruleStr != null\">, RULE_STR = #{ruleStr} </if> "+
+            "<if test=\"name != null\"> , BS_NAME = #{name} </if>" +
+            "<if test=\"createBy != null\"> , createBy = #{createBy} </if>" +
+            "<if test=\"isOpen != null\"> , IS_OPEN = #{isOpen} </if>" +
+            ",updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
+            " where bs_id = #{id}" +
+            "</script>")
+    void updataStrategys(Strategys strategys);
+
+    /*
+    删除数据源策略
+     */
+    @Delete("<script>" +
+            "delete from bi_db_strategys where bs_id in" +
+            "(" +
+            "<foreach collection=\"list\" index=\"index\" item=\"item\"  separator=\",\">" +
+            "#{item, jdbcType = NUMERIC}" +
+            " </foreach>" +
+            ")" +
+            "</script>")
+    void delStrategys(List<Integer> idList);
+
+    /*
+    查询数据源策略Id
+     */
+    @Select("select bs_id as id from bi_db_strategys where bs_db_id = #{id}")
+    List<Integer> getStrIdList(int id);
+
+    /*
+   查询数据源策略
+    */
+    @Select(" select bs_id as id, bs_db_id as tarId, bs_name as name, is_open as isOpen,rule_Str as ruleStr, create_date as createDate,  " +
+            " updata_date as updataDate from bi_db_strategys where bs_id = #{id}")
+    Strategys getStrategys(int id);
+
+    /*
+    查询数据源策略对象的类型
+     */
+    @Select("select bo_type from bi_db_object where bo_st_id = #{id}")
+    List<String> getStrategysType(int id);
+
+    /*
+    查询用户组id,name
+     */
+    @Select("select bg_id as id, bg_name as name from bi_user_groups, bi_db_object where bo_type = '0' " +
+            "and bo_ob_id = bg_id and bo_st_id = #{id} ")
+    List<Map<String, Object>> getUserGroupIdAndName(int id);
+
+    /*
+     查询用户组id,name
+      */
+    @Select("select bu_id as id, bu_name as name from bi_users, bi_db_object where bo_type = '1' " +
+            "and bo_ob_id = bu_id and bo_st_id = #{id} ")
+    List<Map<String, Object>> getUserIdAndName(int id);
+
+    /*
+    添加数据源策略对象
+     */
+    @Insert("insert into bi_db_object(bo_id, bo_st_id, bo_type, bo_ob_id) values" +
+            "(#{id}, #{stId}, #{objectType}, #{obId})")
+    @SelectKey(before=true,keyProperty="id",resultType=int.class,statement="SELECT bi_db_object_squence.nextval from dual",keyColumn = "bo_id")
+    void addObject(@Param("stId") int stId, @Param("objectType") String objectType, @Param("obId") int obId);
+
+
+    /*
+    删除对象
+     */
+    @Delete("delete from bi_db_object where bo_st_id = #{stId}")
+    void delObject(int stId);
+
+//    /*
+//    查询用户ID
+//     */
+//    @Select("select bu_id from bi_users where bu_name = #{name}")
+//    int getUserOrGroupId(String name);
+//
+//    /*
+//    修改修改对象
+//     */
+//    @Update("update bi_db_object set bo_type = #{type}, bo_ob_id = #{obId} where bo_type = '0' and bo_st_id = #{stId} and bo_ob_id = #{id}")
+//    void updateObject(ObjectInfo addObjectInfo, int id);
+}

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

@@ -0,0 +1,99 @@
+package com.dao;
+
+import com.model.po.Strategys;
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface StrategysChartMapper {
+
+    /*
+   保存数据源策略
+    */
+    @Insert("insert into bi_chart_strategys(bc_id, bc_chart_id, bc_rule, rule_str, bc_name, createBy, create_date) values" +
+            "(#{id}, #{tarId}, #{rule}, #{ruleStr}, #{name}, #{createBy}, " +
+            "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")
+    void addStrategys(Strategys strategys);
+
+    /*
+    更新数据源策略
+     */
+    @Update("<script>"+
+            "UPDATE bi_chart_strategys set "+
+            "bc_chart_id = #{tarId}" +
+            "<if test=\"rule != null\"> , BC_RULE = #{rule} </if>" +
+            "<if test=\"ruleStr != null\"> , rule_str = #{ruleStr} </if>" +
+            "<if test=\"name != null\"> , BC_NAME = #{name} </if>" +
+            "<if test=\"createBy != null\"> , createBy = #{createBy} </if>" +
+            "<if test=\"isOpen != null\"> , IS_OPEN = #{isOpen} </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 updataStrategys(Strategys strategys);
+
+    /*
+    删除图表策略
+     */
+    @Delete("<script>" +
+            "delete from bi_chart_strategys where bc_id in" +
+            "(" +
+            "<foreach collection=\"list\" index=\"index\" item=\"item\"  separator=\",\">" +
+            "#{item, jdbcType = NUMERIC}" +
+            " </foreach>" +
+            ")" +
+            "</script>")
+    void delStrategys(List<Integer> idList);
+
+    /*
+    查询数据源策略Id
+     */
+    @Select("select bc_id as id from bi_chart_strategys where bc_chart_id = #{id}")
+    List<Integer> getStrIdList(int id);
+
+    /*
+   查询数据源策略
+    */
+    @Select(" select bc_id as id, bc_chart_id as tarId, bc_name as name, is_open as isOpen, rule_Str as ruleStr, create_date as createDate,  " +
+            " updata_date as updataDate from bi_chart_strategys where bc_id = #{id}")
+    Strategys getStrategys(int id);
+
+    /*
+    查询数据源策略对象的类型
+     */
+    @Select("select bo_type from bi_chart_object where bo_st_id = #{id}")
+    List<String> getStrategysType(int id);
+
+    /*z
+    查询用户组id,name
+     */
+    @Select("select bg_name as name from bi_user_groups, bi_chart_object where bo_type = '0' " +
+            "and bo_ob_id = bg_id and bo_st_id = #{id} ")
+    List<Map<String, Object>> getUserGroupIdAndName(int id);
+
+    /*
+     查询用户组id,name
+      */
+    @Select("select bu_id as id, bu_name as name from bi_users, bi_chart_object where bo_type = '1' " +
+            "and bo_ob_id = bu_id and bo_st_id = #{id} ")
+    List<Map<String, Object>> getUserIdAndName(int id);
+
+    /*
+    添加数据源策略对象
+     */
+    @Insert("insert into bi_chart_object(bo_id, bo_st_id, bo_type, bo_ob_id) values" +
+            "(#{id}, #{stId}, #{objectType}, #{obId})")
+    @SelectKey(before=true,keyProperty="id",resultType=int.class,statement="SELECT bi_chart_object_squence.nextval from dual",keyColumn = "bo_id")
+    void addObject(@Param("stId") int stId, @Param("objectType") String objectType, @Param("obId") int obId);
+
+
+    /*
+    删除对象
+     */
+    @Delete("delete from bi_chart_object where bo_st_id = #{stId}")
+    void delObject(int stId);
+}

src/main/java/com/dao/UserMapper.java

@@ -28,6 +28,12 @@ public interface UserMapper {
             "from bi_users")
     List<User> getUserList();
 
+    /*
+    匹配用户20个
+     */
+    @Select("select * from bi_users where bu_name like ${value} and rownum<21")
+    List<String> getNameList(String value);
+
     /*
     更新token
      */

src/main/java/com/model/bo/Obj.java

@@ -0,0 +1,22 @@
+package com.model.bo;
+
+public class Obj {
+    private int obId;
+    private String objectType;
+
+    public int getObId() {
+        return obId;
+    }
+
+    public void setObId(int obId) {
+        this.obId = obId;
+    }
+
+    public String getObjectType() {
+        return objectType;
+    }
+
+    public void setObjectType(String objectType) {
+        this.objectType = objectType;
+    }
+}

src/main/java/com/model/bo/Screen.java

@@ -3,9 +3,27 @@ package com.model.bo;
 public class Screen {
     private String columnName;
     private String columnType;
+    private String columnLabel;
+    private String symbolLabel;
     private String symbol;
     private String value;
 
+    public String getColumnLabel() {
+        return columnLabel;
+    }
+
+    public void setColumnLabel(String columnLabel) {
+        this.columnLabel = columnLabel;
+    }
+
+    public String getSymbolLabel() {
+        return symbolLabel;
+    }
+
+    public void setSymbolLabel(String symbolLabel) {
+        this.symbolLabel = symbolLabel;
+    }
+
     public String getColumnName() {
         return columnName;
     }

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

@@ -1,33 +0,0 @@
-package com.model.po;
-
-import java.util.List;
-
-public class BdStrategysData {
-    private List<BdStrategys> bdStrategys;
-    private List<String> userGroupName;
-    private List<String> userName;
-
-    public List<BdStrategys> getBdStrategys() {
-        return bdStrategys;
-    }
-
-    public void setBdStrategys(List<BdStrategys> bdStrategys) {
-        this.bdStrategys = bdStrategys;
-    }
-
-    public List<String> getUserGroupName() {
-        return userGroupName;
-    }
-
-    public void setUserGroupName(List<String> userGroupName) {
-        this.userGroupName = userGroupName;
-    }
-
-    public List<String> getUserName() {
-        return userName;
-    }
-
-    public void setUserName(List<String> userName) {
-        this.userName = userName;
-    }
-}

src/main/java/com/model/po/BdStrategys.java → src/main/java/com/model/po/Strategys.java

@@ -2,16 +2,25 @@ package com.model.po;
 
 import java.util.Date;
 
-public class BdStrategys {
+public class Strategys {
     private int id;
-    private int databaseId;
+    private int tarId;
     private String name;
     private String rule;
+    private String ruleStr;
     private String isOpen;
     private String createBy;
     private Date createDate;
     private Date updataDate;
 
+    public String getRuleStr() {
+        return ruleStr;
+    }
+
+    public void setRuleStr(String ruleStr) {
+        this.ruleStr = ruleStr;
+    }
+
     public int getId() {
         return id;
     }
@@ -20,12 +29,12 @@ public class BdStrategys {
         this.id = id;
     }
 
-    public int getDatabaseId() {
-        return databaseId;
+    public int getTarId() {
+        return tarId;
     }
 
-    public void setDatabaseId(int databaseId) {
-        this.databaseId = databaseId;
+    public void setTarId(int tarId) {
+        this.tarId = tarId;
     }
 
     public String getName() {

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

@@ -0,0 +1,44 @@
+package com.model.po;
+
+import java.util.List;
+import java.util.Map;
+
+public class StrategysData {
+    private Strategys strategies;
+    private List<Map<String, Object>> userGroupName;
+    private List<Map<String, Object>> userName;
+
+    public Strategys getStrategies() {
+        return strategies;
+    }
+
+    public void setStrategies(Strategys strategies) {
+        this.strategies = strategies;
+    }
+
+    public List<Map<String, Object>> getUserGroupName() {
+        return userGroupName;
+    }
+
+    public void setUserGroupName(List<Map<String, Object>> userGroupName) {
+        this.userGroupName = userGroupName;
+    }
+
+    public List<Map<String, Object>> getUserName() {
+        return userName;
+    }
+
+    public void setUserName(List<Map<String, Object>> userName) {
+        this.userName = userName;
+    }
+
+    @Override
+    public String toString() {
+        return "StrategysData{" +
+                "strategies=" + strategies +
+                ", userGroupName=" + userGroupName +
+                ", userName=" + userName +
+                '}';
+    }
+}
+

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

@@ -0,0 +1,22 @@
+package com.model.vo.configVo;
+
+public class ChangeOrderInfo {
+    private int userId;
+    private int id;
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+}

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

@@ -23,7 +23,6 @@ public class ChartConfigInfo {
     private String filters;          //筛选
     private String chartOption;      //列表缩略图数据
 
-
     public int getChartsGroup() {
         return chartsGroup;
     }

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

@@ -18,6 +18,7 @@ public class DataConnectorInfo<T> {
     private int connectorGroup;
     private String createBy;
 
+
     public int getDataId() {
         return dataId;
     }

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

@@ -0,0 +1,35 @@
+package com.model.vo.configVo;
+
+import com.model.bo.Obj;
+
+import java.util.List;
+
+public class ObjectInfo {
+    private int stId;
+    private String type;
+    private List<Obj> obj;
+
+    public int getStId() {
+        return stId;
+    }
+
+    public void setStId(int stId) {
+        this.stId = stId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public List<Obj> getObj() {
+        return obj;
+    }
+
+    public void setObj(List<Obj> obj) {
+        this.obj = obj;
+    }
+}

src/main/java/com/model/vo/configVo/BdStrategysInfo.java → src/main/java/com/model/vo/configVo/StrategysInfo.java

@@ -4,14 +4,23 @@ import com.model.bo.Screen;
 
 import java.util.List;
 
-public class BdStrategysInfo {
+public class StrategysInfo {
     private int id;
-    private int databaseId;
+    private String type;
+    private int tarId;
     private String name;
     private List<Screen> rule;
     private String isOpen;
     private String createBy;
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public String getIsOpen() {
         return isOpen;
     }
@@ -36,12 +45,12 @@ public class BdStrategysInfo {
         this.id = id;
     }
 
-    public int getDatabaseId() {
-        return databaseId;
+    public int getTarId() {
+        return tarId;
     }
 
-    public void setDatabaseId(int databaseId) {
-        this.databaseId = databaseId;
+    public void setTarId(int tarId) {
+        this.tarId = tarId;
     }
 
     public String getName() {
@@ -59,4 +68,5 @@ public class BdStrategysInfo {
     public void setRule(List<Screen> rule) {
         this.rule = rule;
     }
+
 }

src/main/java/com/server/ChartsConfigService.java

@@ -7,6 +7,7 @@ import com.model.bo.GroupUpdateId;
 import com.model.po.ChartConfig;
 import com.model.pojo.RepCode;
 import com.model.pojo.RepEntity;
+import com.model.vo.configVo.ChangeOrderInfo;
 import com.model.vo.configVo.ChartConfigInfo;
 import com.model.vo.configVo.GroupInfo;
 import com.util.TimeUtil;
@@ -26,6 +27,8 @@ public class ChartsConfigService {
     ChartsConfigMapper chartsConfigMapper;
     @Autowired
     ObjectMapper objectmapper;
+    @Autowired
+    StrategysService strategysService;
 
 
     /*
@@ -147,6 +150,16 @@ public class ChartsConfigService {
         return new RepEntity(RepCode.success);
     }
 
+    /*
+    移交图表
+     */
+    public RepEntity changeChartOrder(ChangeOrderInfo changeOrderInfo){
+        String userId = String.valueOf(changeOrderInfo.getUserId());
+        int baseId = changeOrderInfo.getId();
+        chartsConfigMapper.changeChartOrder(userId, baseId);
+        return new RepEntity(RepCode.success);
+    }
+
     /*
     更新图表配置的分组
      */

src/main/java/com/server/ColumnScreenService.java

@@ -54,4 +54,41 @@ public class ColumnScreenService {
         }
         return new RepEntity(RepCode.success, data);
     }
+
+    /*
+    通过数据源ID获取列的值
+     */
+    public RepEntity getScreenByBaseId(ColumnScreenInfo columnScreenInfo){
+        //取表名
+        int connectId = columnScreenInfo.getId();
+        String tableName = chartsConfigMapper.getTableNameByBase(connectId);
+        if (tableName == null || "".equals(tableName)){
+            return new RepEntity(RepCode.nullTableName);
+        }else {
+            tableName = "(" + tableName +")";
+        }
+
+        List<Object> data = new ArrayList<>();
+
+        int baseId =  getChartsDataUtilService.getBaseIdByConnect(connectId);
+        System.out.println("切换数据库"+String.valueOf(baseId));
+
+        try{
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+                //joinPoint.getSignature() ：获取连接点的方法签名对象
+                System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+            } else {
+                System.out.println("使用数据源：" + String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+            }
+            data =  showChartsMapper.getScreenData(columnScreenInfo.getColumnName(), tableName);
+        }catch (Exception e){
+            e.printStackTrace();
+            System.out.println("异常");
+            return new RepEntity(RepCode.erro);
+        }finally {
+            DynamicDataSourceContextHolder.clearDataSourceType();
+        }
+        return new RepEntity(RepCode.success, data);
+    }
 }

src/main/java/com/server/DataBasesService.java

@@ -33,6 +33,8 @@ public class DataBasesService {
     ObjectMapper objectMapper;
     @Autowired
     private DynamicDataSourceRegister dataSourceRegister;
+    @Autowired
+    GetChartsDataUtilService getChartsDataUtilService;
     /*
    保存数据库连接
     */
@@ -146,8 +148,49 @@ public class DataBasesService {
         return new RepEntity(RepCode.success,toShows);
     }
 
-    private void addDataSource(DatabasesInfo databasesInfo) {
+    /*
+    查询列数据通过图表ID
+     */
+    public RepEntity getColumnByChartId(int id){
+        DataConnector dataConnector = new DataConnector();
+        int ConnectId = getChartsDataUtilService.getConnectId(id);
+        System.out.println("baseId："+ConnectId);
+        dataConnector = dataConnectorMapper.getColumnData(ConnectId);
+        if (dataConnector == null || "".equals(dataConnector)){
+            return new RepEntity(RepCode.Null);
+        }
+        String columnData = dataConnector.getColumnConfig();
+
+        List<ColumnRenameInfo> configList = new ArrayList<>();
+        if (columnData != null || (!"".equals(columnData))){
+            try {
+                CollectionType javaType = objectMapper.getTypeFactory().constructCollectionType(ArrayList.class, ColumnRenameInfo.class);
+                configList =  objectMapper.readValue(columnData, javaType);   //这里不需要强制转换
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        List<ColumnToShow> toShows = new ArrayList<>();
+
 
+        for (int i = 0; i < configList.size(); i++ ){
+            ColumnRenameInfo columnRenameInfo = new ColumnRenameInfo();
+            ColumnToShow columnToShow = new ColumnToShow();
+            columnRenameInfo = configList.get(i);
+            if ("1".equals(columnRenameInfo.getIsOpen())) {
+                columnToShow.setColumnName(columnRenameInfo.getColumnName());
+                columnToShow.setColumnRaname(columnRenameInfo.getColumnLable());
+                columnToShow.setColumnType(columnRenameInfo.getColumnType());
+                columnToShow.setIsGroup(columnRenameInfo.getIsGroup());
+                columnToShow.setIsSubsection(columnRenameInfo.getIsSubsection());
+                toShows.add(columnToShow);
+            }
+        }
+        return new RepEntity(RepCode.success,toShows);
+    }
+
+    //添加数据源
+    private void addDataSource(DatabasesInfo databasesInfo) {
         //额外的数据源
         Map<String, Object> dsMap = new HashMap<>();
         dsMap.put("driver", "oracle.jdbc.driver.OracleDriver");

src/main/java/com/server/DataConnectorService.java

@@ -6,12 +6,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.model.bo.DatabaseConfig;
 import com.model.bo.GroupUpdateId;
 import com.model.po.BaseConfig;
-import com.model.po.BdStrategys;
 import com.model.po.DataConnector;
 import com.model.po.DataConnectorList;
 import com.model.pojo.RepCode;
 import com.model.pojo.RepEntity;
-import com.model.vo.configVo.BdStrategysInfo;
+import com.model.vo.configVo.ChangeOrderInfo;
 import com.model.vo.configVo.ColumnRenameInfo;
 import com.model.vo.configVo.DataConnectorInfo;
 import com.model.vo.configVo.GroupInfo;
@@ -43,6 +42,8 @@ public class DataConnectorService {
 
     @Autowired
     ScreenUtil screenUtil;
+    @Autowired
+    StrategysService strategysService;
 
     /*
     保存数据源
@@ -136,6 +137,7 @@ public class DataConnectorService {
             dataConnectorList.setDbConfig(dbConfig);
             listConnectors.add(dataConnectorList);
         }
+
         return new RepEntity(RepCode.success, listConnectors);
     }
 
@@ -222,6 +224,16 @@ public class DataConnectorService {
         return new RepEntity(RepCode.success);
     }
 
+    /*
+    转交数据源
+     */
+    public RepEntity changeOrder(ChangeOrderInfo changeOrderInfo){
+        String userId = String.valueOf(changeOrderInfo.getUserId());
+        int baseId = changeOrderInfo.getId();
+        dataConnectorMapper.updataOrder(userId, baseId);
+        return new RepEntity(RepCode.success);
+    }
+
     /*
     更新数据源分组
      */
@@ -311,52 +323,4 @@ public class DataConnectorService {
         return new RepEntity(RepCode.success, dataConnectorMapper.getConnectorGroup());
     }
 
-    /*
-    保存数据源策略
-     */
-    public RepEntity addDbStrategys(BdStrategysInfo bdStrategysInfo){
-        BdStrategys bdStrategys = new BdStrategys();
-        BeanUtils.copyProperties(bdStrategysInfo, bdStrategys);
-        String scr = screenUtil.screensUtil(bdStrategysInfo.getRule(), "", "").getRet();
-        bdStrategys.setRule(scr);
-        dataConnectorMapper.addStrategys(bdStrategys);
-        return new RepEntity(RepCode.success, bdStrategys.getId());
-    }
-
-    /*
-    更新数据源策略
-     */
-    public RepEntity updateDbStrategys(BdStrategysInfo bdStrategysInfo){
-        BdStrategys bdStrategys = new BdStrategys();
-        BeanUtils.copyProperties(bdStrategysInfo, bdStrategys);
-        String scr = screenUtil.screensUtil(bdStrategysInfo.getRule(), "", "").getRet();
-        bdStrategys.setRule(scr);
-        dataConnectorMapper.addStrategys(bdStrategys);
-        return new RepEntity(RepCode.success);
-    }
-
-    /*
-    删除数据源策略
-     */
-    public RepEntity delDbStrategys(List<Integer> idList){
-        dataConnectorMapper.delDbStrategys(idList);
-        return new RepEntity(RepCode.success);
-    }
-
-    /*
-    查询数据源策略列表
-     */
-    public RepEntity getDbStrategys(){
-        List<BdStrategys> bdStrategys = new ArrayList<>();
-        /*
-        获取id列表
-         */
-        List<Integer> idList = dataConnectorMapper.getStrIdList();
-        Iterator isList = idList.iterator();
-        while (isList.hasNext()){
-            int id = (int) isList.next();
-            bdStrategys =  dataConnectorMapper.getDbStrategys();
-        }
-        return new RepEntity(RepCode.success);
-    }
 }

src/main/java/com/server/GetChartsDataUtilService.java

@@ -1,6 +1,7 @@
 package com.server;
 
 import com.dao.ChartsConfigMapper;
+import com.dao.DataConnectorMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.model.po.Databases;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +15,13 @@ public class GetChartsDataUtilService {
     ChartsConfigMapper chartsConfigMapper;
     @Autowired
     ObjectMapper objectMapper;
+    @Autowired
+    DataConnectorMapper dataConnectorMapper;
+
 
+    /*
+    通过图表ID获取数据库连接ID
+     */
     public int getBaseId(int id){
 
         //取数据源ID
@@ -31,4 +38,33 @@ public class GetChartsDataUtilService {
 
         return baseId;
     }
+
+    /*
+    通过数据源ID获取数据库连接ID
+     */
+    public int getBaseIdByConnect(int id){
+
+        //取数据源ID
+        String dataConfig = dataConnectorMapper.getDbConfig(id);
+
+        //取数据连接名的数据库名
+        Databases databases = new Databases();
+        try {
+            databases = objectMapper.readValue(dataConfig, Databases.class);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        int baseId = databases.getId();
+
+        return baseId;
+    }
+
+    //取数据源Id
+    public int getConnectId(int id){
+
+        //取数据源ID
+        int ConnectId = chartsConfigMapper.getBaseId(id);
+
+        return ConnectId;
+    }
 }

src/main/java/com/server/StrategysService.java

@@ -0,0 +1,203 @@
+package com.server;
+
+import com.dao.StrategysBdMapper;
+import com.dao.StrategysChartMapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.model.bo.Obj;
+import com.model.po.Strategys;
+import com.model.po.StrategysData;
+import com.model.pojo.RepCode;
+import com.model.pojo.RepEntity;
+import com.model.vo.configVo.ObjectInfo;
+import com.model.vo.configVo.StrategysInfo;
+import com.util.ScreenUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service
+public class StrategysService {
+    @Autowired
+    ScreenUtil screenUtil;
+    @Autowired
+    StrategysBdMapper strategysBdMapper;
+    @Autowired
+    StrategysChartMapper strategysChartMapper;
+    @Autowired
+    ObjectMapper objectMapper;
+    /*
+   保存数据源策略
+    */
+    public RepEntity addStrategys(StrategysInfo strategysInfo){
+        Strategys strategys = new Strategys();
+        BeanUtils.copyProperties(strategysInfo, strategys);
+        String scr = screenUtil.screensUtil(strategysInfo.getRule(), "", "").getRet();
+        strategys.setRule(scr);
+        strategys.setRuleStr(String.valueOf(strategysInfo.getRule()));
+
+        String type = strategysInfo.getType();
+        if ("base".equals(type)){
+            strategysBdMapper.addStrategys(strategys);
+        }else {
+            strategysChartMapper.addStrategys(strategys);
+        }
+
+        return new RepEntity(RepCode.success, strategys.getId());
+    }
+
+    /*
+    更新数据源策略
+     */
+    public RepEntity updateStrategys(StrategysInfo strategysInfo){
+        Strategys strategys = new Strategys();
+        BeanUtils.copyProperties(strategysInfo, strategys);
+        String scr = screenUtil.screensUtil(strategysInfo.getRule(), "", "").getRet();
+        strategys.setRule(scr);
+        String ruleStr = null;
+        try {
+            ruleStr = objectMapper.writeValueAsString(strategysInfo.getRule());
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        strategys.setRuleStr(ruleStr);
+        String type = strategysInfo.getType();
+        if ("base".equals(type)) {
+            strategysBdMapper.updataStrategys(strategys);
+        }else {
+            strategysChartMapper.updataStrategys(strategys);
+        }
+        return new RepEntity(RepCode.success);
+    }
+
+    /*
+    删除数据源策略
+     */
+    public RepEntity delDbStrategys(List<Integer> idList){
+        strategysBdMapper.delStrategys(idList);
+        Iterator isList = idList.iterator();
+        while (isList.hasNext()){
+            int id = (int) isList.next();
+            strategysBdMapper.delObject(id);
+        }
+        return new RepEntity(RepCode.success);
+    }
+
+    /*
+    删除图表策略
+     */
+    public RepEntity delChartStrategys(List<Integer> idList){
+        strategysChartMapper.delStrategys(idList);
+        Iterator isList = idList.iterator();
+        while (isList.hasNext()){
+            int id = (int) isList.next();
+            strategysChartMapper.delObject(id);
+        }
+        return new RepEntity(RepCode.success);
+    }
+
+    /*
+    查询数据源策略列表
+     */
+    public RepEntity getDbStrategys(int DbId){
+
+        List<StrategysData> strategysDataList = new ArrayList<>();
+        /*
+        获取id列表
+         */
+        List<Integer> idList = strategysBdMapper.getStrIdList(DbId);
+        Iterator isList = idList.iterator();
+        while (isList.hasNext()) {
+            int id = (int) isList.next();
+            List<Map<String, Object>> userGroupNameList = new ArrayList<>();
+            List<Map<String, Object>> userNameList = new ArrayList<>();
+            StrategysData strategysDatas = new StrategysData();
+
+            Strategys strategys = strategysBdMapper.getStrategys(id);  //策略的基本信息
+            List<String> types = strategysBdMapper.getStrategysType(id);
+            Iterator isTypeList = types.iterator();
+            while (isTypeList.hasNext()) {
+                String type = (String) isTypeList.next();
+                if ("0".equals(type)) {
+                    userGroupNameList = strategysBdMapper.getUserGroupIdAndName(id);
+                    System.out.println("userG:" + userGroupNameList);
+                } else {
+                    userNameList = strategysBdMapper.getUserIdAndName(id);
+                    System.out.println("user" + userNameList);
+                }
+            }
+            strategysDatas.setStrategies(strategys);
+            strategysDatas.setUserGroupName(userGroupNameList);
+            strategysDatas.setUserName(userNameList);
+            strategysDataList.add(strategysDatas);
+            System.out.println("strate:" + strategysDataList);
+        }
+        return new RepEntity(RepCode.success, strategysDataList);
+    }
+
+    /*
+    添加用户或用户组
+     */
+    public RepEntity addObject(ObjectInfo objectInfo){
+        String type = objectInfo.getType();
+        int stId = objectInfo.getStId();
+        if ("base".equals(type)){
+            strategysBdMapper.delObject(stId);
+        }else {
+            strategysChartMapper.delObject(stId);
+        }
+        List objs = objectInfo.getObj();
+        Iterator isObj = objs.iterator();
+        while (isObj.hasNext()) {
+            Obj obj = (Obj) isObj.next();
+            String obType = obj.getObjectType();
+            int obId = obj.getObId();
+            System.out.println("obId:" + obId);
+            if ("base".equals(type)) {
+                strategysBdMapper.addObject(stId, obType, obId);
+            } else {
+                strategysChartMapper.addObject(stId, obType, obId);
+            }
+        }
+        return new RepEntity(RepCode.success);
+    }
+
+
+    /*
+    查询图表策略列表
+     */
+    public RepEntity getChartStrategys(int chartId){
+        System.out.println(",,,");
+        List<StrategysData> strategysDataList = new ArrayList<>();
+        /*
+        获取id列表
+         */
+        List<Integer> idList = strategysChartMapper.getStrIdList(chartId);
+        Iterator isList = idList.iterator();
+        while (isList.hasNext()) {
+            int id = (int) isList.next();
+            List<Map<String, Object>> userGroupNameList = new ArrayList<>();
+            List<Map<String, Object>> userNameList = new ArrayList<>();
+            StrategysData strategysDatas = new StrategysData();
+
+            Strategys strategys = strategysChartMapper.getStrategys(id);  //策略的基本信息
+            List<String> types = strategysChartMapper.getStrategysType(id);
+            Iterator isTypeList = types.iterator();
+            while (isTypeList.hasNext()) {
+                String type = (String) isTypeList.next();
+                if ("0".equals(type)) {
+                    userGroupNameList = strategysChartMapper.getUserGroupIdAndName(id);
+                } else {
+                    userNameList = strategysChartMapper.getUserIdAndName(id);
+                }
+            }
+            strategysDatas.setStrategies(strategys);
+            strategysDatas.setUserGroupName(userGroupNameList);
+            strategysDatas.setUserName(userNameList);
+            strategysDataList.add(strategysDatas);
+        }
+        return new RepEntity(RepCode.success, strategysDataList);
+    }
+}

src/main/java/com/server/UserService.java

@@ -50,6 +50,14 @@ public class UserService {
         return new RepEntity(RepCode.success, userList);
     }
 
+    /*
+    查询匹配用户
+     */
+    public RepEntity getNameList(String value){
+        List<String> userName = userMapper.getNameList(value);
+        return new RepEntity(RepCode.success, userName);
+    }
+
 
     /*
     创建用户组