饼图，折线图，柱状图

.idea/misc.xml

@@ -11,7 +11,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="9" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

pom.xml

@@ -75,7 +75,7 @@
       <dependency>
           <groupId>org.mybatis.spring.boot</groupId>
           <artifactId>mybatis-spring-boot-starter</artifactId>
-          <version>1.3.0</version>
+          <version>1.3.1</version>
       </dependency>
 
 
@@ -119,7 +119,6 @@
     </dependency>
 
 
-
   </dependencies>
 
   <build>

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

@@ -1,6 +1,5 @@
 package com.controller;
 
-import com.model.bo.*;
 import com.model.pojo.RepEntity;
 import com.model.vo.configVo.ChartConfigInfo;
 import com.server.ChartsConfigService;
@@ -15,86 +14,69 @@ import java.util.List;
 public class ChartsConfigController {
     @Autowired
     ChartsConfigService chartsConfigService;
-
-//    /*
-//    保存基本信息配置
-//     */
-//    @RequestMapping("/inputBase")
-//    public RepEntity inputBase(@RequestBody BaseDataInfo body){
-//        return chartsConfigService.setChartBase(body);
-//    }
-//
-//    /*
-//    删除基本配置
-//     */
-//    @RequestMapping("/delBase")
-//    public RepEntity delBase(@RequestBody int body){
-//        return chartsConfigService.delChartBase(body);
-//    }
-
     /*
     总体统计数据表
      */
-    @RequestMapping("/inputAggregate")
-   public RepEntity inputAggregate(@RequestBody ChartConfigInfo<AggregateTable> body){
-        return chartsConfigService.setChartsConfig(body);
-   }
+//    @RequestMapping("/inputAggregate")
+//   public RepEntity inputAggregate(@RequestBody ChartConfigInfo<AggregateTable> body){
+//        return chartsConfigService.setChartsConfig(body);
+//   }
 
    /*
    个人统计数据表
     */
-   @RequestMapping("/inputDataView")
-   public RepEntity inputDataView(@RequestBody ChartConfigInfo<DataView> body){
-       return chartsConfigService.setChartsConfig(body);
-   }
+//   @RequestMapping("/inputDataView")
+//   public RepEntity inputDataView(@RequestBody ChartConfigInfo body){
+//       return chartsConfigService.setChartsConfig(body);
+//   }
 
    /*
    柱状
     */
-    @RequestMapping("/inputHistogram")
-    public RepEntity inputHistogram(@RequestBody ChartConfigInfo<Histogram> body){
+    @RequestMapping("/inputCharts")
+    public RepEntity inputCharts(@RequestBody ChartConfigInfo body){
         return chartsConfigService.setChartsConfig(body);
     }
 
     /*
    更新柱状
     */
-    @RequestMapping("/updateHistogram")
-    public RepEntity updateHistogram(@RequestBody ChartConfigInfo<Histogram> body){
+    @RequestMapping("/updateCharts")
+    public RepEntity updateCharts(@RequestBody ChartConfigInfo body){
         return chartsConfigService.updateChartsConfig(body);
     }
 
-  /*
-  折线
-  */
-    @RequestMapping("/inputLine")
-    public RepEntity inputLine(@RequestBody ChartConfigInfo<Line> body){
-        return chartsConfigService.setChartsConfig(body);
-    }
-
-    /*
-    更新Line
-     */
-    @RequestMapping("/updateLine")
-    public RepEntity updateLine(@RequestBody ChartConfigInfo<Line> body){
-        return chartsConfigService.updateChartsConfig(body);
-    }
-
-    /*
-   饼图配置
-    */
-    @RequestMapping("/inputPie")
-    public RepEntity inputPie(@RequestBody ChartConfigInfo<Pie> body){
-        return chartsConfigService.setChartsConfig(body);
-    }
-
-    /*
-   更新Pie
-    */
-    @RequestMapping("/updatePie")
-    public RepEntity updatePie(@RequestBody ChartConfigInfo<Pie> body){
-        return chartsConfigService.updateChartsConfig(body);
-    }
+//  /*
+//  折线
+//  */
+//    @RequestMapping("/inputLine")
+//    public RepEntity inputLine(@RequestBody ChartConfigInfo body){
+//        return chartsConfigService.setChartsConfig(body);
+//    }
+//
+//    /*
+//    更新Line
+//     */
+//    @RequestMapping("/updateLine")
+//    public RepEntity updateLine(@RequestBody ChartConfigInfo body){
+//        return chartsConfigService.updateChartsConfig(body);
+//    }
+//
+//    /*
+//   饼图配置
+//    */
+//    @RequestMapping("/inputPie")
+//    public RepEntity inputPie(@RequestBody ChartConfigInfo<Pie> body){
+//        return chartsConfigService.setChartsConfig(body);
+//    }
+//
+//    /*
+//   更新Pie
+//    */
+//    @RequestMapping("/updatePie")
+//    public RepEntity updatePie(@RequestBody ChartConfigInfo<Pie> body){
+//        return chartsConfigService.updateChartsConfig(body);
+//    }
 
     /*
     删除

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

@@ -7,13 +7,13 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
-
 @Mapper
 @Repository
 public interface ChartsConfigMapper {
 
-    @Insert("insert into bi_charts(CHART_NAME,CHART_TYPE,BD_DATA_ID,CHART_CONFIG,GROUP_BY,ACCESS_AUTHORITY,UPDATE_AUTHORITY,CHART_DESCRIBES,is_legend,is_tooltip,is_datazoom,is_toolbox,create_by,create_date) " +
-            "VALUES (#{chartName},#{chartType}, #{dataId}, #{chartConfig}, #{groupBy}, #{accessAuthority}, #{updateAuthority}, #{describes},#{isLegend},#{isTooltip}, #{isDatazoom}, #{isToolbox}, #{createBy},to_date(#{createDate},'YYYY-MM-DD hh24:mi:ss'))")
+    @Insert("insert into bi_charts(CHART_NAME,CHART_TYPE,BD_DATA_ID,CHART_CONFIG,GROUP_BY,ACCESS_AUTHORITY,UPDATE_AUTHORITY,CHART_DESCRIBES,BC_CHART_STYLE,create_by,create_date) " +
+            "VALUES (#{chartName},#{chartType}, #{dataId}, #{chartConfig}, #{groupBy}, #{accessAuthority}, #{updateAuthority}, #{describes},#{style}, #{createBy},to_date(#{createDate},'YYYY-MM-DD hh24:mi:ss'))" )
+    @Options(useGeneratedKeys=false, keyProperty = "chartId",keyColumn = "id")
     void insertCharts(ChartConfig chartConfig);
 
     @Delete("<script>" +
@@ -28,8 +28,7 @@ public interface ChartsConfigMapper {
 
     @Select("select id as chartId, chart_name as chartName, chart_type as chartType, create_by as createBy, create_date as createDate" +
             ",bc_filters as filters, BD_DATA_ID as dataId, bc_table_name as tableName, CHART_CONFIG as chartConfig, GROUP_BY as groupBy," +
-            "ACCESS_AUTHORITY as accessAuthority, UPDATE_AUTHORITY as updateAuthority, CHART_DESCRIBES as describes, IS_LEGEND as isLegend," +
-            "IS_TOOLTIP as isTooltip, IS_DATAZOOM as isDatazoom, IS_TOOLBOX as isToolbox, BC_FILTERS as filters " +
+            "ACCESS_AUTHORITY as accessAuthority, UPDATE_AUTHORITY as updateAuthority, CHART_DESCRIBES as describes, BC_CHART_STYLE as style, BC_FILTERS as filters " +
             " from bi_charts where id = #{id}")
     ChartConfig getOneChart(int id);
 
@@ -51,10 +50,7 @@ public interface ChartsConfigMapper {
             "<if test=\"filters != null\"> , BC_FILTERS = #{filters} </if>" +
             "<if test=\"accessAuthority != null\"> , ACCESS_AUTHORITY = #{accessAuthority} </if>" +
             "<if test=\"updateAuthority != null\"> , UPDATE_AUTHORITY = #{updateAuthority} </if>" +
-            "<if test=\"isDatazoom != null\"> , IS_DATAZOOM = #{isDatazoom} </if>" +
-            "<if test=\"isLegend != null\"> , IS_LEGEND = #{isLegend} </if>" +
-            "<if test=\"isToolbox != null\"> , IS_TOOLBOX = #{isToolbox} </if>" +
-            "<if test=\"isTooltip != null\"> , IS_TOOLTIP = #{isTooltip} </if>" +
+            "<if test=\"style != null\"> , BC_CHART_STYLE = #{style} </if>" +
             "<if test=\"updateDate != null\"> , UPDATE_DATE = to_date(#{updateDate},'YYYY-MM-DD hh24:mi:ss') </if>" +
             "where id = #{chartId}" +
             "</script>")

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

@@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-
 @Mapper
 @Repository
 public interface DataConnectorMapper {

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

@@ -0,0 +1,50 @@
+package com.model.bo;
+
+public class Style {
+    private int isLegend;           //图例
+    private int isTooltip;            //提示框
+    private int isDatazoom;           //缩放
+    private int isToolbox;            //工具箱
+
+    public int getIsLegend() {
+        return isLegend;
+    }
+
+    public void setIsLegend(int isLegend) {
+        this.isLegend = isLegend;
+    }
+
+    public int getIsTooltip() {
+        return isTooltip;
+    }
+
+    public void setIsTooltip(int isTooltip) {
+        this.isTooltip = isTooltip;
+    }
+
+    public int getIsDatazoom() {
+        return isDatazoom;
+    }
+
+    public void setIsDatazoom(int isDatazoom) {
+        this.isDatazoom = isDatazoom;
+    }
+
+    public int getIsToolbox() {
+        return isToolbox;
+    }
+
+    public void setIsToolbox(int isToolbox) {
+        this.isToolbox = isToolbox;
+    }
+
+    @Override
+    public String toString() {
+        return "Style{" +
+                "isLegend=" + isLegend +
+                ", isTooltip=" + isTooltip +
+                ", isDatazoom=" + isDatazoom +
+                ", isToolbox=" + isToolbox +
+                '}';
+    }
+}

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

@@ -14,14 +14,12 @@ public class ChartConfig {
     private String accessAuthority;   //访问权限
     private String updateAuthority;    //修改权限
     private String describes;           //描述
-    private int isLegend;           //图例
-    private int isTooltip;            //提示框
-    private int isDatazoom;           //缩放
-    private int isToolbox;            //工具箱
+    private String style;                //样式
     private String filters;          //筛选
     private String createDate; //数据类型
     private String updateDate; //数据类型
 
+
     public int getChartId() {
         return chartId;
     }
@@ -110,36 +108,12 @@ public class ChartConfig {
         this.describes = describes;
     }
 
-    public int getIsLegend() {
-        return isLegend;
-    }
-
-    public void setIsLegend(int isLegend) {
-        this.isLegend = isLegend;
-    }
-
-    public int getIsTooltip() {
-        return isTooltip;
-    }
-
-    public void setIsTooltip(int isTooltip) {
-        this.isTooltip = isTooltip;
-    }
-
-    public int getIsDatazoom() {
-        return isDatazoom;
-    }
-
-    public void setIsDatazoom(int isDatazoom) {
-        this.isDatazoom = isDatazoom;
-    }
-
-    public int getIsToolbox() {
-        return isToolbox;
+    public String getStyle() {
+        return style;
     }
 
-    public void setIsToolbox(int isToolbox) {
-        this.isToolbox = isToolbox;
+    public void setStyle(String style) {
+        this.style = style;
     }
 
     public String getFilters() {
@@ -189,13 +163,10 @@ public class ChartConfig {
                 ", accessAuthority='" + accessAuthority + '\'' +
                 ", updateAuthority='" + updateAuthority + '\'' +
                 ", describes='" + describes + '\'' +
-                ", isLegend=" + isLegend +
-                ", isTooltip=" + isTooltip +
-                ", isDatazoom=" + isDatazoom +
-                ", isToolbox=" + isToolbox +
+                ", style=" + style +
                 ", filters='" + filters + '\'' +
-                ", createDate=" + createDate +
-                ", updateDate=" + updateDate +
+                ", createDate='" + createDate + '\'' +
+                ", updateDate='" + updateDate + '\'' +
                 '}';
     }
 }

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

@@ -4,7 +4,7 @@ import com.model.bo.Column;
 
 import java.util.List;
 
-public class ChartConfigInfo<T> {
+public class ChartConfigInfo {
     private int chartId;
     private String chartName;
     private String tableName;
@@ -13,15 +13,12 @@ public class ChartConfigInfo<T> {
 //    private int dashboardsId;      //看板id
     private List<Column> groupBy;        //分组
     private List<Column> subsections;    //分段
-    private T chartConfig;
+    private String chartConfig;
     private String createBy;
     private List<String> accessAuthority;   //访问权限
     private List<String> updateAuthority;    //修改权限
     private String describes;           //描述
-    private int isLegend;           //图例
-    private int isTooltip;            //提示框
-    private int isDatazoom;           //缩放
-    private int isToolbox;            //工具箱
+    private String style;                //样式
     private List<Column> filters;          //筛选
 
     public int getChartId() {
@@ -40,6 +37,14 @@ public class ChartConfigInfo<T> {
         this.chartName = chartName;
     }
 
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
     public String getChartType() {
         return chartType;
     }
@@ -56,7 +61,6 @@ public class ChartConfigInfo<T> {
         this.dataId = dataId;
     }
 
-
     public List<Column> getGroupBy() {
         return groupBy;
     }
@@ -73,11 +77,11 @@ public class ChartConfigInfo<T> {
         this.subsections = subsections;
     }
 
-    public T getChartConfig() {
+    public String getChartConfig() {
         return chartConfig;
     }
 
-    public void setChartConfig(T chartConfig) {
+    public void setChartConfig(String chartConfig) {
         this.chartConfig = chartConfig;
     }
 
@@ -113,36 +117,12 @@ public class ChartConfigInfo<T> {
         this.describes = describes;
     }
 
-    public int getIsLegend() {
-        return isLegend;
-    }
-
-    public void setIsLegend(int isLegend) {
-        this.isLegend = isLegend;
-    }
-
-    public int getIsTooltip() {
-        return isTooltip;
-    }
-
-    public void setIsTooltip(int isTooltip) {
-        this.isTooltip = isTooltip;
+    public String getStyle() {
+        return style;
     }
 
-    public int getIsDatazoom() {
-        return isDatazoom;
-    }
-
-    public void setIsDatazoom(int isDatazoom) {
-        this.isDatazoom = isDatazoom;
-    }
-
-    public int getIsToolbox() {
-        return isToolbox;
-    }
-
-    public void setIsToolbox(int isToolbox) {
-        this.isToolbox = isToolbox;
+    public void setStyle(String style) {
+        this.style = style;
     }
 
     public List<Column> getFilters() {
@@ -153,14 +133,6 @@ public class ChartConfigInfo<T> {
         this.filters = filters;
     }
 
-    public String getTableName() {
-        return tableName;
-    }
-
-    public void setTableName(String tableName) {
-        this.tableName = tableName;
-    }
-
     @Override
     public String toString() {
         return "ChartConfigInfo{" +
@@ -171,15 +143,12 @@ public class ChartConfigInfo<T> {
                 ", dataId=" + dataId +
                 ", groupBy=" + groupBy +
                 ", subsections=" + subsections +
-                ", chartConfig=" + chartConfig +
+                ", chartConfig='" + chartConfig + '\'' +
                 ", createBy='" + createBy + '\'' +
                 ", accessAuthority=" + accessAuthority +
                 ", updateAuthority=" + updateAuthority +
                 ", describes='" + describes + '\'' +
-                ", isLegend=" + isLegend +
-                ", isTooltip=" + isTooltip +
-                ", isDatazoom=" + isDatazoom +
-                ", isToolbox=" + isToolbox +
+                ", style=" + style +
                 ", filters=" + filters +
                 '}';
     }

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

@@ -76,6 +76,13 @@ public class ChartsConfigService {
         String accessAuthority = null;
         String updateAuthority = null;
         String filters = null;
+        String style = null;
+
+        try {
+            style = objectmapper.writeValueAsString(chartConfigInfo.getStyle());
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
 
         try {
             groupBy = objectmapper.writeValueAsString(chartConfigInfo.getGroupBy());
@@ -119,9 +126,12 @@ public class ChartsConfigService {
         chartConfig.setAccessAuthority(accessAuthority);
         chartConfig.setUpdateAuthority(updateAuthority);
         chartConfig.setFilters(filters);
+        chartConfig.setStyle(style);
         chartConfig.setCreateDate(timeUtil.SystemTime());
 
         chartsConfigMapper.insertCharts(chartConfig);
+        int id = chartConfig.getChartId();
+        System.out.println(id);
 
         return new RepEntity(RepCode.success);
     }
@@ -141,6 +151,13 @@ public class ChartsConfigService {
         String accessAuthority = null;
         String updateAuthority = null;
         String filters = null;
+        String style = null;
+
+        try {
+            style = objectmapper.writeValueAsString(chartConfigInfo.getStyle());
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
 
         try {
             groupBy = objectmapper.writeValueAsString(chartConfigInfo.getGroupBy());
@@ -184,6 +201,7 @@ public class ChartsConfigService {
         chartConfig.setAccessAuthority(accessAuthority);
         chartConfig.setUpdateAuthority(updateAuthority);
         chartConfig.setFilters(filters);
+        chartConfig.setStyle(style);
         chartConfig.setUpdateDate(timeUtil.SystemTime());
 
         chartsConfigMapper.updateChartConfig(chartConfig);