[0924] 修复config_device, data_weather_local 表字段不同步引起的bug; 气象与灾害预警地图 菜单改名

forecast-backend-server/src/main/java/com/ufo/project/config/domain/ConfigDevice.java

@@ -1,19 +1,17 @@
 package com.ufo.project.config.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 import com.ufo.base.framework.aspectj.lang.annotation.Excel;
 
+import lombok.Data;
+
 /**
  * 设备对象 config_device
  *
  * @author ufo
  * @date 2026-08-06
  */
+@Data 
 public class ConfigDevice
 {
-    private static final long serialVersionUID = 1L;
 
     /** 主键 */
     private Long id;
@@ -32,9 +30,6 @@ public class ConfigDevice
     @Excel(name = "场站")
     private Long configStationId;
 
-    @Excel(name = "设备类型")
-    private String ilk;
-
     /**
      * Parent配置设备ID
      */
@@ -53,134 +48,4 @@ public class ConfigDevice
 
     private String remark;
 
-    
-
-    public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-
-
-	public Long getId() {
-		return id;
-	}
-
-
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-
-
-	public String getName() {
-		return name;
-	}
-
-
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-
-
-	public Long getConfigChannelId() {
-		return configChannelId;
-	}
-
-
-
-	public void setConfigChannelId(Long configChannelId) {
-		this.configChannelId = configChannelId;
-	}
-
-
-
-	public Long getConfigStationId() {
-		return configStationId;
-	}
-
-
-
-	public void setConfigStationId(Long configStationId) {
-		this.configStationId = configStationId;
-	}
-
-
-
-	public String getIlk() {
-		return ilk;
-	}
-
-
-
-	public void setIlk(String ilk) {
-		this.ilk = ilk;
-	}
-
-
-
-	public Long getConfigDeviceId() {
-		return configDeviceId;
-	}
-
-
-
-	public void setConfigDeviceId(Long configDeviceId) {
-		this.configDeviceId = configDeviceId;
-	}
-
-
-
-	public String getRemark() {
-		return remark;
-	}
-
-
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-
-
-	public String getStationName() {
-		return stationName;
-	}
-
-
-
-	public void setStationName(String stationName) {
-		this.stationName = stationName;
-	}
-
-
-
-	public String getChannelName() {
-		return channelName;
-	}
-
-
-
-	public void setChannelName(String channelName) {
-		this.channelName = channelName;
-	}
-
-
-
-	@Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("configChannelId", getConfigChannelId())
-            .append("configStationId", getConfigStationId())
-            .append("ilk", getIlk())
-            .append("configDeviceId", getConfigDeviceId())
-            .append("remark", getRemark())
-            .append("stationName", getStationName())
-            .append("channelName", getChannelName())
-            .toString();
-    }
 }

forecast-backend-server/src/main/java/com/ufo/project/weather/domain/DataWeatherLocal.java

@@ -5,15 +5,19 @@ import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import com.ufo.base.framework.aspectj.lang.annotation.DataSource;
 import com.ufo.base.framework.aspectj.lang.annotation.Excel;
 import com.ufo.base.framework.web.domain.BaseEntity;
-
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 /**
  * 本地气象采样数据对象 data_weather_local
  * 
  * @author oleauto
  * @date 2026-06-24
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class DataWeatherLocal extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -26,10 +30,6 @@ public class DataWeatherLocal extends BaseEntity
     @Excel(name = "场站id")
     private Long configStationId;
 
-    /** 水平面总辐照度，单位 W/m² */
-    @Excel(name = "水平面总辐照度，单位 W/m²")
-    private Double horizontalIrradiance;
-
     /** 斜面辐照度，单位 W/m² */
     @Excel(name = "斜面辐照度，单位 W/m²")
     private Double irradiance;
@@ -61,122 +61,4 @@ public class DataWeatherLocal extends BaseEntity
     /** 日累计辐照度，单位 W/m² */
     @Excel(name = "日累计辐照度，单位 W/m²")
     private Double dailyIrradiance;
