Merge branch 'dev'

src/main/java/com/kimgo/wepush/exceptions/DatabaseQueryException.java

@@ -0,0 +1,11 @@
+package com.kimgo.wepush.exceptions;
+
+public class DatabaseQueryException extends Exception {
+    public DatabaseQueryException(String message) {
+        super(message);
+    }
+
+    public DatabaseQueryException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/com/kimgo/wepush/service/HeartBeatService.java

@@ -2,40 +2,53 @@ package com.kimgo.wepush.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.kimgo.wepush.exceptions.DatabaseQueryException;
 import com.kimgo.wepush.mapper.DeviceInfoDAOMapper;
 import com.kimgo.wepush.model.DeviceInfo;
 import com.kimgo.wepush.model.DeviceInfoDAO;
 import com.kimgo.wepush.response.ServerResponseEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class HeartBeatService {
     private final Logger logger = LoggerFactory.getLogger(HeartBeatService.class);
     private final long TIME_OUT_PERIOD = 600;
-    @Autowired
+    private final TokenService tokenService;
-    TokenService tokenService;
+    private final DeviceInfoDAOMapper deviceInfoDAOMapper;
-    @Autowired
+
-    private DeviceInfoDAOMapper deviceInfoDAOMapper;
+    public HeartBeatService(TokenService tokenService, DeviceInfoDAOMapper deviceInfoDAOMapper) {
-    public ServerResponseEntity handleHeartbeatSignal(String accessToken,DeviceInfo deviceInfo) {
+        this.tokenService = tokenService;
+        this.deviceInfoDAOMapper = deviceInfoDAOMapper;
+    }
+
+    public ServerResponseEntity handleHeartbeatSignal(String accessToken, DeviceInfo deviceInfo) {
         String correctAccessToken = tokenService.getApiAccessToken();
-        logger.info("accessToken: {} correctAccessToken: {}",accessToken,correctAccessToken);
+        logger.info("accessToken: {} correctAccessToken: {}", accessToken, correctAccessToken);
-        if (!correctAccessToken.equals(accessToken)){
+        if (!correctAccessToken.equals(accessToken)) {
             return ServerResponseEntity.fail("Invalid accessToken");
         }
-        DeviceInfoDAO deviceInfoDAO = getDeviceInfoBySN(deviceInfo.getSN());
+        try {
-        logger.info("deviceInfoDAO: {}",deviceInfoDAO);
+            DeviceInfoDAO deviceInfoDAO = getDeviceInfoBySN(deviceInfo.getSN());
-        if (deviceInfoDAO == null) {
+            if (deviceInfoDAO == null) {
-            // 设备信息不存在，可能是无效的设备
+                // 设备信息不存在，可能是无效的设备
-            logger.info("device not find,start add device to mysql.");
+                logger.info("device not find,start add device to mysql.");
-            boolean isSuccess =  addDeviceInfo(deviceInfo);
+                boolean isSuccess = addDeviceInfo(deviceInfo);
-            if (isSuccess){
+                if (isSuccess) {
-                return ServerResponseEntity.success();
+                    return ServerResponseEntity.success();
-            } else {
+                } else {
-                logger.info("add to mysql error");
+                    logger.info("add to mysql error");
+                    return ServerResponseEntity.fail("server error,please check log.");
+                }
             }
+        } catch (DatabaseQueryException e) {
+            // 处理查询失败的情况
+            logger.error("Database query failed.", e);
+            return ServerResponseEntity.fail("Database query failed");
+        } catch (Exception e) {
+            logger.error("update client status error.");
+            return ServerResponseEntity.fail("Error updating client status");
         }
         try {
             updateClientStatus(deviceInfo);
@@ -65,10 +78,11 @@ public class HeartBeatService {
     }
 
     public boolean addDeviceInfo(DeviceInfo deviceInfo) {
+        logger.info("start add device. device info: {}", deviceInfo);
         try {
             DeviceInfoDAO deviceInfoDAO = convertToDeviceInfoDAO(deviceInfo);
             int result = deviceInfoDAOMapper.insert(deviceInfoDAO);
-            logger.info("result: {}",result);
+            logger.info("result: {}", result);
             return result > 0;
         } catch (Exception e) {
             logger.error("Error adding device info", e);
@@ -82,7 +96,7 @@ public class HeartBeatService {
      * @param SN 要查询的 SN。
      * @return 与 androidId 对应的 DeviceInfoDAO 对象，如果没有找到，则返回 null。
      */
-    public DeviceInfoDAO getDeviceInfoBySN(String SN) {
+    public DeviceInfoDAO getDeviceInfoBySN(String SN) throws DatabaseQueryException {
         QueryWrapper<DeviceInfoDAO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("sn", SN);
         try {
@@ -91,10 +105,11 @@ public class HeartBeatService {
                 logger.info("Data is queried in the database based on the SN");
                 return deviceInfoDAO;
             }
+            return null; // 数据不存在
         } catch (Exception e) {
             logger.error("Error querying device info by SN", e);
+            throw new DatabaseQueryException("Error querying device info by SN", e);
         }
-        return null;
     }
 
 

src/test/java/com/kimgo/wepush/service/HeartBeatServiceTest.java

@@ -14,10 +14,12 @@ class HeartBeatServiceTest {
     @Test
     void updateClientStatus() {
         DeviceInfo deviceInfo = new DeviceInfo();
+        System.out.printf(deviceInfo.toString());
     }
 
     @Test
     void addDeviceInfo() {
         DeviceInfo deviceInfo = new DeviceInfo();
+        System.out.printf(deviceInfo.toString());
     }
 }