✨Feat: 增加编码时长统计

common/pom.xml

@@ -10,6 +10,7 @@
     </parent>
 
     <artifactId>common</artifactId>
+    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
@@ -25,4 +26,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

common/src/main/java/cn/hezhaohui/common/CardEnum.java

@@ -2,7 +2,8 @@ package cn.hezhaohui.common;
 
 public enum CardEnum {
     CARD_WEATHER("AAqxas5etOJDx", "1.0.5"),
-    CARD_MOVIE("AAqhYDej6RK7O", "1.0.1");
+    CARD_MOVIE("AAqhYDej6RK7O", "1.0.1"),
+    CARD_WAKATIME("AAqhg9UY0e2Ir", "1.0.1");
 
     private final String id;
     private final String versionName;

common/src/main/java/cn/hezhaohui/common/WakaTimeConstant.java

@@ -0,0 +1,8 @@
+package cn.hezhaohui.common;
+
+public class WakaTimeConstant {
+
+    public static final String WAKATIME_API_URL_PREFIX = "https://api.wakatime.com/api/v1/";
+    public static final String WAKATIME_API_URL_LAST_7_DAYS = WAKATIME_API_URL_PREFIX + "users/current/summaries?range=last_7_days";
+    public static final String WAKATIME_API_SECRET_KEY_BASE64 = "d2FrYV80MzYyZjQzMC1kY2Y4LTQ2YzktYjdkYy0yMjMwMjUxOTkwNWQ=";
+}

deploy.sh

@@ -28,32 +28,40 @@ if [ $? -ne 0 ]; then
 fi
 
 # 进入工作目录
-cd $WORK_DIR
+cd "$WORK_DIR" || { echo "无法进入工作目录"; exit 1; }
 
 # 打包各个模块
 echo "正在打包各个模块..."
 
+# 清理整个项目
+echo "清理项目..."
+mvn clean
+
 # 打包common模块（依赖）
 echo "打包common模块..."
-mvn clean package -pl common -am -DskipTests
+mvn install -pl common -am -DskipTests
 
 # 打包movie模块
 echo "打包movie模块..."
-mvn clean package -pl movie -am -DskipTests
+mvn package -pl movie -am -DskipTests
 
 # 打包weather模块
 echo "打包weather模块..."
-mvn clean package -pl weather -am -DskipTests
+mvn package -pl weather -am -DskipTests
 
 # 打包lark模块
 echo "打包lark模块..."
-mvn clean package -pl lark -am -DskipTests
+mvn package -pl lark -am -DskipTests
 
 if [ $? -ne 0 ]; then
     echo "错误：打包失败"
     exit 1
 fi
 
+# 清理旧部署文件
+echo "清理旧部署文件..."
+rm -f "$DEPLOY_DIR/lark.jar" "$DEPLOY_DIR/movie.jar" "$DEPLOY_DIR/weather.jar"
+
 # 复制jar包到部署目录
 echo "复制jar包到部署目录..."
 cp movie/target/movie-*.jar $DEPLOY_DIR/movie.jar

lark/pom.xml

@@ -12,6 +12,13 @@
     <artifactId>lark</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.hezhaohui</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -38,13 +45,6 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>cn.hezhaohui</groupId>
-            <artifactId>common</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <properties>
@@ -53,4 +53,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>cn.hezhaohui.lark.LarkApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

lark/src/main/java/cn/hezhaohui/lark/client/WakaTimeClient.java

@@ -0,0 +1,6 @@
+package cn.hezhaohui.lark.client;
+
+public interface WakaTimeClient {
+
+    String getLast7DaysData();
+}

lark/src/main/java/cn/hezhaohui/lark/client/impl/WakaTimeClientImpl.java

@@ -0,0 +1,18 @@
+package cn.hezhaohui.lark.client.impl;
+
+
+import cn.hezhaohui.common.WakaTimeConstant;
+import cn.hezhaohui.lark.client.WakaTimeClient;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WakaTimeClientImpl implements WakaTimeClient {
+    @Override
+    public String getLast7DaysData() {
+        HttpRequest request = HttpUtil.createGet(WakaTimeConstant.WAKATIME_API_URL_LAST_7_DAYS);
+        request.auth("Basic " + WakaTimeConstant.WAKATIME_API_SECRET_KEY_BASE64);
+        return request.execute().body();
+    }
+}

lark/src/main/java/cn/hezhaohui/lark/handler/EventListener.java

@@ -3,6 +3,7 @@ package cn.hezhaohui.lark.handler;
 import cn.hezhaohui.common.AppConstant;
 import cn.hezhaohui.common.CardEnum;
 import cn.hezhaohui.lark.service.MovieService;
+import cn.hezhaohui.lark.service.WakaTimeService;
 import cn.hezhaohui.pojo.entity.Weather;
 import cn.hezhaohui.lark.client.WeatherClient;
 import cn.hezhaohui.lark.util.BeanUtil;
@@ -48,6 +49,10 @@ public class EventListener {
                         MovieService movieService = BeanUtil.getBean(MovieService.class);
                         Map<String, Object> data = movieService.getMovies();
                         LarkUtil.sendCard(CardEnum.CARD_MOVIE, data);
+                    } else if (eventKey.equals("code")) {
+                        WakaTimeService wakaTimeService = BeanUtil.getBean(WakaTimeService.class);
+                        HashMap<String, Object> last7DaysCardData = wakaTimeService.getLast7DaysCardData();
+                        LarkUtil.sendCard(CardEnum.CARD_WAKATIME, last7DaysCardData);
                     }
                 }
             })

