Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131

# Conflicts:
#	iot-platform-manager/src/main/java/com/platform/mapper/TaosMapper.java

iot-platform-manager/pom.xml

@@ -41,25 +41,25 @@
             <scope>test</scope>
         </dependency>
         <!-- 添加业务相关依赖 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <!-- Nacos Discovery -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+<!--        </dependency>-->
 
         <!-- Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.cloud</groupId>-->
+<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter</artifactId>
@@ -87,6 +87,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -46,10 +46,14 @@ public class WeighbridgeRecordManage {
                 request.getGrossWeight(), 
                 request.getTimestamp());
         LicensePlateValidateResponse licensePlateValidateResponse = new LicensePlateValidateResponse();
+        //查询车牌是否在验证列表中
+        ValidateLicensePlate validateLicensePlate = validateLicensePlateService.queryByLicensePlate(request.getLicensePlate());
         try {
             // 构建实体对象
             WeighbridgeRecord record = buildWeighbridgeRecord(request);
-
+            if(Objects.isNull(validateLicensePlate)){
+                record.setCheckStatus(1);
+            }
             // 保存到数据库
             boolean saved = weighbridgeRecordService.save(record);
             
@@ -104,6 +108,7 @@ public class WeighbridgeRecordManage {
 
         // 时间戳转换：自动识别秒/毫秒
         LocalDateTime weighTime = convertTimestamp(request.getTimestamp());
+        log.info("称重时间戳:{};转换 - 时间: {}",request.getTimestamp(), weighTime);
         record.setWeighTime(weighTime);
 
         // 处理图片文件名（仅保存文件名，逗号分隔）

iot-platform-manager/src/main/java/com/platform/entity/WeighbridgeRecord.java

@@ -18,7 +18,7 @@ public class WeighbridgeRecord {
     /**
      * 主键ID
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     /**
@@ -33,6 +33,12 @@ public class WeighbridgeRecord {
     @TableField("weighbridge_code")
     private String weighbridgeCode;
 
+    /**
+     * 校验状态
+     */
+    @TableField("check_status")
+    private Integer checkStatus;
+
     /**
      * 车牌号
      */

iot-platform-manager/src/main/java/com/platform/mapper/TaosMapper.java

@@ -0,0 +1,168 @@
+package com.platform.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.platform.api.request.VehicleDataSaveRequest;
+import com.platform.entity.VehicleTimeSeriesData;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @Author: donglang
+ * @CreateTime: 2025-10-09
+ * @Description: taosMapper
+ * @Version: 1.0
+ */
+
+@Mapper
+@DS("td")
+public interface TaosMapper {
+
+
+    /**
+     * 插入车辆数据超级表
+     * @return 插入成功的行数
+     */
+    int createVehicleDataTable();
+
+    /**
+     * 插入车辆数据到时序子表
+     * 子表名规则：vehicle_${tenantId}_${deviceId}（基于租户ID+设备ID，确保唯一）
+     * @param vehicleDataList 车辆数据实体
+     * @return 插入成功的行数
+     */
+    int batchInsertVehicleData(List<VehicleDataSaveRequest> vehicleDataList);
+
+
+    /**
+     * 批量删除时序库数据
+     * @param uniqueKeys 唯一标识列表（carNo_ts）
+     */
+    void batchDelete(@Param("uniqueKeys") List<String> uniqueKeys);
+
+
+
+    /**
+     * 通过运单号查询时序数据
+
+     * @param wOrderNo 车辆数据实体
+     * @return 返回的车辆数据
+     */
+    List<VehicleTimeSeriesData> selectByWOrderNo(@Param("wOrderNo") String wOrderNo,
+                                                 @Param("startTime") LocalDateTime startTime,
+                                                 @Param("endTime") LocalDateTime endTime);
+
+    /**
+     * 通过车牌查询时序数据
+
+     * @param carNo 车辆数据实体
+     * @return 返回的车辆数据
+     */
+    List<VehicleTimeSeriesData> selectByCarNo(@Param("subTableName") String subTableName,
+                                              @Param("carNo") String carNo,
+                                              @Param("startTime") LocalDateTime startTime,
+                                              @Param("endTime") LocalDateTime endTime);
+
+    /**
+     * 通过车牌查询时序数据
+
+     * @param carNo 车辆数据实体
+     * @return 返回的车辆数据
+     */
+    VehicleTimeSeriesData selectRealTimeLocation(@Param("subTableName") String subTableName,
+                                                 @Param("carNo") String carNo);
+
+
+    /**
+     * 创建水表子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createWaterMeterSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+
+    /**
+     * 创建电表子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createElectricMeterSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建边坡检测子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createSlopeMonitorSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建视频监控子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createDeviceMonitorSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建矿卡子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createMineTruckMonitorSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建皮带称重数据子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createBeltScaleDataSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建环境检查子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createEnvironmentCheckSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建无人地磅子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createWeighbridgeDataSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建排放检测数据子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createEmissionDataSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建车辆数据子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createVehicleDataSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+    /**
+     * 创建装载机械数据子表
+     * @param code 产品编码
+     * @param deviceId 设备id
+     * @return
+     */
+    int createLoadingEquipmentDataSubTable(@Param("code") String code, @Param("deviceId") String deviceId);
+
+
+}

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

@@ -2,6 +2,7 @@ package com.platform.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.platform.entity.ValidateLicensePlate;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * @Author: cxf
@@ -13,4 +14,5 @@ public interface ValidateLicensePlateService extends IService<ValidateLicensePla
 
     ValidateLicensePlate queryByLicensePlate(String licensePlate, String uuid);
 
+    ValidateLicensePlate queryByLicensePlate( String licensePlate);
 }

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

@@ -25,4 +25,12 @@ public class ValidateLicensePlateServiceImpl extends ServiceImpl<ValidateLicense
                 .last("limit 1"));
     }
 
