Merge branch 'feature-refactor' of ssh://10.10.100.21/source/platform-bi-server into feature-refactor

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

@@ -160,6 +160,12 @@ public interface ChartsConfigMapper {
     @Update("update bi_charts set create_by = #{name}, create_id = #{createId} where id = #{baseId}")
     void changeChartOrder(@Param("name") String name, @Param("createId") int userId, @Param("baseId") int baseId);
 
+    /*
+    更新FetchConfig
+     */
+    @Update("update bi_charts set BC_FETCHCONFIG = #{fetch} where id = #{id}")
+    void updateChartFetchConfig(@Param("fetch") String fetch, @Param("id") int id);
+
     /*
     更新图表分组
      */

bi-server/src/main/java/com/usoftchina/bi/server/dao/common/UASMapper.java

@@ -55,15 +55,34 @@ public interface UASMapper {
     void insertDataBase(@Param("name") String name ,@Param("sob") String sob ,@Param("mainid") int mainid);
 
     //获取所有单个数据链接的报表 且编号符合  xxxx_xxxx_账套str
-    @Select({ "select DASHBOARD_ID dashboardId,ID dataSourceId,'_副本' lastName,BD_CODE newCode  from (select MAX(BD_CODE) BD_CODE,DASHBOARD_ID,count(*),max(BI_DATABASES.id) id,max(BI_DATABASES.USER_NAME) USER_NAME " +
-            "from BI_DATABASES " +
-            "left join BI_DATA_CONNECTORS on DB_CONFIG = BI_DATABASES.id  " +
-            "left join BI_CHARTS on BI_CHARTS.BD_DATA_ID = BI_DATA_CONNECTORS.ID " +
-            "left join BI_DASHBOARDS_CHART on BI_DASHBOARDS_CHART.CHART_ID = BI_CHARTS.id " +
-            "LEFT JOIN BI_DASHBOARDS ON BI_DASHBOARDS.ID = BI_DASHBOARDS_CHART.DASHBOARD_ID " +
-            "group by DASHBOARD_ID " +
-            "having count(*)=1) x " +
-            "where X.USER_NAME = #{from} AND REGEXP_LIKE (nvl(BD_CODE,' '), '([[:alnum:]]+_){2}')" })
+    @Select({ "SELECT DASHBOARD_ID dashboardId, " +
+            "  ID dataSourceId, " +
+            "  '_副本' lastName, " +
+            "  BD_CODE newCode " +
+            "FROM " +
+            "  (SELECT MAX(BD_CODE) BD_CODE, " +
+            "    DASHBOARD_ID, " +
+            "    COUNT(*), " +
+            "    MAX(id) id, " +
+            "    MAX(USER_NAME) USER_NAME " +
+            "  FROM (SELECT DISTINCT BD_CODE, " +
+            "    DASHBOARD_ID, " +
+            "    BI_DATABASES.id, " +
+            "    BI_DATABASES.USER_NAME " +
+            "  FROM BI_DATABASES " +
+            "  LEFT JOIN BI_DATA_CONNECTORS " +
+            "  ON DB_CONFIG = BI_DATABASES.id " +
+            "  LEFT JOIN BI_CHARTS " +
+            "  ON BI_CHARTS.BD_DATA_ID = BI_DATA_CONNECTORS.ID " +
+            "  LEFT JOIN BI_DASHBOARDS_CHART " +
+            "  ON BI_DASHBOARDS_CHART.CHART_ID = BI_CHARTS.id " +
+            "  LEFT JOIN BI_DASHBOARDS " +
+            "  ON BI_DASHBOARDS.ID = BI_DASHBOARDS_CHART.DASHBOARD_ID) " +
+            "  GROUP BY DASHBOARD_ID " +
+            "  HAVING COUNT(*)=1 " +
+            "  ) x " +
+            "WHERE X.USER_NAME = #{from} " +
+            "AND REGEXP_LIKE (NVL(BD_CODE,' '), '([[:alnum:]]+_){2}')" })
     List<DashboardCopyInfo> getFromSobDashboard(@Param("from") String from);
 
     /**

bi-server/src/main/java/com/usoftchina/bi/server/service/common/UASService.java

@@ -45,9 +45,9 @@ public class UASService {
         dataBasesService.addDataSource(databasesInfo);
         //把人员信息重新插入一遍
         //切换到主账套
-        DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(BI_DATABASES_ID));
+        DynamicDataSourceContextHolder.setDataSourceType(Integer.valueOf(BI_DATABASES_ID));
         List<User> userList = userMapper.getUASEmployee();
-        DynamicDataSourceContextHolder.setDataSourceType("[]");
+        DynamicDataSourceContextHolder.clearDataSourceType();
         userMapper.batchInsert(userList);
         return "true";
     }

bi-server/src/main/java/com/usoftchina/bi/server/service/dashboard/DashboardsService.java

@@ -356,10 +356,15 @@ public class DashboardsService {
                 chartConfig.setChartName(chartConfig.getChartName() + dashboardCopyInfo.getLastName());
                 chartConfig.setCreateBy(userName);
                 chartConfig.setCreateId(userId);
+                String oldFetchConfig = chartConfig.getFetchConfig();
                 int dataId = dataConnectorService.copyDataSource(token, new DataSourceCopyInfo(chartConfig.getDataId(), dataSourceId ,dashboardCopyInfo.getLastName())).getData();
                 chartConfig.setDataId(dataId);
                 chartsConfigMapper.insertCharts(chartConfig);
                 int newChartId = chartConfig.getChartId();
+                //新ID更新到FetchConfig
+                JSONArray jsonArray = JSONObject.parseArray("["+oldFetchConfig+"]");
+                jsonArray.getJSONObject(0).put("id",newChartId);
+                chartsConfigMapper.updateChartFetchConfig(JSONObject.toJSONString(jsonArray.getJSONObject(0)),newChartId);
                 idMap.put(String.valueOf(oldChartId), String.valueOf(newChartId));
                 idList.add(String.valueOf(newChartId));
             }

bi-server/src/main/java/com/usoftchina/bi/server/service/dashboard/DashboardsToChartsUtilService.java

@@ -1,5 +1,6 @@
 package com.usoftchina.bi.server.service.dashboard;
 
+import com.alibaba.fastjson.JSONObject;
 import com.usoftchina.bi.core.utils.EncryUtil;
 import com.usoftchina.bi.server.dao.chart.ChartsConfigMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -72,6 +73,7 @@ public class DashboardsToChartsUtilService {
         if (fetchConfig == null || "".equals(fetchConfig)){
             return new RepEntity(RepCode.Null);
         }
+        JSONObject.parseArray("["+fetchConfig+"]").get(0);
         //判断图表类型
         List<Screen> filters = chartsToDashInfo.getFilters();
         if ("Pie".equals(chartType)){

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

@@ -241,7 +241,7 @@ public class DataBasesService {
 
             Set<Object> dataSourceIds = DynamicDataSourceContextHolder.getDataSourceIds();
 
-            dataSourceIds.add(String.valueOf(databasesInfo.getId()));
+            dataSourceIds.add(databasesInfo.getId());
 
             DynamicDataSourceContextHolder.setDataSourceIds(dataSourceIds);
         }

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

@@ -444,7 +444,7 @@ public class DataConnectorService {
      * @param dataConnectionId
      */
     public void enableCopy(String loadObject, int dataConnectionId){
-        DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(dataConnectionId));
+        DynamicDataSourceContextHolder.setDataSourceType(dataConnectionId);
         if (!loadObject.toUpperCase().startsWith("SELECT")) {
             loadObject = "SELECT * FROM " + loadObject;
         }

bi-server/src/main/resources/static/index.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>BI 商业智能平台</title>
-<link rel="shortcut icon" href="favicon.png"><link href="index.68326630.css" rel="stylesheet"></head>
+<link rel="shortcut icon" href="favicon.png"><link href="index.d4a3a275.css" rel="stylesheet"></head>
 <body>
   <div id="root"></div>
-<script type="text/javascript" src="index.ad5431fa.js"></script></body>
+<script type="text/javascript" src="index.367b1d8a.js"></script></body>
 </html>