lark/src/main/java/cn/hezhaohui/lark/service/WakaTimeService.java

@@ -0,0 +1,126 @@
+package cn.hezhaohui.lark.service;
+
+import cn.hezhaohui.lark.client.WakaTimeClient;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class WakaTimeService {
+
+    @Resource
+    private WakaTimeClient wakaTimeClient;
+
+    public List<Map<String, Object>> getLast7DaysData() {
+        String last7DaysData = wakaTimeClient.getLast7DaysData();
+        JSONObject jsonObject = JSONUtil.parseObj(last7DaysData);
+        JSONArray dataArray = jsonObject.getJSONArray("data");
+        // Init
+        List<Map<String, Object>> dailyActivities = new ArrayList<>();
+        // Traverse
+        for (int i = 0; i < dataArray.size(); i++) {
+            JSONObject day = dataArray.getJSONObject(i);
+
+            // 获取日期
+            String date = day.getJSONObject("range").getStr("date");
+
+            // 获取当天编码时间
+            JSONObject grandTotal = day.getJSONObject("grand_total");
+            double total_seconds = grandTotal.getDouble("total_seconds");
+            int total_minutes = (int) (total_seconds / 60);
+
+            // Map 存储
+            Map<String, Object> activity = new HashMap<>();
+            activity.put("date", date);
+            activity.put("total_minutes", total_minutes);
+
+            dailyActivities.add(activity);
+
+        }
+
+        return dailyActivities;
+    }
+
+    public HashMap<String, Object> getLast7DaysCardData() {
+        List<Map<String, Object>> daysData = this.getLast7DaysData();
+        int totalMinutes = 0;
+        for (Map<String, Object> dayData : daysData) {
+            totalMinutes += (int) dayData.get("total_minutes");
+        }
+
+        HashMap<String, Object> cardData = new HashMap<>();
+        cardData.put("total_time", totalMinutes);
+        cardData.put("average_time", totalMinutes / 7);
+
+        // 图表
+        // 日期格式化器
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("M/d");
+        // 构造 values 数组
+        List<Map<String, Object>> valuesList = new ArrayList<>();
+        for (int i = 0; i < daysData.size(); i++) {
+            Map<String, Object> entry = daysData.get(i);
+            String originalDate = (String) entry.get("date");
+            Integer singleMinutes = (Integer) entry.get("total_minutes");
+            // 将 "2025-10-26" 转换为 "10/26"
+            LocalDate date = LocalDate.parse(originalDate);
+            String formattedDate = date.format(formatter);
+            // 构造数据项
+            Map<String, Object> item = new HashMap<>();
+            item.put("date", formattedDate);
+            item.put("day", "Day" + (i + 1)); // Day1, Day2, ...
+            item.put("minutes", singleMinutes);
+            valuesList.add(item);
+        }
+        // 构造 axes 数组
+        List<Map<String, Object>> axesList = new ArrayList<>();
+        // 构造第一个轴（y轴）
+        Map<String, Object> axisY = new HashMap<>();
+        axisY.put("orient", "left");
+        Map<String, Object> titleY = new HashMap<>();
+        titleY.put("text", "编码时长(分钟)");
+        axisY.put("title", titleY);
+        axesList.add(axisY);
+        // 构造第二个轴（x轴）
+        Map<String, Object> axisX = new HashMap<>();
+        axisX.put("orient", "bottom");
+        Map<String, Object> titleX = new HashMap<>();
+        titleX.put("text", "日期");
+        axisX.put("title", titleX);
+        axesList.add(axisX);
+        // 构造 data 对象
+        Map<String, Object> dataMap = new HashMap<>();
+        dataMap.put("values", valuesList);
+        // 构造 label
+        Map<String, Object> labelMap = new HashMap<>();
+        labelMap.put("visible", true);
+        // 构造 legends
+        Map<String, Object> legendsMap = new HashMap<>();
+        legendsMap.put("orient", "top");
+        legendsMap.put("visible", true);
+        // 构造 chartConfig 对象
+        Map<String, Object> chartConfig = new HashMap<>();
+        chartConfig.put("axes", axesList);
+        chartConfig.put("data", dataMap);
+        chartConfig.put("label", labelMap);
+        chartConfig.put("legends", legendsMap);
+        chartConfig.put("seriesField", "day");
+        chartConfig.put("title", new HashMap<>(Map.of("text", "每日编码时长(分钟)")));
+        chartConfig.put("type", "bar");
+        chartConfig.put("xField", "date");
+        chartConfig.put("yField", "minutes");
+
+        cardData.put("chart", chartConfig);
+
+        return cardData;
+
+    }
+}

