更新 spider-data 统计图表数据

manager/src/main/java/cn/reghao/devops/manager/admin/controller/SpiderApiController.java

@@ -1,14 +1,16 @@
 package cn.reghao.devops.manager.admin.controller;
 
 import cn.reghao.devops.manager.admin.model.ChartData;
+import cn.reghao.devops.manager.admin.model.ChartResult;
 import cn.reghao.jutil.jdk.result.WebResult;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -18,20 +20,40 @@ import java.util.List;
  */
 @Slf4j
 @Api(tags = "spider api")
-@Controller
+@RestController
 @RequestMapping("/api/spider")
 public class SpiderApiController {
     @GetMapping(value = "/chart", produces = MediaType.APPLICATION_JSON_VALUE)
     public String spiderChart() {
+        List<String> xAxisNames = new ArrayList<>();
+        xAxisNames.add("Mon1");
+        xAxisNames.add("Tue1");
+        xAxisNames.add("Wed1");
+        xAxisNames.add("Thu1");
+        xAxisNames.add("Fri1");
+        xAxisNames.add("Sat1");
+        xAxisNames.add("Sun1");
+
+        LocalDate now = LocalDate.now();
+        int month = now.getMonthValue();
+        int day = now.getDayOfMonth();
+        String monthDay = String.format("%s-%s", month, day);
+        LocalDate pre1 = now.minusDays(1);
+
+        List<String> names = new ArrayList<>();
+        names.add("BiliVideoDataParser");
+        names.add("BiliCommentDataParser");
+
         List<ChartData> list = new ArrayList<>();
         List<Integer> data1 = List.of(2038, 120, 220, 214, 125, 117, 210);
-        ChartData chartData1 = new ChartData("npm", "line", data1);
+        ChartData chartData1 = new ChartData("BiliVideoDataParser", "line", data1);
         list.add(chartData1);
 
         List<Integer> data2 = List.of(135, 147, 150, 230, 224, 218, 2360);
-        ChartData chartData2 = new ChartData("dotnetCore", "line", data2);
+        ChartData chartData2 = new ChartData("BiliCommentDataParser", "line", data2);
         list.add(chartData2);
 
-        return WebResult.success(list);
+        ChartResult chartResult = new ChartResult(xAxisNames, names, list);
+        return WebResult.success(chartResult);
     }
 }

manager/src/main/java/cn/reghao/devops/manager/admin/model/ChartResult.java

@@ -0,0 +1,16 @@
+package cn.reghao.devops.manager.admin.model;
+
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author reghao
+ * @date 2023-12-04 13:50:44
+ */
+@AllArgsConstructor
+public class ChartResult {
+    private List<String> xAxisNames;
+    private List<String> names;
+    private List<ChartData> list;
+}

manager/src/main/resources/templates/admin/spider/chart.html

@@ -96,8 +96,6 @@
 <script th:src="@{/lib/echarts-4.7.0/echarts.js}" charset="utf-8"></script>
 <script type="text/javascript" th:inline="javascript">
     function chart1() {
-        //var chartZhu = echarts.init(document.getElementById('chart1'));
-        //指定图表配置项和数据
         var option = {
             xAxis: {
                 type: 'category',
@@ -109,24 +107,15 @@
             legend: {
                 data: ['npm', 'dotnetCore']
             },
-            series: [
-                /*{
-                    name: 'npm',
-                    type: 'line',
-                    data: [120, 220, 214, 238, 125, 117, 210],
-                },
-                {
-                    name: 'dotnetCore',
-                    type: 'line',
-                    data: [150, 230, 224, 218, 135, 147, 260],
-                }*/
-            ]
+            series: []
         };
 
-        //chartZhu.setOption(option, true);
         $.get('/api/spider/chart', function(result){
             if (result.code === 0) {
-                option.series = result.data
+                option.xAxis.data = result.data.xAxisNames
+                option.legend.data = result.data.names
+                option.series = result.data.list
+
                 var chart1 = echarts.init(document.getElementById('chart1'));
                 chart1.setOption(option, true);
             }
@@ -157,7 +146,7 @@
     chart2()
 
     function chart4() {
-        var option1 = {
+        var option = {
             tooltip: {
                 trigger: 'item'
             },
@@ -183,7 +172,7 @@
                     emphasis: {
                         label: {
                             show: true,
-                            fontSize: 40,
+                            fontSize: 18,
                             fontWeight: 'bold'
                         }
                     },
@@ -191,15 +180,15 @@
                         show: false
                     },
                     data: [
-                        { value: 7, name: 'DotNotCore' },
-                        { value: 3, name: 'NPM' }
+                        { value: 7, name: 'BiliVideoDataParser' },
+                        { value: 3, name: 'BiliCommentDataParser' }
                     ]
                 }
             ]
         };
 
-        var chart1 = echarts.init(document.getElementById('chart4'));
-        chart1.setOption(option1, true);
+        var chart4 = echarts.init(document.getElementById('chart4'));
+        chart4.setOption(option, true);
     }
     chart4()
 </script>