温湿度设备预兼容，后面客户要加再完整修改

Documents/sql/aurora_dashboard_20251203.sql

@@ -0,0 +1,18 @@
+ALTER TABLE `dashboard_realtime_accumulate_day`
+    ADD COLUMN attr_code VARCHAR(50) DEFAULT 'single' COMMENT '一个属性的设备默认single，多属性的比如温湿度，则对应温度[temperature]，湿度[humidity]' AFTER device_id,
+    DROP INDEX uniq_device_date,
+    ADD UNIQUE INDEX uniq_device_attr_date(device_id, attr_code, date_year, date_month, date_day);
+
+ALTER TABLE `dashboard_record_accumulate`
+    ADD COLUMN attr_code VARCHAR(50) DEFAULT 'single' COMMENT '一个属性的设备默认single，多属性的比如温湿度，则对应温度[temperature]，湿度[humidity]' AFTER device_id,
+    ADD INDEX idx_device_attr_date(device_id, attr_code, date_year, date_month, date_day);
+    
+ALTER TABLE dashboard_realtime_measure 
+    DROP PRIMARY KEY,
+    ADD COLUMN attr_code VARCHAR(50) DEFAULT 'single' COMMENT '一个属性的设备默认single，多属性的比如温湿度，则对应温度[temperature]，湿度[humidity]' AFTER device_id,
+    ADD UNIQUE INDEX (device_id, attr_code);
+    
+ALTER TABLE dashboard_record_measure
+    ADD COLUMN attr_code VARCHAR(50) DEFAULT 'single' COMMENT '一个属性的设备默认single，多属性的比如温湿度，则对应温度[temperature]，湿度[humidity]' AFTER device_id,
+    ADD INDEX idx_device_attr_date (device_id, attr_code, date_year, date_month, date_day);
+

src/main/java/com/techsor/datacenter/sender/constants/DeviceAttrCode.java

@@ -0,0 +1,11 @@
+package com.techsor.datacenter.sender.constants;
+
+public class DeviceAttrCode {
+	
+	public static final String COMMON = "single";
+	
+	public static final String MEASURE_TEMPERATURE = "temperature";
+	
+	public static final String MEASURE_HUMIDITY = "humidity";
+
+}