lark/src/test/java/cn/hezhaohui/lark/client/impl/WakaTimeClientImplTest.java

@@ -0,0 +1,20 @@
+package cn.hezhaohui.lark.client.impl;
+
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest
+class WakaTimeClientImplTest {
+
+    @Resource
+    private WakaTimeClientImpl wakaTimeClient;
+
+    @Test
+    void getLast7DaysData() {
+        String last7DaysData = wakaTimeClient.getLast7DaysData();
+        System.out.println(last7DaysData);
+    }
+}

lark/src/test/java/cn/hezhaohui/lark/service/WakaTimeServiceTest.java

@@ -0,0 +1,32 @@
+package cn.hezhaohui.lark.service;
+
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@SpringBootTest
+class WakaTimeServiceTest {
+
+    @Resource
+    private WakaTimeService wakaTimeService;
+
+    @Test
+    void getLast7DaysData() {
+        List<Map<String, Object>> last7DaysData = wakaTimeService.getLast7DaysData();
+//        System.out.println(last7DaysData);
+        for (Map<String, Object> data : last7DaysData) {
+            System.out.println(data);
+        }
+    }
+
+    @Test
+    void getLast7DaysCardData() {
+        Map<String, Object> last7DaysCardData = wakaTimeService.getLast7DaysCardData();
+        System.out.println(last7DaysCardData);
+    }
+}

movie/pom.xml

@@ -12,6 +12,12 @@
     <artifactId>movie</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.hezhaohui</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -24,11 +30,7 @@
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
         </dependency>
-        <dependency>
+
-            <groupId>cn.hezhaohui</groupId>
-            <artifactId>common</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -45,4 +47,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>cn.hezhaohui.movie.MovieApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

pom.xml

@@ -53,14 +53,33 @@
     </dependencyManagement>
     <!-- 构建配置 -->
     <build>
+        <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.13.0</version>
+                    <configuration>
+                        <source>21</source>
+                        <target>21</target>
+                        <encoding>utf-8</encoding>
+                    </configuration>
+                </plugin>
                 <!-- 编译插件 -->
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
                     <version>3.2.2</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>repackage</goal>
+                            </goals>
+                        </execution>
+                    </executions>
                 </plugin>
             </plugins>
+        </pluginManagement>
     </build>
 
     <!-- Maven 属性 -->

weather/pom.xml

@@ -12,6 +12,12 @@
     <artifactId>weather</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>cn.hezhaohui</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -33,11 +39,7 @@
             <artifactId>hutool-all</artifactId>
             <version>5.8.27</version>
         </dependency>
-        <dependency>
+
-            <groupId>cn.hezhaohui</groupId>
-            <artifactId>common</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -50,4 +52,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>cn.hezhaohui.weather.WeatherApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>