luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

灌溉控制器设备历史数据表字段添加

Browse Source
This commit is contained in:
蒾酒 2025-01-02 10:49:12 +08:00
parent 605e1d1499
commit f8dc8d154f
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java
View File

@ -47,4 +47,36 @@ private static final long serialVersionUID = 1L;
@ApiModelProperty("报文内容")
private String messageContent;
/** 瞬时流量 */
@Excel(name = "瞬时流量")
@ApiModelProperty("瞬时流量")
private String insFlow;
/** 累计流量 */
@Excel(name = "累计流量")
@ApiModelProperty("累计流量")
private String sumFlow;
/** 实时时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("实时时间")
private Date realTime;
/** 保存时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("保存时间")
private Date saveTime;
/** 累计用电量 */
@Excel(name = "累计用电量")
@ApiModelProperty("累计用电量")
private String sumEle;
/** 瞬时功率 */
@Excel(name = "瞬时功率")
@ApiModelProperty("瞬时功率")
private String insPower;
}

33
fastbee-service/fastbee-rechargecard-service/src/main/resources/mapper/rechargecard/NgWaterPumpUsageRecordsMapper.xml
View File

@ -10,10 +10,16 @@
<result property="pumpStopTime" column="pump_stop_time" />
<result property="deviceNumber" column="device_number" />
<result property="messageContent" column="message_content" />
<result property="insFlow" column="ins_flow" />
<result property="sumFlow" column="sum_flow" />
<result property="realTime" column="real_time" />
<result property="saveTime" column="save_time" />
<result property="sumEle" column="sum_ele" />
<result property="insPower" column="ins_power" />
</resultMap>
<sql id="selectNgWaterPumpUsageRecordsVo">
select id, pump_start_time, pump_stop_time, device_number, message_content from ng_water_pump_usage_records
select id, pump_start_time, pump_stop_time, device_number, message_content, ins_flow, sum_flow, real_time, save_time, sum_ele, ins_power from ng_water_pump_usage_records
</sql>
<select id="selectNgWaterPumpUsageRecordsList" parameterType="NgWaterPumpUsageRecords" resultMap="NgWaterPumpUsageRecordsResult">
@ -23,8 +29,13 @@
<if test="pumpStopTime != null "> and pump_stop_time = #{pumpStopTime}</if>
<if test="deviceNumber != null and deviceNumber != ''"> and device_number = #{deviceNumber}</if>
<if test="messageContent != null and messageContent != ''"> and message_content = #{messageContent}</if>
<if test="insFlow != null and insFlow != ''"> and ins_flow = #{insFlow}</if>
<if test="sumFlow != null and sumFlow != ''"> and sum_flow = #{sumFlow}</if>
<if test="realTime != null "> and real_time = #{realTime}</if>
<if test="saveTime != null "> and save_time = #{saveTime}</if>
<if test="sumEle != null and sumEle != ''"> and sum_ele = #{sumEle}</if>
<if test="insPower != null and insPower != ''"> and ins_power = #{insPower}</if>
</where>
order by pump_start_time desc
</select>
<select id="selectNgWaterPumpUsageRecordsById" parameterType="Long" resultMap="NgWaterPumpUsageRecordsResult">
@ -39,12 +50,24 @@
<if test="pumpStopTime != null">pump_stop_time,</if>
<if test="deviceNumber != null and deviceNumber != ''">device_number,</if>
<if test="messageContent != null">message_content,</if>
<if test="insFlow != null">ins_flow,</if>
<if test="sumFlow != null">sum_flow,</if>
<if test="realTime != null">real_time,</if>
<if test="saveTime != null">save_time,</if>
<if test="sumEle != null">sum_ele,</if>
<if test="insPower != null">ins_power,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="pumpStartTime != null">#{pumpStartTime},</if>
<if test="pumpStopTime != null">#{pumpStopTime},</if>
<if test="deviceNumber != null and deviceNumber != ''">#{deviceNumber},</if>
<if test="messageContent != null">#{messageContent},</if>
<if test="insFlow != null">#{insFlow},</if>
<if test="sumFlow != null">#{sumFlow},</if>
<if test="realTime != null">#{realTime},</if>
<if test="saveTime != null">#{saveTime},</if>
<if test="sumEle != null">#{sumEle},</if>
<if test="insPower != null">#{insPower},</if>
</trim>
</insert>
@ -55,6 +78,12 @@
<if test="pumpStopTime != null">pump_stop_time = #{pumpStopTime},</if>
<if test="deviceNumber != null and deviceNumber != ''">device_number = #{deviceNumber},</if>
<if test="messageContent != null">message_content = #{messageContent},</if>
<if test="insFlow != null">ins_flow = #{insFlow},</if>
<if test="sumFlow != null">sum_flow = #{sumFlow},</if>
<if test="realTime != null">real_time = #{realTime},</if>
<if test="saveTime != null">save_time = #{saveTime},</if>
<if test="sumEle != null">sum_ele = #{sumEle},</if>
<if test="insPower != null">ins_power = #{insPower},</if>
</trim>
where id = #{id}
</update>