同步数据库的修改

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

@@ -29,16 +29,22 @@ public class ConfigWeatherLocal extends BaseEntity
     point_code:xxx
     } */
     @Excel(name = "水平面总辐照度测点配置{device_id:1, point_category:yc,point_code:xxx}")
-    private String horizontalIrradiance;
+    private String irradiance;
 
     /** 斜面辐照度测点配置 */
     @Excel(name = "斜面辐照度测点配置")
     private String inclinedIrradiance;
 
+    @Excel(name = "辐照度日累计测点配置")
+    private String dailyIrradiance;
+
     /** 温度测点配置 */
     @Excel(name = "温度测点配置")
     private String temperature;
 
+    @Excel(name="组件温度测点配置")
+    private String boardTemperature;
+
     /** 气压测点配置 */
     @Excel(name = "气压测点配置")
     private String pressure;
@@ -73,14 +79,14 @@ public class ConfigWeatherLocal extends BaseEntity
     {
         return configStationId;
     }
-    public void setHorizontalIrradiance(String horizontalIrradiance) 
+    public void setIrradiance(String irradiance)
     {
-        this.horizontalIrradiance = horizontalIrradiance;
+        this.irradiance = irradiance;
     }
 
-    public String getHorizontalIrradiance() 
+    public String getIrradiance()
     {
-        return horizontalIrradiance;
+        return irradiance;
     }
     public void setInclinedIrradiance(String inclinedIrradiance) 
     {
@@ -137,12 +143,28 @@ public class ConfigWeatherLocal extends BaseEntity
         return windDirection;
     }
 