-
-    public void setTm(Date tm) 
-    {
-        this.tm = tm;
-    }
-
-    public Date getTm() 
-    {
-        return tm;
-    }
-    public void setConfigStationId(Long configStationId)
-    {
-        this.configStationId = configStationId;
-    }
-
-    public Long getConfigStationId()
-    {
-        return configStationId;
-    }
-    public void setHorizontalIrradiance(Double horizontalIrradiance) 
-    {
-        this.horizontalIrradiance = horizontalIrradiance;
-    }
-
-    public Double getHorizontalIrradiance() 
-    {
-        return horizontalIrradiance;
-    }
-    public void setIrradiance(Double irradiance) 
-    {
-        this.irradiance = irradiance;
-    }
-
-    public Double getIrradiance()
-    {
-        return irradiance;
-    }
-    public void setTemperature(Double temperature) 
-    {
-        this.temperature = temperature;
-    }
-
-    public Double getTemperature() 
-    {
-        return temperature;
-    }
-    public void setPressure(Double pressure) 
-    {
-        this.pressure = pressure;
-    }
-
-    public Double getPressure() 
-    {
-        return pressure;
-    }
-    public void setHumidity(Double humidity) 
-    {
-        this.humidity = humidity;
-    }
-
-    public Double getHumidity() 
-    {
-        return humidity;
-    }
-    public void setWindSpeed(Double windSpeed) 
-    {
-        this.windSpeed = windSpeed;
-    }
-
-    public Double getWindSpeed() 
-    {
-        return windSpeed;
-    }
-    public void setWindDirection(Double windDirection) 
-    {
-        this.windDirection = windDirection;
-    }
-
-    public Double getWindDirection()
-    {
-        return windDirection;
-    }
-
-    public void setBoardTemperature(Double boardTemperature)
-    {
-        this.boardTemperature = boardTemperature;
-    }
-
-    public Double getBoardTemperature()
-    {
-        return boardTemperature;
-    }
-    public void setDailyIrradiance(Double dailyIrradiance)
-    {
-        this.dailyIrradiance = dailyIrradiance;
-    }
-
-    public Double getDailyIrradiance()
-    {
-        return dailyIrradiance;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("tm", getTm())
-            .append("deviceId", getConfigStationId())
-            .append("horizontalIrradiance", getHorizontalIrradiance())
-            .append("irradiance", getIrradiance())
-            .append("boardTemperature", getBoardTemperature())
-            .append("temperature", getTemperature())
-            .append("pressure", getPressure())
-            .append("humidity", getHumidity())
-            .append("windSpeed", getWindSpeed())
-            .append("windDirection", getWindDirection())
-            .append("dailyIrradiance", getDailyIrradiance())
-            .toString();
-    }
 }

forecast-backend-server/src/main/java/com/ufo/project/weather/service/impl/DataWeatherLocalServiceImpl.java

