代码优化

iot-platform-common/src/main/java/com/platform/exception/GlobalExceptionHandler.java

@@ -80,7 +80,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(Exception.class)
     public BaseResult<Void> handleSystemException(Exception e, HttpServletRequest request) {
         // 打印异常日志
-        log.warn("数据库异常,请求路径：{}, 原因：{}", request.getRequestURI(), e.getMessage(), e);
+        log.warn("系统内部异常,请求路径：{}, 原因：{}", request.getRequestURI(), e.getMessage(), e);
         return BaseResult.error(ErrorCodeEnum.SYSTEM_ERROR.getCode(), "系统内部错误，请联系管理员");
     }
 
@@ -104,7 +104,7 @@ public class GlobalExceptionHandler {
             }
         }
         // 打印异常日志
-        log.warn("数据库异常,请求路径：{}, 原因：{}", request.getRequestURI(), e.getMessage());
+        log.warn("非法参数异常,请求路径：{}, 原因：{}", request.getRequestURI(), e.getMessage());
         return BaseResult.error(ErrorCodeEnum.PARAM_ERROR.getCode(), errorMsg.toString());
     }
 

iot-platform-common/src/main/java/com/platform/exception/PageResult.java

@@ -1,6 +1,8 @@
 package com.platform.exception;
 
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -11,6 +13,7 @@ import java.util.List;
  * Version: 1.0
  */
 
+@Data
 public class PageResult<T> implements Serializable {
 
     /** 总记录数 */

iot-platform-manager/src/main/java/com/platform/api/controller/TransferController.java

@@ -6,8 +6,10 @@ import com.platform.api.request.VehicleDataRequest;
 import com.platform.api.request.VehicleDataSaveRequest;
 import com.platform.api.response.VehicleDataResp;
 import com.platform.exception.BaseResult;
+import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,18 +25,18 @@ import java.util.List;
  */
 
 @RestController("api/transfer")
-@RequiredArgsConstructor
 public class TransferController {
 
-    private final TransferVehicleManage transferVehicleManage;
+    @Resource
+    private TransferVehicleManage transferVehicleManage;
 
     /**
      * 保存车辆数据
      */
     @PostMapping("/saveVehicleData")
     public BaseResult<Boolean> saveVehicleData(@RequestBody @Validated VehicleDataSaveRequest request) {
-            transferVehicleManage.saveVehicleData(request);
-            return BaseResult.success(true);
+        transferVehicleManage.saveVehicleData(request);
+        return BaseResult.success(true);
     }
 
     /**
@@ -49,7 +51,7 @@ public class TransferController {
      * 通过车牌查询实时经纬度
      */
     @PostMapping("/queryRealTimeLocation")
-    public BaseResult<VehicleDataResp> queryRealTimeLocation(@NotBlank(message = "车牌carNo不能为空")  @Validated String carNo) {
+    public BaseResult<VehicleDataResp> queryRealTimeLocation(@NotBlank(message = "车牌carNo不能为空") @Validated String carNo) {
         return BaseResult.success(transferVehicleManage.queryRealTimeLocation(carNo));
     }
 

iot-platform-manager/src/main/java/com/platform/api/manager/TransferVehicleManage.java

@@ -52,7 +52,6 @@ public class TransferVehicleManage implements ApplicationContextAware {
     @Resource
     private VehicleDataQueue vehicleDataQueue;
 
-    @Resource
     private ApplicationContext applicationContext;
 
     @Override

iot-platform-manager/src/main/java/com/platform/service/TaosService.java

@@ -3,7 +3,6 @@ package com.platform.service;
 import com.platform.api.request.VehicleDataRequest;
 import com.platform.api.request.VehicleDataSaveRequest;
 import com.platform.entity.VehicleTimeSeriesData;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

iot-platform-manager/src/main/java/com/platform/service/impl/TaosServiceImpl.java

@@ -6,6 +6,7 @@ import com.platform.api.request.VehicleDataSaveRequest;
 import com.platform.entity.VehicleTimeSeriesData;
 import com.platform.mapper.TaosMapper;
 import com.platform.service.TaosService;
+import jakarta.annotation.Resource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,7 +22,7 @@ import java.util.List;
 @Service
 public class TaosServiceImpl implements TaosService {
 
-    @Autowired
+    @Resource
     private TaosMapper taosMapper;
 
 

iot-platform-manager/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: iot-upgrade
+    name: iot-platform
   cloud:
     nacos:
       server-addr: 10.10.10.224:8848
@@ -17,6 +17,6 @@ spring:
         file-extension: yaml
         name: demo
         shared-configs:
-          - dataId: common.yaml
-            group: DEFAULT_GROUP
+          - dataId: common-iot.yaml
+            group: common-iot
             refresh: true

iot-platform-manager/src/main/resources/mapper/TaosMapper.xml

@@ -71,10 +71,10 @@
         WHERE
             w_order_no = #{wOrderNo}
             <if test="startTime != null">
-                AND ts >= #{startTime}
+                <![CDATA[ AND ts >= #{startTime} ]]>
             </if>
             <if test="endTime != null">
-                AND ts <= #{endTime}
+                <![CDATA[ AND ts <= #{endTime} ]]>
             </if>
         ORDER BY ts DESC
     </select>
@@ -97,10 +97,10 @@
         FROM  ${subTableName}
         WHERE 1=1
             <if test="startTime != null">
-                AND ts >= #{startTime}
+                <![CDATA[ AND ts >= #{startTime} ]]>
             </if>
             <if test="endTime != null">
-                AND ts <= #{endTime}
+                <![CDATA[ AND ts <= #{endTime} ]]>
             </if>
         ORDER BY ts DESC
     </select>