Merge branch 'master' of http://36.141.74.62:4888/yeguanglin/forecast

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

doc/数据库脚本/gateway-data.sql

@@ -13,8 +13,8 @@ INSERT INTO public.config_station (id, station_name,station_code,superior_area_i
     (1, '江门','JMJD01','EAST01',0,'124','37','370000','370000','广东省',120000,120000,75,12.500000,'2026-7-6','110KV','121.2223','38.9087','张工','13800000000',true,1,1,true,false,'admin','2026-07-01 13:23:25.447','admin','2026-07-01 13:23:25.447',0,'','EAST01');
 
 ---- 设备数据
-INSERT INTO config_device (id, name,config_channel_id,config_station_id,ilk,config_device_id,remark) VALUES (1, '电气设备',1,'1','ELEC',NULL,'Demo');
-INSERT INTO config_device (id, name,config_channel_id,config_station_id,ilk,config_device_id,remark) VALUES (2, '气象设备',1,'1','ELEC',NULL,'Demo');
+INSERT INTO public.config_device VALUES (1, '电气设备', 1, '1', 'ELEC', 'brand1', 'model1', 'serial1', 'GOOD', '2026-09-01', NULL, '', '2026-09-01 14:41:10.415056', '2026-09-01 14:41:10.415056', '', '');
+INSERT INTO public.config_device VALUES (2, '气象设备', 3, '1', 'WEAT', 'brand1', 'model1', 'serial1', 'GOOD', '2026-09-01', NULL, '', '2026-09-01 14:41:10.415056', '2026-09-01 14:41:10.415056', '', '');
 
 ---- 测点数据
 INSERT INTO public.config_point (name,code,addr,category,config_device_id,init_value,will_inverse,kb_composite,k,b,zero_filter,will_check_ud,up1,up2,down1,down2,hop_filter,lazy_tm,config_alarm_template_id,create_time,update_time,create_by,update_by) VALUES

doc/数据库脚本/gateway.sql

@@ -232,9 +232,11 @@ CREATE TABLE data_weather_local
 (
     tm                    TIMESTAMPTZ NOT NULL,
     config_station_id     bigint      NOT NULL,
-    horizontal_irradiance DOUBLE PRECISION,
+    irradiance DOUBLE PRECISION,
     inclined_irradiance   DOUBLE PRECISION,
+    daily_irradiance      DOUBLE PRECISION,
     temperature           DOUBLE PRECISION,
+    board_temperature     DOUBLE PRECISION,
     pressure              DOUBLE PRECISION,
     humidity              DOUBLE PRECISION,
     wind_speed            DOUBLE PRECISION,
@@ -252,12 +254,16 @@ ON COLUMN data_weather_local.tm          IS '时间戳（带时区）';
 COMMENT
 ON COLUMN data_weather_local.config_station_id           IS '场站ID';
 COMMENT
-ON COLUMN data_weather_local.horizontal_irradiance  IS '水平面总辐照度，单位 W/m²';
+ON COLUMN data_weather_local.irradiance  IS '水平面总辐照度，单位 W/m²';
 COMMENT
 ON COLUMN data_weather_local.inclined_irradiance    IS '斜面辐照度，单位 W/m²';
 COMMENT
+ON COLUMN data_weather_local.daily_irradiance    IS '日累计辐照度，单位 W/m²';
+COMMENT
 ON COLUMN data_weather_local.temperature         IS '温度，单位 ℃';
 COMMENT
+ON COLUMN data_weather_local.board_temperature         IS '组件温度，单位 ℃';
+COMMENT
 ON COLUMN data_weather_local.pressure            IS '气压，单位 hPa';
 COMMENT
 ON COLUMN data_weather_local.humidity            IS '湿度，单位 %';

gateway/forecast-device-gateway/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8083
 spring:
   application:
     name: forecast-device-gateway