+    @Override
+    public ValidateLicensePlate queryByLicensePlate(String licensePlate) {
+        return getOne(Wrappers.<ValidateLicensePlate>lambdaQuery()
+                .eq(ValidateLicensePlate::getLicensePlate, licensePlate)
+                .eq(ValidateLicensePlate::getStatus, 0)
+                .last("limit 1"));
+    }
+
 }

iot-platform-manager/src/main/java/com/platform/utils/FileUtils.java

@@ -45,7 +45,7 @@ import java.util.Map;
 @Configuration
 public class FileUtils {
 
-    private static String BASE_DIR = "kll/uploads/";
+    private static String BASE_DIR = "kll/uploads/steel";
 
     //oss客户端连接
     private static OSS ossclient = null;
@@ -1364,58 +1364,5 @@ public class FileUtils {
         return byteImg;
     }
 
-    // 测试
-    public static void main(String[] args) throws FileNotFoundException {
-        //阿里云OSS账号自行到阿里云官网申请
-        String ossEndpoint = "XXX";
-        String accessId = "XXX";
-        String accessKey = "XXX";
-        String bucketName = "test";
-        // 初始化OSSClient
-//        OSS ossClient = AliyunOSSClientUtil.getOssClient(ossEndpoint, accessId, accessKey);
-        OSS ossClient = FileUtils.getOssClient(ossEndpoint, accessId, accessKey);
-
-
-        //测试创建多级目录
-        /*String tmpDir = "upload/2023/01/11/";
-        String folder = createFolder(ossClient, bucketName, tmpDir);
-        System.out.println("folder:"+folder);*/
-
-
-        //测试删除文件
-        /*String key="upload/2023/01/11/xxx.pdf";
-        deleteObject(ossClient,bucketName,key);*/
-
-
-        //测试上传文件
-        /*String pathAndname = "C:\\Users\\Administrator\\Desktop\\测试文件上传\\xxx.pdf";
-        File file = new File(pathAndname);
-        //原始文件名:带后缀
-        String oldfilename = file.getName();
-        //新文件名：带后缀
-        String newfilename = "9065df0f3ab72419b36d2dec088e11d6.pdf";//可以自行生成随机唯一文件名
-        String newpath = "C:\\Users\\Administrator\\Desktop\\upload\\2023\\01\\11\\";
-        String ossPath = newpath + newfilename;
-        InputStream is = new FileInputStream(file);
-        String absolutePath = uploadFileOss(ossClient, bucketName, ossPath, is, newfilename);
-        System.out.println("absolutePath:"+absolutePath);*/
-
-
-        //测试获取文件url
-        /*String key="upload/2023/01/11/9065df0f3ab72419b36d2dec088e11d6.pdf";
-        String url = getUrl(ossClient, bucketName, key);
-        System.out.println("url:"+url);*/
-
-
-        //测试获取上传对象
-        /*String key = "upload/2023/01/11/9065df0f3ab72419b36d2dec088e11d6.pdf";
-        getObject(ossClient, bucketName, key);*/
-
-
-        //测试下载文件到本地
-        /*String key = "upload/2023/01/11/9065df0f3ab72419b36d2dec088e11d6.pdf";
-        String localFilePath = "C:\\Users\\Administrator\\Desktop\\oss-download\\xxx.pdf";
-        downloadFileOss(ossClient, bucketName, key, localFilePath);*/
-    }
 
 }

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

