补充提交文件

device.json

@@ -1,80 +0,0 @@
-{
-  "name": "本地气象设备通道",
-  "description": "测试",
-  "devices": [
-    {
-      "slaveId": 1,
-      "name": "本地气象设备",
-      "model": "EM-3000",
-      "description": "",
-      "registers": [
-        {
-          "address": 0,
-          "area": "COIL",
-          "type": "BINARY",
-          "description": "设备运行/停止控制"
-        },
-        {
-          "address": 1,
-          "area": "COIL",
-          "type": "BINARY",
-          "description": "故障报警状态1"
-        },
-        {
-          "address": 2,
-          "area": "COIL",
-          "type": "BINARY",
-          "description": "故障报警状态2"
-        },
-        {
-          "address": 3,
-          "area": "COIL",
-          "type": "BINARY",
-          "description": "故障报警状态3"
-        },
-        {
-          "address": 30001,
-          "area": "INPUT",
-          "type": "TWO_BYTE_INT_UNSIGNED",
-          "description": "水平面总辐照度"
-        },
-        {
-          "address": 30002,
-          "area": "INPUT",
-          "type": "TWO_BYTE_INT_UNSIGNED",
-          "description": "斜面辐照度"
-        },
-        {
-          "address": 30003,
-          "area": "INPUT",
-          "type": "TWO_BYTE_INT_UNSIGNED",
-          "description": "温度"
-        },
-        {
-          "address": 30004,
-          "area": "INPUT",
-          "type": "TWO_BYTE_INT_UNSIGNED",
-          "description": "气压"
-        },
-        {
-          "address": 30005,
-          "area": "INPUT",
-          "type": "TWO_BYTE_INT_UNSIGNED",
-          "description": "湿度"
-        },
-        {
-          "address": 30006,
-          "area": "INPUT",
-          "type": "TWO_BYTE_INT_UNSIGNED",
-          "description": "风速"
-        },
-        {
-          "address": 30007,
-          "area": "INPUT",
-          "type": "TWO_BYTE_INT_UNSIGNED",
-          "description": "风向"
-        }
-      ]
-    }
-  ]
-}

forecast-dao/src/main/java/cn/oleauto/config/domain/ConfigWeatherLocal.java

@@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 配置data_electricity_local中的电气量来源对象 config_weather_local
- * 
+ *
  * @author oleauto
  * @date 2026-06-22
  */
@@ -23,17 +23,17 @@ public class ConfigWeatherLocal extends BaseEntity
     private Long configStationId;
 
     /** 水平面总辐照度测点配置
-    {
-    device_id:1
-    point_category:yc
-    point_code:xxx
-    } */
+     {
+     device_id:1
+     point_category:yc
+     point_code:xxx
+     } */
     @Excel(name = "水平面总辐照度测点配置{device_id:1, point_category:yc,point_code:xxx}")
     private String irradiance;
 
     /** 斜面辐照度测点配置 */
     @Excel(name = "斜面辐照度测点配置")
-    private String irradiance;
+    private String inclinedIrradiance;
 
     @Excel(name = "辐照度日累计测点配置")
     private String dailyIrradiance;
@@ -61,12 +61,12 @@ public class ConfigWeatherLocal extends BaseEntity
     @Excel(name = "风向测点配置")
     private String windDirection;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
@@ -88,57 +88,57 @@ public class ConfigWeatherLocal extends BaseEntity
     {
         return irradiance;
     }
-    public void setIrradiance(String irradiance) 
+    public void setInclinedIrradiance(String inclinedIrradiance)
     {
-        this.irradiance = irradiance;
+        this.inclinedIrradiance = inclinedIrradiance;
     }
 
-    public String getIrradiance() 
+    public String getInclinedIrradiance()
     {
-        return irradiance;
+        return inclinedIrradiance;
     }
-    public void setTemperature(String temperature) 
+    public void setTemperature(String temperature)
     {
         this.temperature = temperature;
     }
 
-    public String getTemperature() 
+    public String getTemperature()
     {
         return temperature;
     }
-    public void setPressure(String pressure) 
+    public void setPressure(String pressure)
     {
         this.pressure = pressure;
     }
 
-    public String getPressure() 
+    public String getPressure()
     {
         return pressure;
     }
-    public void setHumidity(String humidity) 
+    public void setHumidity(String humidity)
     {
         this.humidity = humidity;
     }
 
-    public String getHumidity() 
+    public String getHumidity()
     {
         return humidity;
     }
-    public void setWindSpeed(String windSpeed) 
+    public void setWindSpeed(String windSpeed)
     {
         this.windSpeed = windSpeed;
     }
 
-    public String getWindSpeed() 
+    public String getWindSpeed()
     {
         return windSpeed;
     }
-    public void setWindDirection(String windDirection) 
+    public void setWindDirection(String windDirection)
     {
         this.windDirection = windDirection;
     }
 
-    public String getWindDirection() 
+    public String getWindDirection()
     {
         return windDirection;
     }
@@ -162,19 +162,19 @@ public class ConfigWeatherLocal extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("configStationId", getConfigStationId())
-            .append("horizontalIrradiance", getIrradiance())
-            .append("irradiance", getIrradiance())
-            .append("temperature", getTemperature())
-            .append("pressure", getPressure())
-            .append("humidity", getHumidity())
-            .append("windSpeed", getWindSpeed())
-            .append("windDirection", getWindDirection())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .toString();
+                .append("id", getId())
+                .append("configStationId", getConfigStationId())
+                .append("horizontalIrradiance", getIrradiance())
+                .append("inclinedIrradiance", getInclinedIrradiance())
+                .append("temperature", getTemperature())
+                .append("pressure", getPressure())
+                .append("humidity", getHumidity())
+                .append("windSpeed", getWindSpeed())
+                .append("windDirection", getWindDirection())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("createBy", getCreateBy())
+                .append("updateBy", getUpdateBy())
+                .toString();
     }
 }

spark.txt

@@ -1,8 +0,0 @@
-For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG'
-Tomcat initialized with port 8080 (http)
-Starting service [Tomcat]
-Starting Servlet engine: [Apache Tomcat/11.0.22]
-Root WebApplicationContext: initialization completed in 812 ms
-Failed to set up a Bean Validation provider: jakarta.validation.NoProviderFoundException: Unable to create a Configuration, because no Jakarta Validation provider could be found. Add a provider like Hibernate Validator (RI) to your classpath.
-Tomcat started on port 8080 (http) with context path '/'
-Started SparkStudyApplication in 1.656 seconds (process running f