src/main/java/com/techsor/datacenter/sender/dao/DashboardStatisticsDao.java

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.sql.Types;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,8 +89,8 @@ public class DashboardStatisticsDao {
 		// 批量 insert
 		auroraJdbcTemplate.batchUpdate(
 				"INSERT INTO dashboard_record_measure (" +
-						"device_id, date_year, date_month, date_day, date_hour, date_minute, date_second, upload_value, upload_at) " +
+						"device_id, date_year, date_month, date_day, date_hour, date_minute, date_second, upload_value, upload_at, attr_code) " +
-						"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+						"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
 				new BatchPreparedStatementSetter() {
 					public void setValues(PreparedStatement ps, int i) throws SQLException {
 						MeasureEvent e = list.get(i);
@@ -103,6 +104,7 @@ public class DashboardStatisticsDao {
 						ps.setInt(7, info.getSecondKey());
 						ps.setString(8, e.getUploadValue());
 						ps.setLong(9, info.getUploadAt());
+						ps.setString(10, e.getAttrCode());
 					}
 
 					public int getBatchSize() {
@@ -115,8 +117,8 @@ public class DashboardStatisticsDao {
 		auroraJdbcTemplate.batchUpdate(
 				"INSERT INTO dashboard_realtime_measure (" +
 						"device_id, date_year, date_month, date_day, date_hour, date_minute, date_second," +
-						"upload_value, min_value, max_value, upload_at) " +
+						"upload_value, min_value, max_value, upload_at, attr_code) " +
-						"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) " +
+						"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) " +
 						"ON DUPLICATE KEY UPDATE " +
 						"upload_value = VALUES(upload_value), " +
 						"min_value = VALUES(min_value)," +
@@ -138,6 +140,7 @@ public class DashboardStatisticsDao {
 						ps.setString(9, e.getMinValue().toString());
 						ps.setString(10, e.getMaxValue().toString());
 						ps.setLong(11, info.getUploadAt());
+						ps.setString(12, e.getAttrCode());
 					}
 
 					public int getBatchSize() {
@@ -195,8 +198,8 @@ public class DashboardStatisticsDao {
 		auroraJdbcTemplate.batchUpdate(
 				"INSERT INTO dashboard_record_accumulate (" +
 						"device_id, date_year, date_month, date_day, date_hour, date_minute, date_second, " +
-						"upload_value, increment_today, increment_minute, upload_at) " +
+						"upload_value, increment_today, increment_minute, upload_at, attr_code) " +
-						"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+						"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
 				new BatchPreparedStatementSetter() {
 
 					@Override
@@ -212,9 +215,10 @@ public class DashboardStatisticsDao {
 						ps.setInt(6, info.getMinuteKey());
 						ps.setInt(7, info.getSecondKey());
 						ps.setString(8, e.getUploadValue());
-						ps.setDouble(9, e.getIncrementToday());
+						ps.setDouble(9, e.getIncrementToday() != null ? e.getIncrementToday() : 0.0);
-						ps.setDouble(10, e.getIncrementMinute());
+						ps.setDouble(10, e.getIncrementMinute() != null ? e.getIncrementMinute() : 0.0);
 						ps.setLong(11, info.getUploadAt());
+						ps.setString(12, e.getAttrCode());
 					}
 
 					@Override
@@ -226,8 +230,8 @@ public class DashboardStatisticsDao {
 
 		auroraJdbcTemplate.batchUpdate(
 				"INSERT INTO dashboard_realtime_accumulate_day (" +
-						"device_id, date_year, date_month, date_day, upload_value, increment_today, upload_at) " +
+						"device_id, date_year, date_month, date_day, upload_value, increment_today, upload_at, attr_code) " +
-						"VALUES (?, ?, ?, ?, ?, ?, ?) " +
+						"VALUES (?, ?, ?, ?, ?, ?, ?, ?) " +
 						"ON DUPLICATE KEY UPDATE " +
 						"upload_value = VALUES(upload_value), " +
 						"increment_today = VALUES(increment_today), " +
@@ -246,6 +250,7 @@ public class DashboardStatisticsDao {
 						ps.setString(5, e.getUploadValue());
 						ps.setDouble(6, e.getIncrementToday());
 						ps.setLong(7, info.getUploadAt());
+						ps.setString(8, e.getAttrCode());
 					}
 
 					@Override

src/main/java/com/techsor/datacenter/sender/disruptor/AccumulateEvent.java

@@ -7,6 +7,7 @@ import lombok.Data;
 public class AccumulateEvent {
 
     private String deviceId;
+    private String attrCode;
     private String uploadValue;
     private Double incrementToday;
     private Double incrementMinute;
@@ -14,6 +15,7 @@ public class AccumulateEvent {
 
     public void clear() {
         deviceId = null;
+        attrCode = null;
         uploadValue = null;
         incrementToday = null;
         incrementMinute = null;

src/main/java/com/techsor/datacenter/sender/disruptor/AccumulateEventHandler.java

@@ -1,44 +1,23 @@
 package com.techsor.datacenter.sender.disruptor;
 
-import com.lmax.disruptor.EventHandler;
 import com.techsor.datacenter.sender.dao.DashboardStatisticsDao;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Slf4j
-public class AccumulateEventHandler implements EventHandler<AccumulateEvent> {
+public class AccumulateEventHandler extends BaseBatchEventHandler<AccumulateEvent> {
 
     private final DashboardStatisticsDao dao;
 
-    private final int batchSize;
-
-    private final List<AccumulateEvent> buffer;
-
-    private long lastFlushTime = System.currentTimeMillis();
-
     public AccumulateEventHandler(DashboardStatisticsDao dao, int batchSize) {
+        super(batchSize);
         this.dao = dao;
-        this.batchSize = batchSize;
-        this.buffer = new ArrayList<>(batchSize);
     }
 
     @Override
-    public void onEvent(AccumulateEvent e, long seq, boolean endOfBatch) {
+    protected AccumulateEvent copyOf(AccumulateEvent e) {
-        buffer.add(copyOf(e));
-
-        // 自动 flush：达到批量条数或超过 1 秒未 flush
-        if (buffer.size() >= batchSize || System.currentTimeMillis() - lastFlushTime > 1000) {
-            flush();
-        }
-
-        e.clear();
-    }
-
-    private AccumulateEvent copyOf(AccumulateEvent e) {
         AccumulateEvent a = new AccumulateEvent();
         a.setDeviceId(e.getDeviceId());
+        a.setAttrCode(e.getAttrCode());
         a.setUploadValue(e.getUploadValue());
         a.setIncrementToday(e.getIncrementToday());
         a.setIncrementMinute(e.getIncrementMinute());
@@ -46,24 +25,8 @@ public class AccumulateEventHandler implements EventHandler<AccumulateEvent> {
         return a;
     }
 
-    private void flush() {
-        if (buffer.isEmpty()) return;
-
-        try {
-            dao.accumulateBatchInsert(buffer);
-        } catch (Exception ex) {
-            log.error("accumulate batch DB failed", ex);
-        }
-
-        buffer.clear();
-        lastFlushTime = System.currentTimeMillis();
-    }
-
-    @Override
-    public void onStart() {}
-
     @Override
-    public void onShutdown() {
+    protected void flushToDb(java.util.List<AccumulateEvent> list) {
-        flush(); // 程序退出 flush
+        dao.accumulateBatchInsert(list);
     }
 }

src/main/java/com/techsor/datacenter/sender/disruptor/AccumulateService.java

@@ -11,7 +11,8 @@ public class AccumulateService {
 
     private final RingBuffer<AccumulateEvent> ringBuffer;
 
-    public void write(String uploadValue,
+    public void write(String attrCode,
+                      String uploadValue,
                       String deviceId,
                       Double incrementToday,
                       Double incrementMinute,
@@ -22,6 +23,7 @@ public class AccumulateService {
             AccumulateEvent event = ringBuffer.get(seq);
             event.setUploadValue(uploadValue);
             event.setDeviceId(deviceId);
+            event.setAttrCode(attrCode);
             event.setIncrementToday(incrementToday);
             event.setIncrementMinute(incrementMinute);
             event.setInfo(info);

src/main/java/com/techsor/datacenter/sender/disruptor/AlertEventHandler.java

@@ -1,65 +1,27 @@
 package com.techsor.datacenter.sender.disruptor;
 
-import com.lmax.disruptor.EventHandler;
 import com.techsor.datacenter.sender.dao.DashboardAlertDao;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Slf4j
-public class AlertEventHandler implements EventHandler<AlertEvent> {
+public class AlertEventHandler extends BaseBatchEventHandler<AlertEvent> {
 
     private final DashboardAlertDao dao;
 
-    private final int batchSize;
-
-    private final List<AlertEvent> buffer;
-
-    private long lastFlushTime = System.currentTimeMillis();
-
     public AlertEventHandler(DashboardAlertDao dao, int batchSize) {
+        super(batchSize);
         this.dao = dao;
-        this.batchSize = batchSize;
-        this.buffer = new ArrayList<>(batchSize);
     }
 
     @Override
-    public void onEvent(AlertEvent e, long seq, boolean endOfBatch) {
+    protected AlertEvent copyOf(AlertEvent e) {
-        buffer.add(copyOf(e));
-
-        // 自动 flush：达到批量条数或超过 1 秒未 flush
-        if (buffer.size() >= batchSize || System.currentTimeMillis() - lastFlushTime > 1000) {
-            flush();
-        }
-
-        e.clear();
-    }
-
-    private AlertEvent copyOf(AlertEvent e) {
         AlertEvent a = new AlertEvent();
         a.setEntity(e.getEntity());
         return a;
     }
 
-    private void flush() {
-        if (buffer.isEmpty()) return;
-
-        try {
-            dao.batchUpsertRawData(buffer);
-        } catch (Exception ex) {
-            log.error("alert batch DB failed", ex);
-        }
-
-        buffer.clear();
-        lastFlushTime = System.currentTimeMillis();
-    }
-
-    @Override
-    public void onStart() {}
-
     @Override
-    public void onShutdown() {
+    protected void flushToDb(java.util.List<AlertEvent> list) {
-        flush(); // 程序退出 flush
+        dao.batchUpsertRawData(list);
     }
 }

src/main/java/com/techsor/datacenter/sender/disruptor/BaseBatchEventHandler.java

@@ -0,0 +1,80 @@
+package com.techsor.datacenter.sender.disruptor;
+
+import com.lmax.disruptor.EventHandler;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 通用批量写库 Handler：支持 batchSize、定时 flush、线程安全
+ */
+@Slf4j
+public abstract class BaseBatchEventHandler<T> implements EventHandler<T> {
+
+    protected final int batchSize;
+
+    protected final List<T> buffer = new ArrayList<>();
+    private final Object lock = new Object();
+
+    public BaseBatchEventHandler(int batchSize) {
+        this.batchSize = batchSize;
+    }
+
+    // 子类实现写库逻辑
+    protected abstract void flushToDb(List<T> events);
+
+    // 子类负责 copy（避免对象复用覆盖）
+    protected abstract T copyOf(T e);
+
+    @Override
+    public void onEvent(T event, long seq, boolean endOfBatch) {
+        synchronized (lock) {
+            buffer.add(copyOf(event));
+
+            if (buffer.size() >= batchSize) {
+                flushLocked();
+            }
+        }
+    }
+
+    private void flushLocked() {
+        if (buffer.isEmpty()) return;
+
+        try {
+            flushToDb(buffer);
+        } catch (Exception ex) {
+            log.error("batch flush failed", ex);
+        }
+
+        buffer.clear();
+    }
+
+    protected void flush() {
+        synchronized (lock) {
+            flushLocked();
+        }
+    }
+
+    @Override
+    public void onStart() {
+        Thread flusher = new Thread(() -> {
+            while (true) {
+                try {
+                    Thread.sleep(1000);  // 每秒检查一次
+                    flush();
+                } catch (Exception e) {
+                    log.error("timer flush failed", e);
+                }
+            }
+        });
+
+        flusher.setDaemon(true);
+        flusher.start();
+    }
+
+    @Override
+    public void onShutdown() {
+        flush();
+    }
+}

src/main/java/com/techsor/datacenter/sender/disruptor/MeasureEvent.java

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
 public class MeasureEvent {
     private String uploadValue;
     private String deviceId;
+    private String attrCode;
     private StatisticsMeasureInfo info;
     private BigDecimal minValue;
     private BigDecimal maxValue;
@@ -16,6 +17,7 @@ public class MeasureEvent {
     public void clear() {
         uploadValue = null;
         deviceId = null;
+        attrCode = null;
         info = null;
         minValue = null;
         maxValue = null;

src/main/java/com/techsor/datacenter/sender/disruptor/MeasureEventHandler.java

@@ -1,69 +1,32 @@
 package com.techsor.datacenter.sender.disruptor;
 
-import com.lmax.disruptor.EventHandler;
 import com.techsor.datacenter.sender.dao.DashboardStatisticsDao;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Slf4j
-public class MeasureEventHandler implements EventHandler<MeasureEvent> {
+public class MeasureEventHandler extends BaseBatchEventHandler<MeasureEvent> {
 
     private final DashboardStatisticsDao dao;
 
-    private final int batchSize;
-
-    private final List<MeasureEvent> buffer;
-
-    private long lastFlushTime = System.currentTimeMillis();
-
     public MeasureEventHandler(DashboardStatisticsDao dao, int batchSize) {
+        super(batchSize);
         this.dao = dao;
-        this.batchSize = batchSize;
-        this.buffer = new ArrayList<>(batchSize);
     }
 
     @Override
-    public void onEvent(MeasureEvent e, long seq, boolean endOfBatch) {
+    protected MeasureEvent copyOf(MeasureEvent e) {
-        buffer.add(copyOf(e));
-
-        // 自动 flush
-        if (buffer.size() >= batchSize || System.currentTimeMillis() - lastFlushTime > 1000) {
-            flush();
-        }
-
-        e.clear();
-    }
-
-    private MeasureEvent copyOf(MeasureEvent e) {
         MeasureEvent m = new MeasureEvent();
         m.setUploadValue(e.getUploadValue());
         m.setDeviceId(e.getDeviceId());
+        m.setAttrCode(e.getAttrCode());
         m.setInfo(e.getInfo());
         m.setMinValue(e.getMinValue());
         m.setMaxValue(e.getMaxValue());
         return m;
     }
 
-    private void flush() {
-        if (buffer.isEmpty()) return;
-
-        try {
-            dao.measureBatchInsert(buffer);
-        } catch (Exception ex) {
-            log.error("batch DB failed", ex);
-        }
-
-        buffer.clear();
-        lastFlushTime = System.currentTimeMillis();
-    }
-
-    @Override
-    public void onStart() {}
-
     @Override
-    public void onShutdown() {
+    protected void flushToDb(java.util.List<MeasureEvent> list) {
-        flush(); // 程序退出 flush
+        dao.measureBatchInsert(list);
     }
 }

src/main/java/com/techsor/datacenter/sender/disruptor/MeasureService.java

@@ -13,7 +13,8 @@ public class MeasureService {
 
     private final RingBuffer<MeasureEvent> ringBuffer;
 
-    public void write(String uploadValue,
+    public void write(String attrCode,
+                      String uploadValue,
                       String deviceId,
                       StatisticsMeasureInfo info,
                       BigDecimal minValue,
@@ -24,6 +25,7 @@ public class MeasureService {
             MeasureEvent event = ringBuffer.get(seq);
             event.setUploadValue(uploadValue);
             event.setDeviceId(deviceId);
+            event.setAttrCode(attrCode);
             event.setInfo(info);
             event.setMinValue(minValue);
             event.setMaxValue(maxValue);

src/main/java/com/techsor/datacenter/sender/service/impl/DataProcessServiceImpl.java

@@ -20,6 +20,7 @@ import com.techsor.datacenter.sender.compiler.MvelExecutor;
 import com.techsor.datacenter.sender.components.GuavaRedisCache;
 import com.techsor.datacenter.sender.config.DataSourceContextHolder;
 import com.techsor.datacenter.sender.constants.Constants;
+import com.techsor.datacenter.sender.constants.DeviceAttrCode;
 import com.techsor.datacenter.sender.dao.*;
 import com.techsor.datacenter.sender.disruptor.AccumulateService;
 import com.techsor.datacenter.sender.disruptor.AlertService;
@@ -105,6 +106,9 @@ public class DataProcessServiceImpl implements IDataProcessService {
     @Value("${category.status.deviceTypeIds}")
     private List<Integer> statusTypeIds;
 
+    @Value("${category.temperature-humidity.deviceTypeIds}")
+    private List<Integer> temperatureHumidityTypeIds;
+
     // 所有设备类型ID集合
     public static final List<Integer> ALL_DEVICE_TYPE_IDS = new ArrayList<>();
 
@@ -670,21 +674,32 @@ public class DataProcessServiceImpl implements IDataProcessService {
 
     @Override
     public void minuteLevelStorage(DynamodbEntity baseTransDataEntity) throws Exception {
-    	String uploadValue = extractFirstValue(baseTransDataEntity.getRawData());
+        List<String> uploadValueList = extractAllValues(baseTransDataEntity.getRawData());
-        if (StringUtils.isBlank(uploadValue)) {
+        if (CollectionUtil.isEmpty(uploadValueList)) {
             return;
         }
-        
+        if (temperatureHumidityTypeIds.contains(baseTransDataEntity.getTypeId())) {
+            for (int i = 0; i < uploadValueList.size(); i++) {
+                String uploadValue = uploadValueList.get(i);
+                //温湿度的rawdata，一定是温度在前，湿度在后
+                if (0 == i) {
+                    storageMeasure(DeviceAttrCode.MEASURE_TEMPERATURE, uploadValue, baseTransDataEntity);
+                } else if (1 == i) {
+                    storageMeasure(DeviceAttrCode.MEASURE_HUMIDITY, uploadValue, baseTransDataEntity);
+                }
+            }
+        } else {
+            String uploadValue = uploadValueList.get(0);//这里只取第一个元素
             if (accumulateTypeIds.contains(baseTransDataEntity.getTypeId())) {
-        	storageAccumulate(uploadValue, baseTransDataEntity);
+                storageAccumulate(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity);
             }
-        
             if (measureTypeIds.contains(baseTransDataEntity.getTypeId())) {
-        	storageMeasure(uploadValue, baseTransDataEntity);
+                storageMeasure(DeviceAttrCode.COMMON, uploadValue, baseTransDataEntity);
+            }
         }
     }
 
-    private void storageMeasure(String uploadValue, DynamodbEntity baseTransDataEntity) throws Exception {
+    private void storageMeasure(String attrCode, String uploadValue, DynamodbEntity baseTransDataEntity) throws Exception {
         BigDecimal currentValue = new BigDecimal(uploadValue);
         BigDecimal minValue = currentValue;
         BigDecimal maxValue = currentValue;
@@ -694,6 +709,9 @@ public class DataProcessServiceImpl implements IDataProcessService {
 
         // 获取 Redis 数据
         String currentDayKey = Constants.STATISTICS_MEASURE_LATEST_PREFIX + complexTime.getDateKey();
+        if (!DeviceAttrCode.COMMON.equalsIgnoreCase(attrCode)) {
+
+        }
         Object currentDayInfoObj = this.redisTemplate.opsForHash().get(currentDayKey, baseTransDataEntity.getDeviceId());
 
         //比较值
@@ -724,11 +742,11 @@ public class DataProcessServiceImpl implements IDataProcessService {
         //历史表和实时表
 //    	dashboardStatisticsDao.insertDeviceMeasureInfo(uploadValue, baseTransDataEntity.getDeviceId(), currentInfo);
 //    	dashboardStatisticsDao.upsertDeviceRealtimeMeasure(uploadValue, baseTransDataEntity.getDeviceId(), minValue, maxValue, currentInfo);
-        measureService.write(uploadValue, baseTransDataEntity.getDeviceId(), currentInfo, minValue, maxValue);
+        measureService.write(attrCode, uploadValue, baseTransDataEntity.getDeviceId(), currentInfo, minValue, maxValue);
 
     }
 
-	private void storageAccumulate(String uploadValue, DynamodbEntity baseTransDataEntity) throws Exception {
+    private void storageAccumulate(String attrCode, String uploadValue, DynamodbEntity baseTransDataEntity) throws Exception {
         BigDecimal currentValue = new BigDecimal(uploadValue);
         Double incrementToday = null;
         Double incrementMinute = null;
@@ -747,9 +765,7 @@ public class DataProcessServiceImpl implements IDataProcessService {
         if (null != lastDayInfoObj) {
             StatisticsAccumulateInfo lastDayInfo = objectMapper.readValue(lastDayInfoObj.toString(), StatisticsAccumulateInfo.class);
             BigDecimal lastDayValue = new BigDecimal(lastDayInfo.getValue().toString());
-			if (ArithUtil.compareTo(currentValue, lastDayValue) >= 0) {
             incrementToday = ArithUtil.sub(currentValue, lastDayValue);
-			}
         } else {
             incrementToday = currentValue.doubleValue();
         }
@@ -789,23 +805,50 @@ public class DataProcessServiceImpl implements IDataProcessService {
         //历史表和日期实时表
 //    	dashboardStatisticsDao.insertDeviceAccumulateInfo(uploadValue, baseTransDataEntity.getDeviceId(), incrementToday, incrementMinute, currentInfo);
 //    	dashboardStatisticsDao.insertOrUpdateRealtimeAccumulateDay(uploadValue, baseTransDataEntity.getDeviceId(), incrementToday, currentInfo);
-        accumulateService.write(uploadValue, baseTransDataEntity.getDeviceId(), incrementToday, incrementMinute, currentInfo);
+        accumulateService.write(attrCode, uploadValue, baseTransDataEntity.getDeviceId(), incrementToday, incrementMinute, currentInfo);
     }
 
-    public String extractFirstValue(String rawData) {
+//    public String extractFirstValue(String rawData) {
+//		if (StringUtils.isBlank(rawData)){
+//			return "";
+//		}
+//		try {
+//			JsonNode node = objectMapper.readTree(rawData);
+//			Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
+//			if (fields.hasNext()) {
+//				return fields.next().getValue().asText();
+//			}
+//		} catch (Exception e) {
+//			log.error("Failed to parse rawData JSON: " + rawData, e);
+//		}
+//		return "";
+//	}
+
+    public List<String> extractAllValues(String rawData) {
+        List<String> result = new ArrayList<>();
+
         if (StringUtils.isBlank(rawData)) {
-			return "";
+            return result;
         }
+
         try {
             JsonNode node = objectMapper.readTree(rawData);
+
+            if (!node.isObject()) {
+                return result;
+            }
+
             Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
-			if (fields.hasNext()) {
+            while (fields.hasNext()) {
-				return fields.next().getValue().asText();
+                JsonNode valueNode = fields.next().getValue();
+                result.add(valueNode.isValueNode() ? valueNode.asText() : valueNode.toString());
             }
+
         } catch (Exception e) {
-			log.error("Failed to parse rawData JSON: " + rawData, e);
+            log.error("Failed to parse rawData JSON: {}", rawData, e);
         }
-		return "";
+
+        return result;
     }
 
 

src/main/resources/application-dev.properties

@@ -96,6 +96,8 @@ category.measure.deviceTypeIds=47,111,121
 category.accumulate.deviceTypeIds=48,112,122
 # 状态类设备类型ID
 category.status.deviceTypeIds=86,113,123
+# 温湿度设备类型ID
+category.temperature-humidity.deviceTypeIds=888888
 
 data.operation.batch-size=${dataOperationBatchSize:100}
 

src/main/resources/application-prd.properties

@@ -90,6 +90,8 @@ category.measure.deviceTypeIds=47,111,121
 category.accumulate.deviceTypeIds=48,112,122
 # 状态类设备类型ID
 category.status.deviceTypeIds=86,113,123
+# 温湿度设备类型ID
+category.temperature-humidity.deviceTypeIds=888888
 
 data.operation.batch-size=${dataOperationBatchSize:100}