1.修改数据源更新时不重新保存数据源的BUG

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

@@ -20,7 +20,7 @@ public class ChartConfigInfo {
     private List<String> updateAuthority;    //修改权限
     private String describes;           //描述
     private String style;                //样式
-    private List<Column> filters;          //筛选
+    private String filters;          //筛选
 
 
     public int getChartsGroup() {
@@ -135,11 +135,11 @@ public class ChartConfigInfo {
         this.style = style;
     }
 
-    public List<Column> getFilters() {
+    public String getFilters() {
         return filters;
     }
 
-    public void setFilters(List<Column> filters) {
+    public void setFilters(String filters) {
         this.filters = filters;
     }
 

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

@@ -41,7 +41,6 @@ public class ChartsConfigService {
 //        String chartsConfig = null;
         String accessAuthority = null;
         String updateAuthority = null;
-        String filters = null;
         String style = null;
 
         try {
@@ -68,16 +67,10 @@ public class ChartsConfigService {
             e.printStackTrace();
         }
 
-        try {
-            filters = objectmapper.writeValueAsString(chartConfigInfo.getFilters());
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
 
         chartConfig.setGroupBy(groupBy);
         chartConfig.setAccessAuthority(accessAuthority);
         chartConfig.setUpdateAuthority(updateAuthority);
-        chartConfig.setFilters(filters);
         chartConfig.setStyle(style);
         chartConfig.setCreateDate(timeUtil.SystemTime());
 
@@ -103,7 +96,6 @@ public class ChartsConfigService {
         String groupBy = null;
         String accessAuthority = null;
         String updateAuthority = null;
-        String filters = null;
         String style = null;
 
         try {
@@ -131,17 +123,11 @@ public class ChartsConfigService {
             e.printStackTrace();
         }
 
-        try {
-            filters = objectmapper.writeValueAsString(chartConfigInfo.getFilters());
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
 
         chartConfig.setGroupBy(groupBy);
         chartConfig.setAccessAuthority(accessAuthority);
         chartConfig.setAccessAuthority(accessAuthority);
         chartConfig.setUpdateAuthority(updateAuthority);
-        chartConfig.setFilters(filters);
         chartConfig.setStyle(style);
         chartConfig.setUpdateDate(timeUtil.SystemTime());
         if (chartConfig.getChartsGroup() == 0){

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

@@ -168,6 +168,7 @@ public class DataConnectorService {
         DatabaseConfig dbConfig = dataConnectorInfo.getDbConfig();
         List<String> dataTag = dataConnectorInfo.getDataTag();
 
+
         String columnConfigJson = null;
         String dbConfigJson = null;
         String dataTagJson = null;
@@ -186,7 +187,7 @@ public class DataConnectorService {
             } catch (JsonProcessingException e) {
                 e.printStackTrace();
             }
-            dataConnector.setDbConfig(dbConfigJson);
+            dataConnector.setDbConfig(null);
         }
         if (dataTag != null){
             try {

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

@@ -32,8 +32,7 @@ public class ShowPopulationService {
         }
         //取表名
         int id = populationInfo.getId();
-        String tableName = chartsConfigMapper.getTableName(id).toUpperCase();
-//        String tableName = "bench_flowchart".toUpperCase();
+        String tableName = chartsConfigMapper.getTableName(id);
         if (tableName == null || "".equals(tableName)){
             return new RepEntity(RepCode.nullTableName);
         }
@@ -111,25 +110,15 @@ public class ShowPopulationService {
                 operatorColumn.add(op);
             }
 
-//            groupByList.addAll(operatorColumn);
             String groups = groupByList.toString();
             String groupBy = getString(groups);
 
             String oprs = operatorColumn.toString();
             String opr = getString(oprs);
 
-            //列头
-            groupByList.add(columnName);
-            groupByList.addAll(operators);
-
-
-
             List<LinkedHashMap<String, Object>> valueList = new ArrayList<>();
             valueList = showChartsMapper.getGroupByValue(groupBy, opr, tableName, listOne, screenStr);
             System.out.println("valueList:"+ valueList);
-//            PopulationDataInfo populationDataInfo = new PopulationDataInfo();
-//            populationDataInfo.setColumnHead(groupByList);
-//            populationDataInfo.setValueList(valueList);
             return new RepEntity(RepCode.success, valueList);
         }
         }catch (Exception e){