@@ -1,25 +1,46 @@
 spring:
   application:
     name: iot-platform
-  cloud:
-    nacos:
-      server-addr: 10.10.10.224:8848
-      discovery:
-        namespace: iot
-        server-addr: 10.10.10.224:8848  # Nacos 服务器地址
+
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.10.10.221:3306/iot_manage
+    username: root
+    password: TFGhA6AkJesRP4ZT
+
+    druid: # Druid 【监控】相关配置
+      web-stat-filter:
         enabled: true
-        group: DEFAULT_GROUP
-      config:
-        namespace: iot
-        server-addr: 10.10.10.224:8848   # Nacos 配置中心地址
+      stat-view-servlet:
         enabled: true
-        group: DEFAULT_GROUP
-        file-extension: yaml
-        shared-configs:
-          - dataId: iot-manage.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        extension-configs:
-          - dataId: common.yaml
-            group: common
-            refresh: true
+        url-pattern: /druid/*
+        allow:           # 不配置表示全部允许
+        login-username:  # 未配置表示不启用登录
+        login-password:
+      filter:
+        stat:
+          enabled: true
+          log-slow-sql: true
+          slow-sql-millis: 100
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+file:
+  list:
+    oss: pdf,gif,jpg,jpeg,png,doc,docx,xls,xlsx,heic
+    aliyun: pdf,gif,jpg,jpeg,png,doc,docx,xls,xlsx
+    qiniu: pdf,gif,jpg,jpeg,png,doc,docx,xls,xlsx
+
+aliyun:
+  oss:
+    endpoint: oss-cn-chengdu.aliyuncs.com
+    accessKeyId: LTAI5tHq44Cn3p8qqPN7DKc1
+    secret: nQaRrRwlcIWD5jNBu9CZ14YZhaRbTG
+    bucket: saas-four

pom.xml

@@ -37,7 +37,7 @@
         <mybatis-plus.version>3.5.7</mybatis-plus.version>
         <hikaricp.version>5.0.1</hikaricp.version>
         <mysql-connector.version>8.0.33</mysql-connector.version>
-        <dynamic-datasource.version>4.2.0</dynamic-datasource.version>
+<!--        <dynamic-datasource.version>4.2.0</dynamic-datasource.version>-->
         <tdengine-jdbc.version>3.7.6</tdengine-jdbc.version>
         <easyexcel.version>3.3.4</easyexcel.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
@@ -70,11 +70,11 @@
 			</dependency>
 
 			<!-- 动态数据源依赖 -->
-			<dependency>
-				<groupId>com.baomidou</groupId>
-				<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
-				<version>${dynamic-datasource.version}</version>
-			</dependency>
+<!--			<dependency>-->
+<!--				<groupId>com.baomidou</groupId>-->
+<!--				<artifactId>dynamic-datasource-spring-boot3-starter</artifactId>-->
+<!--				<version>${dynamic-datasource.version}</version>-->
+<!--			</dependency>-->
 
 			<!-- TDengine 官方 Java 驱动 -->
 			<dependency>
@@ -146,6 +146,12 @@
 				<artifactId>hutool-extra</artifactId>
 				<version>${hutool.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.alibaba</groupId>
+				<artifactId>druid-spring-boot-starter</artifactId>
+				<version>1.2.24</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 	<build>

sql/2026/01/create_cxf.sql

@@ -1,8 +1,9 @@
 CREATE TABLE weighbridge_records (
-                                     `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                                     `id` BIGINT UNSIGNED NOT NULL COMMENT '主键ID',
                                      weighbridge_name VARCHAR(50) NOT NULL DEFAULT '' COMMENT '地磅名称',
                                      weighbridge_code VARCHAR(20) NOT NULL DEFAULT '' COMMENT '地磅编码',
                                      license_plate VARCHAR(20) NOT NULL DEFAULT '' COMMENT '车牌号',
+                                     check_status tinyint NOT NULL DEFAULT '0' COMMENT '审核状态，0=校验通过，1=校验不通过',
                                      weight DECIMAL(10,2) NOT NULL DEFAULT 0.00 COMMENT '重量（吨）',
                                      weigh_time DATETIME NOT NULL DEFAULT '1000-01-01 00:00:00' COMMENT '过磅时间',
                                      photo_urls VARCHAR(2048) DEFAULT '' COMMENT '过磅照片，存储图片 URL 多个地址用逗号隔开',