1.添加了查看分发对象返回ID

2.修改了删除数据源的逻辑
3.添加了部分错误返回信息
4.添加了服务器环境配置

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

@@ -38,7 +38,7 @@ public class ShowChartsController {
     @CheckToken
     @RequestMapping("/showHistogram")
     public RepEntity showHistogram(@RequestHeader String token,@RequestBody HistogramConfigInfo body){
-        return showHistogramService.showHistogram(body, token);
+        return showHistogramService.showHistogram(body, token, 0);
     }
 
     /*
@@ -47,7 +47,7 @@ public class ShowChartsController {
     @CheckToken
     @RequestMapping("/showPie")
     public RepEntity showPie(@RequestHeader String token,@RequestBody PieConfigInfo body){
-        return showPieService.showPie(body, token);
+        return showPieService.showPie(body, token, 0);
     }
 
     /*
@@ -56,7 +56,7 @@ public class ShowChartsController {
     @CheckToken
     @RequestMapping("/showLine")
     public RepEntity showLine(@RequestHeader String token,@RequestBody LineConfigInfo body){
-        return showLineService.showLine(body, token);
+        return showLineService.showLine(body, token, 0);
     }
 
     /*
@@ -65,7 +65,7 @@ public class ShowChartsController {
     @CheckToken
     @RequestMapping("/showScatter")
     public RepEntity showScatter(@RequestHeader String token,@RequestBody ScatterConfigInfo body){
-        return showScatterService.showScatter(body, token);
+        return showScatterService.showScatter(body, token, 0);
     }
 
     /*
@@ -74,7 +74,7 @@ public class ShowChartsController {
     @CheckToken
     @RequestMapping("/showIndividual")
     public RepEntity showIndividual(@RequestHeader String token,@RequestBody IndividualConfigInfo body){
-        return showIndividualService.showIndividual(body, token);
+        return showIndividualService.showIndividual(body, token, 0);
     }
 
     /*
@@ -83,7 +83,7 @@ public class ShowChartsController {
     @CheckToken
     @RequestMapping("/showPopulation")
     public RepEntity showPopulation(@RequestHeader String token,@RequestBody PopulationInfo body) throws SQLException {
-        return showPopulationService.showPopulation(body, token);
+        return showPopulationService.showPopulation(body, token, 0);
     }
 
     /*

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

@@ -1,8 +1,8 @@
 package com.controller.dashboard;
 
-import com.model.pojo.annotation.CheckToken;
 import com.model.pojo.RepEntity;
 import com.model.pojo.TestPage;
+import com.model.pojo.annotation.CheckToken;
 import com.model.vo.configVo.ChangeOrderInfo;
 import com.model.vo.configVo.ChartsToDashInfo;
 import com.model.vo.configVo.DashboardsInfo;
@@ -71,11 +71,21 @@ public class DashboardsController {
     /*
     转交看板
      */
+    @CheckToken
     @RequestMapping("/changeDashOrder")
     public RepEntity changeDashOrder(@RequestHeader String token,@RequestBody ChangeOrderInfo body){
         return dashboardsService.changeDashOrder(token, body);
     }
 
+    /*
+    查看看板分发列表
+     */
+    @CheckToken
+    @RequestMapping("/getDashOrder")
+    public RepEntity getDashOrder(@RequestHeader String token,@RequestBody int body){
+        return dashboardsService.getDashOrder(token, body);
+    }
+
     /*
     看板生成图表
      */

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

@@ -1,11 +1,11 @@
 package com.controller.user;
 
+import com.config.RoleInterceptor.Auth;
 import com.model.pojo.RepEntity;
 import com.model.vo.configVo.LoginInfo;
 import com.model.vo.configVo.UserGroupInfo;
 import com.model.vo.configVo.UserGroupSetInfo;
 import com.server.user.UserService;
-import com.config.RoleInterceptor.Auth;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,6 +24,8 @@ public class UserController {
      */
     @RequestMapping("/login")
     public RepEntity login(@RequestBody LoginInfo body){
+//        String url = "http://10.1.1.168:8099/ERP/common/login.action?username=u0783&password=1111qqqq&language=undefined&sob=N_USOFTSYS";
+
         return userService.login(body);
     }
 

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

@@ -42,6 +42,9 @@ public interface ChartsConfigMapper {
             "             where bc.id = #{id}")
     ChartConfig getOneChart(int id);
 
+    @Select("select DATA_NAME as name from BI_DATA_CONNECTORS where id = #{id}")
+    String getDataNameById(int id);
+
     /*
     查看图表列表
      */
@@ -92,7 +95,7 @@ public interface ChartsConfigMapper {
             "            or bo2.bo_type = '1' and bo2.bo_ob_id = bc.CREATE_ID" +
             "        )" +
             "    ) = 0 then '0'" +
-            "    else null end authority, bc.id as chartId, bc.chart_name as chartName, bc.chart_type as chartType, bc.create_by as createBy, bc.create_date as createDate" +
+            "    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  " +
             "     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 (" +

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

@@ -1,5 +1,6 @@
 package com.dao.dashboard;
 
+import com.model.bo.DashOrder;
 import com.model.po.Dashboards;
 import com.model.pojo.TestPage;
 import org.apache.ibatis.annotations.*;
@@ -76,6 +77,24 @@ public interface DashboardsMapper {
     @Update("update BI_DASHBOARDS set create_by = #{createBy}, create_id = #{createId} where id = #{id}")
     void changeDashOrder(@Param("createBy") String createBy, @Param("createId") int createId, @Param("id") int id);
 
+    /*
+    查看看板分发对象类型
+     */
+    @Select("select bo_type from bi_dashboards_object where bo_da_id = #{id}")
+    List<String> getType(int id);
+
+    /*
+    查看看板分发用户
+     */
+    @Select("select bo_ob_id as id, BG_NAME as name from BI_USER_GROUPS left join BI_DASHBOARDS_OBJECT on bo_ob_id = bg_id where bo_type = '0' and bo_da_id = #{id}")
+    List<DashOrder> getOrderGroupName(int id);
+
+    /*
+    查看看板分发用户
+     */
+    @Select("select bo_ob_id as id, BU_NAME as name from bi_users left join BI_DASHBOARDS_OBJECT on bo_ob_id = bu_id where bo_type = '1' and bo_da_id = #{id}")
+    List<DashOrder> getOrderName(int id);
+
     /*
     添加看板对象
      */

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

@@ -1,11 +1,11 @@
 package com.dao.strategy;
 
+import com.model.bo.DashOrder;
 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
@@ -73,14 +73,14 @@ public interface StrategysBdMapper {
      */
     @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);
+    List<DashOrder> 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);
+    List<DashOrder> getUserIdAndName(int id);
 
     /*
     添加数据源策略对象

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

@@ -1,11 +1,11 @@
 package com.dao.strategy;
 
+import com.model.bo.DashOrder;
 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
@@ -63,7 +63,7 @@ public interface StrategysChartMapper {
     Strategys getStrategys(int id);
 
     /*
-    查询数据源策略对象的类型
+    查询图表策略对象的类型
      */
     @Select("select bo_type from bi_chart_object where bo_st_id = #{id}")
     List<String> getStrategysType(int id);
@@ -71,16 +71,16 @@ public interface StrategysChartMapper {
     /*z
     查询用户组id,name
      */
-    @Select("select bg_name as name from bi_user_groups, bi_chart_object where bo_type = '0' " +
+    @Select("select bg_id as id，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);
+    List<DashOrder> getUserGroupIdAndName(int id);
 
     /*
-     查询用户组id,name
+     查询用户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);
+    List<DashOrder> getUserIdAndName(int id);
 
     /*
     添加数据源策略对象

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

@@ -0,0 +1,22 @@
+package com.model.bo;
+
+public class DashOrder {
+    private int id;
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -18,6 +18,15 @@ public class ChartConfigList {
     private String filters;
     private int row_id;
     private Date reDate;
+    private String dbStatus;
+
+    public String getDbStatus() {
+        return dbStatus;
+    }
+
+    public void setDbStatus(String dbStatus) {
+        this.dbStatus = dbStatus;
+    }
 
     public Date getReDate() {
         return reDate;

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

@@ -1,12 +1,13 @@
 package com.model.po;
 
+import com.model.bo.DashOrder;
+
 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;
+    private List<DashOrder> userGroupName;
+    private List<DashOrder> userName;
 
     public Strategys getStrategies() {
         return strategies;
@@ -16,19 +17,19 @@ public class StrategysData {
         this.strategies = strategies;
     }
 
-    public List<Map<String, Object>> getUserGroupName() {
+    public List<DashOrder> getUserGroupName() {
         return userGroupName;
     }
 
-    public void setUserGroupName(List<Map<String, Object>> userGroupName) {
+    public void setUserGroupName(List<DashOrder> userGroupName) {
         this.userGroupName = userGroupName;
     }
 
-    public List<Map<String, Object>> getUserName() {
+    public List<DashOrder> getUserName() {
         return userName;
     }
 
-    public void setUserName(List<Map<String, Object>> userName) {
+    public void setUserName(List<DashOrder> userName) {
         this.userName = userName;
     }
 

src/main/java/com/model/pojo/RepCode.java

@@ -16,7 +16,11 @@ public enum  RepCode {
     NoAuthority(-503, "无此权限"),
     ToMach(1, "数据过大"),
     UserIn(-504, "用户已存在"),
-    SqlWarn(-506, "只能使用查询语句");
+    SqlWarn(-506, "只能使用查询语句"),
+    DataSourceNull(-507, "数据源切换失败"),
+    ChartNonExistent(-508, "图表不存在"),
+    DataNonExistent(-509, "数据源不存在"),
+    DashboardNonExistent(-510, "看板不存在");
 
     private int code;
     private String msg;

src/main/java/com/model/vo/dataVo/DashboardOrderInfo.java

@@ -0,0 +1,26 @@
+package com.model.vo.dataVo;
+
+import com.model.bo.DashOrder;
+
+import java.util.List;
+
+public class DashboardOrderInfo {
+    private List<DashOrder> userNames;
+    private List<DashOrder>  groupNames;
+
+    public List<DashOrder> getUserNames() {
+        return userNames;
+    }
+
+    public void setUserNames(List<DashOrder> userNames) {
+        this.userNames = userNames;
+    }
+
+    public List<DashOrder> getGroupNames() {
+        return groupNames;
+    }
+
+    public void setGroupNames(List<DashOrder> groupNames) {
+        this.groupNames = groupNames;
+    }
+}

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

@@ -202,10 +202,15 @@ public class ChartsConfigService {
     查询单个图表配置
      */
     public RepEntity getOneCharts(int id){
-        if (id == 0){
+        ChartConfig chartConfig = chartsConfigMapper.getOneChart(id);
+        if (chartConfig == null){
             return new RepEntity(RepCode.Null);
         }
-        return new RepEntity(RepCode.success,chartsConfigMapper.getOneChart(id));
+        String name = chartsConfigMapper.getDataNameById(chartConfig.getDataId());
+        if (name == null){
+            return new RepEntity(RepCode.DataNonExistent);
+        }
+        return new RepEntity(RepCode.success, chartConfig);
     }
 
     /*

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

@@ -31,7 +31,7 @@ public class ChartsUtilService {
     @Autowired
     RecordMapper recordMapper;
 
-    public String getSqlStr(String token, int id) {
+    public String getSqlStr(String token, int id, int dashId) {
         Map<String, String> resultMap = getTokenData.getTokenData(token);
         int userId = Integer.parseInt(resultMap.get("id"));
         int createID;
@@ -45,18 +45,22 @@ public class ChartsUtilService {
         String tableName = chartsConfigMapper.getTableName(id);
         System.out.println("table:"+tableName);
         System.out.println("userId:" + userId + ", createID:" + createID + "");
-        if (userId == createID) {
-            //如果数据源创建人ID跟用户ID一样，获得数据源全部权限
-            if (tableName == null || "".equals(tableName)) {
-                return "";
+        if (dashId == 0) {
+            if (userId == createID) {
+                //如果数据源创建人ID跟用户ID一样，获得数据源全部权限
+                if (tableName == null || "".equals(tableName)) {
+                    return "";
+                } else {
+                    return columnNameUtil(userId, baseId, tableName, true, id, -1);
+                }
             } else {
-                return columnNameUtil(userId, baseId, tableName, true, id, -1);
+                //先拿图表创建者权限，在取分发权限
+                System.out.println("你他妈的去哪里了");
+                String sql = columnNameUtil(createID, baseId, tableName, true, id, -1);
+                return columnNameUtil(userId, baseId, sql, false, id, -1);
             }
-        } else {
-            //先拿图表创建者权限，在取分发权限
-            System.out.println("你他妈的去哪里了");
-            String sql = columnNameUtil(createID, baseId, tableName, true, id, -1);
-            return columnNameUtil(userId, baseId, sql, false, id, -1);
+        }else {
+            return columnNameUtil(createID, baseId, tableName, true, id, -1);
         }
     }
 

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

@@ -89,7 +89,7 @@ public class GetChartsDataUtilService {
     public RepEntity getChartsData(String token, ShowDataChartInfo showDataChartInfo){
         int chartsId = showDataChartInfo.getChartId();
         //取表名;
-        String tableName = chartsUtilService.getSqlStr(token, chartsId);
+        String tableName = chartsUtilService.getSqlStr(token, chartsId, 0);
         if ("".equals(tableName)){
             return new RepEntity(RepCode.NoAuthority);
         }
@@ -100,7 +100,7 @@ public class GetChartsDataUtilService {
         ColumnValuesInfo columnValuesInfo = new ColumnValuesInfo();
 
         String columnConfig = chartsConfigMapper.getConfigByChartId(chartsId);
-        String sql = chartsUtilService.getSqlStr(token, chartsId);
+        String sql = chartsUtilService.getSqlStr(token, chartsId, 0);
         if ("".equals(sql)) {
             return new RepEntity(RepCode.NoAuthority);
         }
@@ -109,6 +109,7 @@ public class GetChartsDataUtilService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + baseId + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + baseId);
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));

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

@@ -40,7 +40,7 @@ public class ShowHistogramService {
     /*
     柱状图数据展示
      */
-    public RepEntity showHistogram(HistogramConfigInfo histogramConfigInfo, String token){
+    public RepEntity showHistogram(HistogramConfigInfo histogramConfigInfo, String token, int dashId){
         ChartsDataInfo chartsDataInfo = new ChartsDataInfo();
         TimeReture timeReture = new TimeReture();
         if (histogramConfigInfo == null || "".equals(histogramConfigInfo)){
@@ -56,7 +56,7 @@ public class ShowHistogramService {
         }
         chartsDataInfo.setChartsColumnConfig(chartsColumn);
 
-        String tableName = chartsUtilService.getSqlStr(token, id);
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
         if ("".equals(tableName)){
             return new RepEntity(RepCode.NoAuthority);
         }
@@ -68,6 +68,7 @@ public class ShowHistogramService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + baseId + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + baseId);
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));

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

@@ -35,7 +35,7 @@ public class ShowIndividualService {
     @Autowired
     ChartsUtilService chartsUtilService;
 
-    public RepEntity showIndividual(IndividualConfigInfo individualConfigInfo, String token){
+    public RepEntity showIndividual(IndividualConfigInfo individualConfigInfo, String token, int dashId){
         if (individualConfigInfo == null || "".equals(individualConfigInfo)){
             return new RepEntity(RepCode.Null);
         }
@@ -51,7 +51,7 @@ public class ShowIndividualService {
         }
         popAndIndDataInfo.setChartsColumnConfig(chartsColumn);
 
-        String tableName = chartsUtilService.getSqlStr(token, id);
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
         if ("".equals(tableName)){
             return new RepEntity(RepCode.NoAuthority);
     }
@@ -63,6 +63,7 @@ public class ShowIndividualService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));

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

@@ -37,7 +37,7 @@ public class ShowLineService {
     /*
     Line数据展示
      */
-    public RepEntity showLine(LineConfigInfo lineConfigInfo, String token){
+    public RepEntity showLine(LineConfigInfo lineConfigInfo, String token, int dashId){
         ChartsDataInfo chartsDataInfo = new ChartsDataInfo();
         TimeReture timeReture = new TimeReture();
         if (lineConfigInfo == null || "".equals(lineConfigInfo)){
@@ -54,7 +54,7 @@ public class ShowLineService {
         chartsDataInfo.setChartsColumnConfig(chartsColumn);
 
 
-        String tableName = chartsUtilService.getSqlStr(token, id);
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
         if ("".equals(tableName)){
             return new RepEntity(RepCode.NoAuthority);
         }
@@ -66,6 +66,7 @@ public class ShowLineService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));

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

@@ -37,7 +37,7 @@ public class ShowPieService {
     /*
     Pie数据展示
      */
-    public RepEntity showPie(PieConfigInfo pieConfigInfo, String token){
+    public RepEntity showPie(PieConfigInfo pieConfigInfo, String token, int dashId){
         ChartsDataInfo<PieSeries> chartsDataInfo = new ChartsDataInfo();
         TimeReture timeReture = new TimeReture();
         if (pieConfigInfo == null || "".equals(pieConfigInfo)){
@@ -50,7 +50,7 @@ public class ShowPieService {
             return new RepEntity(RepCode.Null);
         }
         chartsDataInfo.setChartsColumnConfig(chartsColumn);
-        String tableName = chartsUtilService.getSqlStr(token, id);
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
         if ("".equals(tableName)){
             return new RepEntity(RepCode.NoAuthority);
         }
@@ -61,6 +61,7 @@ public class ShowPieService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));

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

@@ -30,7 +30,7 @@ public class ShowPopulationService {
     @Autowired
     ChartsUtilService chartsUtilService;
 
-    public RepEntity showPopulation(PopulationInfo populationInfo, String token) throws SQLException {
+    public RepEntity showPopulation(PopulationInfo populationInfo, String token, int dashId) throws SQLException {
         if (populationInfo == null || "".equals(populationInfo)){
             return new RepEntity(RepCode.Null);
         }
@@ -46,7 +46,7 @@ public class ShowPopulationService {
         String config = chartsColumn.getChartConfig();
         popAndIndDataInfo.setChartsColumnConfig(chartsColumn);
 
-        String tableName = chartsUtilService.getSqlStr(token, id);
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
         if ("".equals(tableName)){
             return new RepEntity(RepCode.NoAuthority);
         }
@@ -58,6 +58,7 @@ public class ShowPopulationService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));

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

@@ -37,7 +37,7 @@ public class ShowScatterService {
     /*
     Line数据展示
      */
-    public RepEntity showScatter(ScatterConfigInfo scatterConfigInfo, String token){
+    public RepEntity showScatter(ScatterConfigInfo scatterConfigInfo, String token, int dashId){
         ChartsDataInfo chartsDataInfo = new ChartsDataInfo();
         TimeReture timeReture = new TimeReture();
         if (scatterConfigInfo == null || "".equals(scatterConfigInfo)){
@@ -53,7 +53,7 @@ public class ShowScatterService {
         String config = chartsColumn.getChartConfig();
         chartsDataInfo.setChartsColumnConfig(chartsColumn);
 
-        String tableName = chartsUtilService.getSqlStr(token, id);
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
         if ("".equals(tableName)){
             return new RepEntity(RepCode.NoAuthority);
         }
@@ -65,6 +65,7 @@ public class ShowScatterService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));

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

@@ -4,21 +4,21 @@ import com.dao.dashboard.DashboardsMapper;
 import com.dao.user.UserMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
+import com.model.bo.DashOrder;
 import com.model.po.Dashboards;
 import com.model.pojo.RepCode;
 import com.model.pojo.RepEntity;
 import com.model.pojo.TestPage;
 import com.model.vo.configVo.ChangeOrderInfo;
 import com.model.vo.configVo.DashboardsInfo;
+import com.model.vo.dataVo.DashboardOrderInfo;
 import com.server.chart.ChartsUtilService;
 import com.util.GetTokenData;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class DashboardsService {
@@ -36,12 +36,12 @@ public class DashboardsService {
     /*
     保存看板
      */
-    public RepEntity setDashboards(String token, DashboardsInfo dashboardsInfo){
+    public RepEntity setDashboards(String token, DashboardsInfo dashboardsInfo) {
         Map<String, String> stringMap = getTokenData.getTokenData(token);
         int userId = Integer.parseInt(stringMap.get("id"));
         String name = stringMap.get("name");
         Dashboards dashboards = new Dashboards();
-        BeanUtils.copyProperties(dashboardsInfo,dashboards);
+        BeanUtils.copyProperties(dashboardsInfo, dashboards);
         dashboards.setCreateBy(name);
         dashboards.setCreateId(userId);
         dashboardsMapper.setDashboards(dashboards);
@@ -57,7 +57,7 @@ public class DashboardsService {
         int userId = Integer.parseInt(stringMap.get("id"));
         String name = stringMap.get("name");
         int createId = dashboardsMapper.getCreateIdById(dashboardsInfo.getId());
-        if (userId != createId){
+        if (userId != createId) {
             return new RepEntity(RepCode.NoAuthority);
         }
         Dashboards dashboards = new Dashboards();
@@ -72,14 +72,14 @@ public class DashboardsService {
     /*
     删除看板
      */
-    public RepEntity delDashboards(String token, List<Integer> idList){
+    public RepEntity delDashboards(String token, List<Integer> idList) {
         Map<String, String> stringMap = getTokenData.getTokenData(token);
         int userId = Integer.parseInt(stringMap.get("id"));
         Iterator isList = idList.iterator();
-        while (isList.hasNext()){
+        while (isList.hasNext()) {
             int id = (int) isList.next();
             int createId = dashboardsMapper.getCreateIdById(id);
-            if (userId != createId){
+            if (userId != createId) {
                 return new RepEntity(RepCode.NoAuthority);
             }
         }
@@ -90,7 +90,7 @@ public class DashboardsService {
     /*
     查看看板
      */
-    public RepEntity getListDashboards(String token, TestPage testPage){
+    public RepEntity getListDashboards(String token, TestPage testPage) {
         Map<String, String> stringMap = getTokenData.getTokenData(token);
         int id = Integer.parseInt(stringMap.get("id"));
         List<Dashboards> getListDashboards = dashboardsMapper.getListDashboards(id, testPage.enablePaging());
@@ -101,24 +101,57 @@ public class DashboardsService {
     /*
     查看单个看板
      */
-    public RepEntity getDashboards(String token, int id){
+    public RepEntity getDashboards(String token, int id) {
         Map<String, String> stringMap = getTokenData.getTokenData(token);
         int userId = Integer.parseInt(stringMap.get("id"));
-        return new RepEntity(RepCode.success, dashboardsMapper.getDashboards(userId, id));
+        Dashboards dashboards = dashboardsMapper.getDashboards(userId, id);
+        if (dashboards == null){
+            return new RepEntity(RepCode.DashboardNonExistent);
+        }
+        return new RepEntity(RepCode.success, dashboards);
     }
 
     /*
     转交看板
      */
-    public RepEntity changeDashOrder(String token, ChangeOrderInfo changeOrderInfo){
+    public RepEntity changeDashOrder(String token, ChangeOrderInfo changeOrderInfo) {
         Map<String, String> stringMap = getTokenData.getTokenData(token);
         int userId = Integer.parseInt(stringMap.get("id"));
         int createId = dashboardsMapper.getCreateIdById(changeOrderInfo.getId());
-        if (userId != createId){
+        if (userId != createId) {
             return new RepEntity(RepCode.NoAuthority);
         }
         String name = userMapper.getName(changeOrderInfo.getUserId());
         dashboardsMapper.changeDashOrder(name, changeOrderInfo.getUserId(), changeOrderInfo.getId());
         return new RepEntity(RepCode.success);
     }
+
+    /*
+    查看看板分发对象
+     */
+    public RepEntity getDashOrder(String token, int dashId) {
+        Map<String, String> stringMap = getTokenData.getTokenData(token);
+        int userId = Integer.parseInt(stringMap.get("id"));
+        int createId = dashboardsMapper.getCreateIdById(dashId);
+        if (userId != createId) {
+            return new RepEntity(RepCode.NoAuthority);
+        }
+
+        List<DashOrder> userNames = new ArrayList<>();
+        List<DashOrder> groupNames = new ArrayList<>();
+        List<String> type = dashboardsMapper.getType(dashId);
+        Iterator isType = type.iterator();
+        while (isType.hasNext()){
+            String ty = String.valueOf(isType.next());
+            if ("1".equals(ty)){
+                userNames = dashboardsMapper.getOrderName(dashId);
+            }else {
+                groupNames = dashboardsMapper.getOrderGroupName(dashId);
+            }
+        }
+        DashboardOrderInfo dashboardOrderInfo = new DashboardOrderInfo();
+        dashboardOrderInfo.setUserNames(userNames);
+        dashboardOrderInfo.setGroupNames(groupNames);
+        return new RepEntity(RepCode.success, dashboardOrderInfo);
+    }
 }

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

@@ -36,8 +36,12 @@ public class DashboardsToChartsUtilService {
     @Autowired
     ShowScatterService showScatterService;
 
+    private int chartId;
+
     public RepEntity getChartsInDash(ChartsToDashInfo chartsToDashInfo, String token) throws SQLException {
-        int chartId = chartsToDashInfo.getDashCreateId();
+        chartId = chartsToDashInfo.getDashCreateId();
+        System.out.println("看板生成图表");
+        //拿到图表配置
         ChartsConfigToDash chartsConfigToDash = chartsConfigMapper.getChartConfigToDash(chartId);
         if (chartsConfigToDash == null || "".equals(chartsConfigToDash)){
             return new RepEntity(RepCode.Null);
@@ -47,6 +51,7 @@ public class DashboardsToChartsUtilService {
         if (fetchConfig == null || "".equals(fetchConfig)){
             return new RepEntity(RepCode.Null);
         }
+        //判断图表类型
         List<Screen> filters = chartsToDashInfo.getFilters();
         if ("Pie".equals(chartType)){
             return getPie(fetchConfig, token, filters);
@@ -77,7 +82,7 @@ public class DashboardsToChartsUtilService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return showHistogramService.showHistogram(histogramConfigInfo, token);
+        return showHistogramService.showHistogram(histogramConfigInfo, token, chartId);
     }
 
     public RepEntity getScatter(String fetchConfig, String token, List<Screen> filters){
@@ -89,7 +94,7 @@ public class DashboardsToChartsUtilService {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            return showScatterService.showScatter(scatterConfigInfo, token);
+            return showScatterService.showScatter(scatterConfigInfo, token, chartId);
     }
 
     public RepEntity getLine(String fetchConfig, String token, List<Screen> filters){
@@ -101,7 +106,7 @@ public class DashboardsToChartsUtilService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return showLineService.showLine(lineConfigInfo, token);
+        return showLineService.showLine(lineConfigInfo, token, chartId);
     }
 
     public RepEntity getPopulation(String fetchConfig, String token, List<Screen> filters) throws SQLException {
@@ -113,7 +118,7 @@ public class DashboardsToChartsUtilService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return showPopulationService.showPopulation(populationInfo, token);
+        return showPopulationService.showPopulation(populationInfo, token, chartId);
     }
 
     public RepEntity getIndividual(String fetchConfig, String token, List<Screen> filters) throws SQLException {
@@ -125,7 +130,7 @@ public class DashboardsToChartsUtilService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return showIndividualService.showIndividual(individualConfigInfo, token);
+        return showIndividualService.showIndividual(individualConfigInfo, token, chartId);
     }
 
     public RepEntity getPie(String fetchConfig, String token, List<Screen> filters){
@@ -137,7 +142,7 @@ public class DashboardsToChartsUtilService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return showPieService.showPie(pieConfigInfo, token);
+        return showPieService.showPie(pieConfigInfo, token, chartId);
     }
 
 }

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

@@ -28,7 +28,7 @@ public class ColumnScreenService {
     public RepEntity getScreenData(ColumnScreenInfo columnScreenInfo, String token){
         //取表名
         int id = columnScreenInfo.getId();
-        String tableName = chartsUtilService.getSqlStr(token, id);
+        String tableName = chartsUtilService.getSqlStr(token, id, 0);
         if ("".equals(tableName)){
             return new RepEntity(RepCode.NoAuthority);
         }
@@ -42,6 +42,7 @@ public class ColumnScreenService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
@@ -79,6 +80,7 @@ public class ColumnScreenService {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
                 //joinPoint.getSignature() ：获取连接点的方法签名对象
                 System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                return new RepEntity(RepCode.DataSourceNull);
             } else {
                 System.out.println("使用数据源：" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));

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

@@ -162,6 +162,9 @@ public class DataConnectorService {
      */
     public RepEntity getConnector(int id){
         DataConnector dataConnector = dataConnectorMapper.getOneData(id);
+        if (dataConnector == null){
+            return new RepEntity(RepCode.DataNonExistent);
+        }
         BaseConfig baseConfig = new BaseConfig();
         String dbConfig = dataConnector.getDbConfig();
         try {
@@ -263,13 +266,13 @@ public class DataConnectorService {
 
     public RepEntity delDataConnector(List<Integer> idList){
         Iterator isList = idList.iterator();
-        while (isList.hasNext()){
-            int id = (int) isList.next();
-            List<String> chartName = dataConnectorMapper.getChartsName(id);
-            if (chartName.size() != 0){
-                return new RepEntity(RepCode.hasChartsUsing, chartName);
-            }
-        }
+//        while (isList.hasNext()){
+//            int id = (int) isList.next();
+//            List<String> chartName = dataConnectorMapper.getChartsName(id);
+//            if (chartName.size() != 0){
+//                return new RepEntity(RepCode.hasChartsUsing, chartName);
+//            }
+//        }
         dataConnectorMapper.deleteData(idList);
         return new RepEntity(RepCode.success);
     }
@@ -353,6 +356,7 @@ public class DataConnectorService {
         String sql = columnConfigAndSql.getSql();
         String columnConfig = columnConfigAndSql.getColumnConfig();
         columnValuesInfo.setColumnConfig(columnConfig);
+        String sqls = chartsUtilService.columnNameUtil(id, dataId, sql, true, 0, createId);
 
             try {
                 if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
@@ -366,7 +370,6 @@ public class DataConnectorService {
                 if (id == createId) {
                     val = dataConnectorMapper.getValues(sql, baseToDataInfo.getTestPage().enablePaging());
                 } else {
-                    String sqls = chartsUtilService.columnNameUtil(id, dataId, sql, true, 0, createId);
                     if ("".equals(sqls)) {
                         return new RepEntity(RepCode.NoAuthority);
                     }

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

@@ -5,6 +5,7 @@ import com.dao.strategy.StrategysBdMapper;
 import com.dao.strategy.StrategysChartMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.model.bo.DashOrder;
 import com.model.bo.Obj;
 import com.model.po.Strategys;
 import com.model.po.StrategysData;
@@ -114,8 +115,8 @@ public class StrategysService {
         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<>();
+            List<DashOrder> userGroupNameList = new ArrayList<>();
+            List<DashOrder> userNameList = new ArrayList<>();
             StrategysData strategysDatas = new StrategysData();
 
             Strategys strategys = strategysBdMapper.getStrategys(id);  //策略的基本信息
@@ -185,8 +186,8 @@ public class StrategysService {
         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<>();
+            List<DashOrder> userGroupNameList = new ArrayList<>();
+            List<DashOrder> userNameList = new ArrayList<>();
             StrategysData strategysDatas = new StrategysData();
 
             Strategys strategys = strategysChartMapper.getStrategys(id);  //策略的基本信息

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

@@ -47,6 +47,72 @@ public class UserService {
         return new RepEntity(RepCode.success, tokenData);
     }
 
+    /*
+    测试连接到uas
+     */
+//    public void login(String url){
+//        String result="";
+//        BufferedReader in = null;// 读取响应输入流
+//        StringBuffer sb = new StringBuffer();// 存储参数
+//        String params = "";// 编码之后的参数
+//        try {
+//            // 创建URL对象
+//            java.net.URL connURL = new java.net.URL(url);
+//            // 打开URL连接
+//            java.net.HttpURLConnection httpConn = (java.net.HttpURLConnection) connURL
+//                    .openConnection();
+//
+//            // 设置通用属性
+//            httpConn.setRequestProperty("Accept", "*/*");
+//            httpConn.setRequestProperty("Connection", "Keep-Alive");
+//            httpConn.setRequestProperty("User-Agent",
+//                    "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1)");
+//            // 建立实际的连接
+//            httpConn.connect();
+//            // 响应头部获取
+//            Map<String, List<String>> headers = httpConn.getHeaderFields();
+//
+//            //获取session
+//            String session_value = httpConn.getHeaderField("Set-Cookie");
+//            String[] sessionId = session_value.split(";");
+//            System.out.println(sessionId[0]);
+//            System.out.println("Session Value = " + session_value);
+//
+//
+//            // 遍历所有的响应头字段
+//            for (String key : headers.keySet()) {
+//                System.out.println(key + "\t：\t" + headers.get(key));
+//            }
+//            // 定义BufferedReader输入流来读取URL的响应,并设置编码方式
+//            in = new BufferedReader(new InputStreamReader(httpConn
+//                    .getInputStream(), "UTF-8"));
+//            String line;
+//            // 读取返回的内容
+//            while ((line = in.readLine()) != null) {
+//                result += line;
+//            }
+//            System.out.println("result:" + result);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }finally{
+//            try {
+//                if (in != null) {
+//                    in.close();
+//                }
+//            } catch (IOException ex) {
+//                ex.printStackTrace();
+//            }
+//    }
+//}
+
+    /*
+    test2
+     */
+//    public void login(String url){
+//        HttpRequest request = HttpRequest.get(url);
+//    }
+
+
     /*
     查询用户列表
      */

src/main/resources/application.properties

@@ -4,10 +4,16 @@ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 #数据库驱动
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
 #数据库连接地址
-spring.datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
-spring.datasource.username=UAS_DEV
-spring.datasource.password=select!#%*(
 #默认数据源
+#spring.datasource.url=jdbc:oracle:thin:@192.168.253.6:1521:orcl
+#spring.datasource.username=UAS_DEV
+#spring.datasource.password=select!#%*(
+
+#线上环境
+spring.datasource.url=jdbc:oracle:thin:@218.18.115.198:1523:orcl
+spring.datasource.username=BI_ADMIN
+spring.datasource.password=admin
+
 
 #slave.datasource.names=UAS,UAS_DEV,YITOA_DATACENTER,N_USOFTSYS
 #//UAS标准版

src/main/test/com/test/TestDataSource.java

@@ -1,8 +1,7 @@
 package com.test;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.config.BasesSource.DynamicDataSource;
+import com.config.BasesSource.DynamicDataSourceContextHolder;
+import com.config.BasesSource.DynamicDataSourceRegister;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,9 +11,9 @@ import org.springframework.context.annotation.Import;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.config.BasesSource.DynamicDataSource;
-import com.config.BasesSource.DynamicDataSourceContextHolder;
-import com.config.BasesSource.DynamicDataSourceRegister;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 @RunWith(SpringRunner.class)