1.看板生成图表

2.看板公共参数

src/main/java/com/dao/ShowChartsMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 public interface ShowChartsMapper {
 
     //x轴
-    @Select("select ${xAxisName} from ${tableName} ${screenToColumn} group by ${xAxisName}")
+    @Select("select ${xAxisName} from ${tableName} group by ${xAxisName}")
     List<String> getXAxis(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName, @Param("screenToColumn") String screenToColumn);
 
 

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

@@ -38,6 +38,9 @@ public class DashboardsToChartsUtilService {
     public RepEntity getChartsInDash(ChartsToDashInfo chartsToDashInfo, String token) throws SQLException {
         int chartId = chartsToDashInfo.getDashCreateId();
         ChartsConfigToDash chartsConfigToDash = chartsConfigMapper.getChartConfigToDash(chartId);
+        if (chartsConfigToDash == null || "".equals(chartsConfigToDash)){
+            return new RepEntity(RepCode.Null);
+        }
         String chartType = chartsConfigToDash.getChartType();
         String fetchConfig = chartsConfigToDash.getFetchConfig();
         List<Screen> filters = chartsToDashInfo.getFilters();
@@ -66,9 +69,7 @@ public class DashboardsToChartsUtilService {
         HistogramConfigInfo histogramConfigInfo = new HistogramConfigInfo();
         try {
             histogramConfigInfo = objectMapper.readValue(fetchConfig,HistogramConfigInfo.class);
-            List<Screen> list = histogramConfigInfo.getFilters();
-            list.addAll(filters);
-            histogramConfigInfo.setFilters(list);
+            histogramConfigInfo.setFilters(filters);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -80,9 +81,7 @@ public class DashboardsToChartsUtilService {
             try {
                 System.out.println(fetchConfig);
                 scatterConfigInfo = objectMapper.readValue(fetchConfig,ScatterConfigInfo.class);
-                List<Screen> list = scatterConfigInfo.getFilters();
-                list.addAll(filters);
-                scatterConfigInfo.setFilters(list);
+                scatterConfigInfo.setFilters(filters);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -94,9 +93,7 @@ public class DashboardsToChartsUtilService {
         try {
             System.out.println(fetchConfig);
             lineConfigInfo = objectMapper.readValue(fetchConfig,LineConfigInfo.class);
-            List<Screen> list = lineConfigInfo.getFilters();
-            list.addAll(filters);
-            lineConfigInfo.setFilters(list);
+            lineConfigInfo.setFilters(filters);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -108,9 +105,7 @@ public class DashboardsToChartsUtilService {
         try {
             System.out.println(fetchConfig);
             populationInfo = objectMapper.readValue(fetchConfig,PopulationInfo.class);
-            List<Screen> list = populationInfo.getFilters();
-            list.addAll(filters);
-            populationInfo.setFilters(list);
+            populationInfo.setFilters(filters);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -122,9 +117,7 @@ public class DashboardsToChartsUtilService {
         try {
             System.out.println(fetchConfig);
             individualConfigInfo = objectMapper.readValue(fetchConfig,IndividualConfigInfo.class);
-            List<Screen> list = individualConfigInfo.getFilters();
-            list.addAll(filters);
-            individualConfigInfo.setFilters(list);
+            individualConfigInfo.setFilters(filters);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -136,9 +129,7 @@ public class DashboardsToChartsUtilService {
         try {
             System.out.println(fetchConfig);
             pieConfigInfo = objectMapper.readValue(fetchConfig,PieConfigInfo.class);
-            List<Screen> list = pieConfigInfo.getFilters();
-            list.addAll(filters);
-            pieConfigInfo.setFilters(list);
+            pieConfigInfo.setFilters(filters);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -105,7 +105,7 @@ public class ShowPieService {
                 System.out.println("screen:" + screen);
             }else {
                 StringBuilder sb1 = new StringBuilder(screen);
-                screenStr = String.valueOf(sb1 .replace(1, 5, "where "));
+                screenStr = String.valueOf(sb1 .replace(1, 5, "and "));
             }
         }
 
@@ -116,7 +116,7 @@ public class ShowPieService {
             xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
             System.out.println("data:"+xAxisData);
         }else {
-            xAxisData = showChartsMapper.getXAxis(xColumn, tableName, screen);
+            xAxisData = showChartsMapper.getXAxis(xColumn, tableName, screenStr);
 
         }
         if ("".equals(xAxisData) || xAxisData == null || xAxisData.size() == 0){
@@ -144,7 +144,7 @@ public class ShowPieService {
                 if (xdata == null || "".equals(xdata)){
                     valueOnes = showChartsMapper.getValuesIsNull(yColumn, xColumn, tableName, yAxisType, screen);
                 }else {
-                    valueOnes = showChartsMapper.getValues(yColumn, xColumn, tableName, yAxisType, xdata, screen);
+                    valueOnes = showChartsMapper.getValues(yColumn, xColumn, tableName, yAxisType, xdata, screenStr);
                 }
             }
             if (valueOnes == null || "".equals(valueOnes)){