@@ -184,7 +184,7 @@ public class DataWeatherLocalServiceImpl implements IDataWeatherLocalService
     @Override
     public TirrChartResult getTirrChart(Long stationId, Long startTime, Long endTime)
     {
-        LocalCurvePoints cp = buildCurvePoints(stationId, startTime, endTime, DataWeatherLocal::getHorizontalIrradiance);
+        LocalCurvePoints cp = buildCurvePoints(stationId, startTime, endTime, DataWeatherLocal::getIrradiance);
         List<TirrChartStat> stats = new ArrayList<TirrChartStat>();
         for (Object[] point : cp.points)
         {

forecast-backend-server/src/main/resources/mybatis/config/ConfigDeviceMapper.xml

@@ -9,13 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="name"    column="name"    />
         <result property="configChannelId"    column="config_channel_id"    />
         <result property="configStationId"    column="config_station_id"    />
-        <result property="ilk"    column="ilk"    />
         <result property="configDeviceId"    column="config_device_id"    />
         <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectConfigDeviceVo">
-        select id, name, config_channel_id, config_station_id, ilk, config_device_id, remark from config_device
+        select id, name, config_channel_id, config_station_id, config_device_id, remark from config_device
     </sql>
 
     <select id="selectConfigDeviceList" parameterType="ConfigDevice" resultMap="ConfigDeviceResult">
@@ -24,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="configStationId != null"> and config_station_id = #{configStationId}</if>
             <if test="configChannelId != null"> and config_channel_id = #{configChannelId}</if>
             <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="ilk != null and ilk != ''"> and ilk = #{ilk}</if>
+            <if test="configDeviceId != null"> and config_device_id = #{configDeviceId}</if>
         </where>
         order by id desc
     </select>
@@ -57,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">name,</if>
             <if test="configChannelId != null">config_channel_id,</if>
             <if test="configStationId != null">config_station_id,</if>
-            <if test="ilk != null and ilk != ''">ilk,</if>
+            <if test="configDeviceId != null and configDeviceId != ''">config_device_id,</if>
             <if test="configDeviceId != null">config_device_id,</if>
             <if test="remark != null and remark != ''">remark,</if>
         </trim>
@@ -65,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">#{name},</if>
             <if test="configChannelId != null">#{configChannelId},</if>
             <if test="configStationId != null">#{configStationId},</if>
-            <if test="ilk != null and ilk != ''">#{ilk},</if>
+            <if test="configDeviceId != null and configDeviceId != ''">#{configDeviceId},</if>
             <if test="configDeviceId != null">#{configDeviceId},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
         </trim>
@@ -77,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null and name != ''">name = #{name},</if>
             <if test="configChannelId != null">config_channel_id = #{configChannelId},</if>
             <if test="configStationId != null">config_station_id = #{configStationId},</if>
-            <if test="ilk != null and ilk != ''">ilk = #{ilk},</if>
+            <if test="configDeviceId != null and configDeviceId != ''">config_device_id = #{configDeviceId},</if>
             <if test="configDeviceId != null">config_device_id = #{configDeviceId},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             update_time = CURRENT_TIMESTAMP,

forecast-backend-server/src/main/resources/mybatis/weather/DataWeatherLocalMapper.xml

@@ -7,20 +7,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="DataWeatherLocal" id="DataWeatherLocalResult">
         <result property="tm"    column="tm"    />
         <result property="configStationId"    column="config_station_id"    />
-        <result property="horizontalIrradiance"    column="horizontal_irradiance"    />
         <result property="irradiance"    column="irradiance"    />
+        <result property="inclinedIrradiance"    column="inclined_irradiance"    />
         <result property="boardTemperature"    column="board_temperature"    />
         <result property="temperature"    column="temperature"    />
         <result property="pressure"    column="pressure"    />
         <result property="humidity"    column="humidity"    />
         <result property="windSpeed"    column="wind_speed"    />
         <result property="windDirection"    column="wind_direction"    />
-        <result property="boardTemperature"    column="board_temperature"    />
         <result property="dailyIrradiance"    column="daily_irradiance"    />
     </resultMap>
 
     <sql id="selectDataWeatherLocalVo">
-        select tm, config_station_id, horizontal_irradiance, irradiance, temperature, pressure, humidity, wind_speed, wind_direction, board_temperature, daily_irradiance from data_weather_local
+        select tm, config_station_id, irradiance, inclined_irradiance, temperature, pressure, humidity, wind_speed, wind_direction, board_temperature, daily_irradiance from data_weather_local
     </sql>
 
     <select id="selectDataWeatherLocalList" parameterType="DataWeatherLocal" resultMap="DataWeatherLocalResult">
@@ -28,8 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="tm != null "> and tm = #{tm}</if>
             <if test="configStationId != null "> and config_station_id = #{configStationId}</if>
-            <if test="horizontalIrradiance != null "> and horizontal_irradiance = #{horizontalIrradiance}</if>
             <if test="irradiance != null "> and irradiance = #{irradiance}</if>
+            <if test="inclinedIrradiance != null "> and inclined_irradiance = #{inclinedIrradiance}</if>
             <if test="temperature != null "> and temperature = #{temperature}</if>
             <if test="pressure != null "> and pressure = #{pressure}</if>
             <if test="humidity != null "> and humidity = #{humidity}</if>
@@ -73,8 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="tm != null">tm,</if>
             <if test="configStationId != null">config_station_id,</if>
-            <if test="horizontalIrradiance != null">horizontal_irradiance,</if>
             <if test="irradiance != null">irradiance,</if>
+            <if test="inclinedIrradiance != null">inclined_irradiance,</if>
             <if test="boardTemperature != null">board_temperature,</if>
             <if test="temperature != null">temperature,</if>
             <if test="pressure != null">pressure,</if>
@@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tm != null">#{tm},</if>
             <if test="configStationId != null">#{configStationId},</if>
-            <if test="horizontalIrradiance != null">#{horizontalIrradiance},</if>
+            <if test="inclinedIrradiance != null">#{inclinedIrradiance},</if>
             <if test="irradiance != null">#{irradiance},</if>
             <if test="boardTemperature != null">#{boardTemperature},</if>
             <if test="temperature != null">#{temperature},</if>
@@ -104,8 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update data_weather_local
         <trim prefix="SET" suffixOverrides=",">
             <if test="configStationId != null">config_station_id = #{configStationId},</if>
-            <if test="horizontalIrradiance != null">horizontal_irradiance = #{horizontalIrradiance},</if>
             <if test="irradiance != null">irradiance = #{irradiance},</if>
+            <if test="inclinedIrradiance != null">inclined_irradiance = #{inclinedIrradiance},</if>
             <if test="boardTemperature != null">board_temperature = #{boardTemperature},</if>
             <if test="temperature != null">temperature = #{temperature},</if>
             <if test="pressure != null">pressure = #{pressure},</if>

release_note/20260924/20260924_dp.sql

@@ -39,4 +39,5 @@ WHERE NOT EXISTS (SELECT 1 FROM sys_role_menu t WHERE t.role_id = 1 AND t.menu_i
 
 -- 优化菜单名称
 update public.sys_menu set menu_name = '短期功率预测修正' where menu_name = '短期预测功率修正';
-update public.sys_menu set menu_name = '超短期功率预测修正' where menu_name = '超短期预测功率修正';
+update public.sys_menu set menu_name = '超短期功率预测修正' where menu_name = '超短期预测功率修正';
+update public.sys_menu set menu_name = '气象资源' where menu_name = '气象与灾害预警地图';