瀏覽代碼

[0924] 增加 inclined_irradiance 字段

taosj 1 月之前
父節點
當前提交
ea4a576d88

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

@@ -31,9 +31,13 @@ public class DataWeatherLocal extends BaseEntity
     private Long configStationId;
 
     /** 斜面辐照度,单位 W/m² */
-    @Excel(name = "斜面辐照度,单位 W/m²")
+    @Excel(name = "总辐照度,单位 W/m²")
     private Double irradiance;
 
+    /** 斜面辐照度,单位 W/m² */
+    @Excel(name = "斜面辐照度,单位 W/m²")
+    private Double inclinedIrradiance;
+
     /** 温度,单位 ℃ */
     @Excel(name = "温度,单位 ℃")
     private Double temperature;

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

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tm"    column="tm"    />
         <result property="configStationId"    column="config_station_id"    />
         <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"    />
@@ -18,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDataWeatherLocalVo">
-        select tm, config_station_id, 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">
@@ -27,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tm != null "> and tm = #{tm}</if>
             <if test="configStationId != null "> and config_station_id = #{configStationId}</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>
@@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tm != null">tm,</if>
             <if test="configStationId != null">config_station_id,</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>
@@ -83,6 +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="inclinedIrradiance != null">#{inclinedIrradiance},</if> 
             <if test="irradiance != null">#{irradiance},</if>
             <if test="boardTemperature != null">#{boardTemperature},</if>
             <if test="temperature != null">#{temperature},</if>
@@ -100,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="configStationId != null">config_station_id = #{configStationId},</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>