+    public String getDailyIrradiance() {
+        return dailyIrradiance;
+    }
+
+    public void setDailyIrradiance(String dailyIrradiance) {
+        this.dailyIrradiance = dailyIrradiance;
+    }
+
+    public String getBoardTemperature() {
+        return boardTemperature;
+    }
+
+    public void setBoardTemperature(String boardTemperature) {
+        this.boardTemperature = boardTemperature;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("id", getId())
             .append("configStationId", getConfigStationId())
-            .append("horizontalIrradiance", getHorizontalIrradiance())
+            .append("horizontalIrradiance", getIrradiance())
             .append("inclinedIrradiance", getInclinedIrradiance())
             .append("temperature", getTemperature())
             .append("pressure", getPressure())

forecast-dao/src/main/java/cn/oleauto/data/domain/DataWeatherLocal.java

@@ -27,16 +27,24 @@ public class DataWeatherLocal extends BaseEntity
 
     /** 水平面总辐照度，单位 W/m² */
     @Excel(name = "水平面总辐照度，单位 W/m²")
-    private Double horizontalIrradiance;
+    private Double irradiance;
 
     /** 斜面辐照度，单位 W/m² */
     @Excel(name = "斜面辐照度，单位 W/m²")
     private Double inclinedIrradiance;
 
+    /** 辐照度日累计，单位 MJ/m² */
+    @Excel(name = "辐照度日累计，单位 MJ/m²")
+    private Double dailyIrradiance;
+
     /** 温度，单位 ℃ */
     @Excel(name = "温度，单位 ℃")
     private Double temperature;
 
+    /** 组件温度，单位 ℃ */
+    @Excel(name = "组件温度，单位 ℃")
+    private Double boardTemperature;
+
     /** 气压，单位 hPa */
     @Excel(name = "气压，单位 hPa")
     private Double pressure;
@@ -71,14 +79,14 @@ public class DataWeatherLocal extends BaseEntity
     {
         return configStationId;
     }
-    public void setHorizontalIrradiance(Double horizontalIrradiance) 
+    public void setIrradiance(Double irradiance)
     {
-        this.horizontalIrradiance = horizontalIrradiance;
+        this.irradiance = irradiance;
     }
 
-    public Double getHorizontalIrradiance() 
+    public Double getIrradiance()
     {
-        return horizontalIrradiance;
+        return irradiance;
     }
     public void setInclinedIrradiance(Double inclinedIrradiance) 
     {
@@ -89,6 +97,15 @@ public class DataWeatherLocal extends BaseEntity
     {
         return inclinedIrradiance;
     }
+    public void setDailyIrradiance(Double dailyIrradiance)
+    {
+        this.dailyIrradiance = dailyIrradiance;
+    }
+
+    public Double getDailyIrradiance()
+    {
+        return dailyIrradiance;
+    }
     public void setTemperature(Double temperature) 
     {
         this.temperature = temperature;
@@ -98,6 +115,15 @@ public class DataWeatherLocal extends BaseEntity
     {
         return temperature;
     }
+    public void setBoardTemperature(Double boardTemperature)
+    {
+        this.boardTemperature = boardTemperature;
+    }
+
+    public Double getBoardTemperature()
+    {
+        return boardTemperature;
+    }
     public void setPressure(Double pressure) 
     {
         this.pressure = pressure;
@@ -140,9 +166,11 @@ public class DataWeatherLocal extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("tm", getTm())
             .append("deviceId", getConfigStationId())
-            .append("horizontalIrradiance", getHorizontalIrradiance())
+            .append("irradiance", getIrradiance())
             .append("inclinedIrradiance", getInclinedIrradiance())
+            .append("dailyIrradiance", getDailyIrradiance())
             .append("temperature", getTemperature())
+            .append("boardTemperature", getBoardTemperature())
             .append("pressure", getPressure())
             .append("humidity", getHumidity())
             .append("windSpeed", getWindSpeed())

forecast-dao/src/main/resources/mapper/config/ConfigWeatherLocalMapper.xml

@@ -7,9 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="ConfigWeatherLocal" id="ConfigWeatherLocalResult">
         <result property="id"    column="id"    />
         <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="dailyIrradiance"    column="daily_irradiance"    />
         <result property="temperature"    column="temperature"    />
+        <result property="boardTemperature"    column="board_temperature"    />
         <result property="pressure"    column="pressure"    />
         <result property="humidity"    column="humidity"    />
         <result property="windSpeed"    column="wind_speed"    />
@@ -21,15 +23,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectConfigWeatherLocalVo">
-        select id, config_station_id, horizontal_irradiance, inclined_irradiance, temperature, pressure, humidity, wind_speed, wind_direction, create_time, update_time, create_by, update_by from config_weather_local
+        select id, config_station_id, irradiance, inclined_irradiance, daily_irradiance, temperature, board_temperature, pressure, humidity, wind_speed, wind_direction, create_time, update_time, create_by, update_by from config_weather_local
     </sql>
 
     <select id="selectConfigWeatherLocalList" parameterType="ConfigWeatherLocal" resultMap="ConfigWeatherLocalResult">
         <include refid="selectConfigWeatherLocalVo"/>
         <where>  
             <if test="configStationId != null  and configStationId != ''"> and config_station_id = #{configStationId}</if>
-            <if test="horizontalIrradiance != null  and horizontalIrradiance != ''"> and horizontal_irradiance = #{horizontalIrradiance}</if>
+            <if test="irradiance != null  and irradiance != ''"> and irradiance = #{irradiance}</if>
             <if test="inclinedIrradiance != null  and inclinedIrradiance != ''"> and inclined_irradiance = #{inclinedIrradiance}</if>
+            <if test="dailyIrradiance != null  and dailyIrradiance != ''"> and daily_irradiance = #{dailyIrradiance}</if>
             <if test="temperature != null  and temperature != ''"> and temperature = #{temperature}</if>
             <if test="pressure != null  and pressure != ''"> and pressure = #{pressure}</if>
             <if test="humidity != null  and humidity != ''"> and humidity = #{humidity}</if>
@@ -47,9 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into config_weather_local
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="configStationId != null and configStationId != ''">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="dailyIrradiance != null">daily_irradiance,</if>
             <if test="temperature != null">temperature,</if>
+            <if test="boardTemperature!=null">board_emperature,</if>
             <if test="pressure != null">pressure,</if>
             <if test="humidity != null">humidity,</if>
             <if test="windSpeed != null">wind_speed,</if>
@@ -61,9 +66,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="configStationId != null and configStationId != ''">#{configStationId},</if>
-            <if test="horizontalIrradiance != null">#{horizontalIrradiance},</if>
+            <if test="irradiance != null">#{irradiance},</if>
             <if test="inclinedIrradiance != null">#{inclinedIrradiance},</if>
+            <if test="dailyIrradiance != null">#{dailyIrradiance},</if>
             <if test="temperature != null">#{temperature},</if>
+            <if test="boardTemperature!=null">#{boardTemperature},</if>
             <if test="pressure != null">#{pressure},</if>
             <if test="humidity != null">#{humidity},</if>
             <if test="windSpeed != null">#{windSpeed},</if>
@@ -79,9 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update config_weather_local
         <trim prefix="SET" suffixOverrides=",">
             <if test="configStationId != null and configStationId != ''">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="dailyIrradiance != null">daily_irradiance = #{dailyIrradiance},</if>
             <if test="temperature != null">temperature = #{temperature},</if>
+            <if test="boardTemperature != null">board_temperature = #{boardTemperature},</if>
             <if test="pressure != null">pressure = #{pressure},</if>
             <if test="humidity != null">humidity = #{humidity},</if>
             <if test="windSpeed != null">wind_speed = #{windSpeed},</if>

forecast-dao/src/main/resources/mapper/data/DataWeatherLocalMapper.xml

@@ -7,9 +7,11 @@ 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="dailyIrradiance"    column="daily_irradiance"    />
         <result property="temperature"    column="temperature"    />
+        <result property="boardTemperature"    column="board_temperature"    />
         <result property="pressure"    column="pressure"    />
         <result property="humidity"    column="humidity"    />
         <result property="windSpeed"    column="wind_speed"    />
@@ -17,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDataWeatherLocalVo">
-        select tm, config_station_id, horizontal_irradiance, inclined_irradiance, temperature, pressure, humidity, wind_speed, wind_direction from data_weather_local
+        select tm, config_station_id, irradiance, inclined_irradiance, daily_irradiance, temperature, board_temperature, pressure, humidity, wind_speed, wind_direction from data_weather_local
     </sql>
 
     <select id="selectDataWeatherLocalList" parameterType="DataWeatherLocal" resultMap="DataWeatherLocalResult">
@@ -25,9 +27,11 @@ 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="dailyIrradiance != null "> and daily_irradiance = #{dailyIrradiance}</if>
             <if test="temperature != null "> and temperature = #{temperature}</if>
+            <if test="boardTemperature != null "> and board_temperature = #{boardTemperature}</if>
             <if test="pressure != null "> and pressure = #{pressure}</if>
             <if test="humidity != null "> and humidity = #{humidity}</if>
             <if test="windSpeed != null "> and wind_speed = #{windSpeed}</if>
@@ -45,9 +49,11 @@ 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="dailyIrradiance != null">daily_irradiance,</if>
             <if test="temperature != null">temperature,</if>
+            <if test="boardTemperature != null">board_temperature,</if>
             <if test="pressure != null">pressure,</if>
             <if test="humidity != null">humidity,</if>
             <if test="windSpeed != null">wind_speed,</if>
@@ -56,9 +62,11 @@ 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="irradiance != null">#{irradiance},</if>
             <if test="inclinedIrradiance != null">#{inclinedIrradiance},</if>
+            <if test="dailyIrradiance != null">#{dailyIrradiance},</if>
             <if test="temperature != null">#{temperature},</if>
+            <if test="boardTemperature != null">#{boardTemperature},</if>
             <if test="pressure != null">#{pressure},</if>
             <if test="humidity != null">#{humidity},</if>
             <if test="windSpeed != null">#{windSpeed},</if>
@@ -70,9 +78,11 @@ 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="dailyIrradiance != null">daily_irradiance = #{dailyIrradiance},</if>
             <if test="temperature != null">temperature = #{temperature},</if>
+            <if test="boardTemperature != null">board_temperature = #{boardTemperature},</if>
             <if test="pressure != null">pressure = #{pressure},</if>
             <if test="humidity != null">humidity = #{humidity},</if>
             <if test="windSpeed != null">wind_speed = #{windSpeed},</if>