From c2fccb01b972176dc3da5a497b5e904025e9e98d Mon Sep 17 00:00:00 2001 From: bsw215583320 <baoshiwei121@163.com> Date: 星期二, 16 四月 2024 15:06:51 +0800 Subject: [PATCH] Merge branch 'master' of http://210.22.126.130:1111/r/dry/herb --- jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java | 88 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java new file mode 100644 index 0000000..1e26181 --- /dev/null +++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java @@ -0,0 +1,88 @@ +package org.jeecg.modules.dry.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@ToString +@NoArgsConstructor +public class DryOrderTrendVo { + + /**id*/ + @ApiModelProperty(value = "id") + private String id; + /**宸ュ崟*/ + @ApiModelProperty(value = "宸ュ崟鍙�") + private String orderId; + /**鍚按鐜�*/ + @ApiModelProperty(value = "鍚按鐜�", example = "33") + private Double moisture; + /**娓╁害*/ + @ApiModelProperty(value = "椋庢満娓╁害", example = "70") + private Double fanTemp; + /**椋庣娓╁害*/ + @ApiModelProperty(value = "椋庣娓╁害") + private Double bellowsTemp; + + /**鎬绘椂闂�*/ + @ApiModelProperty(value = "鎬绘椂闂�") + private Integer totalTime; + /**骞茬嚗鏃堕棿s*/ + @ApiModelProperty(value = "骞茬嚗鏃堕棿s") + private Integer dryTime; + /**缈绘枡娆℃暟*/ + @ApiModelProperty(value = "缈绘枡娆℃暟") + private Integer turn; + /**椋庢満棰戠巼*/ + @ApiModelProperty(value = "椋庢満棰戠巼") + private Double fanFrequency; + /**瀹炴椂閲嶉噺*/ + @ApiModelProperty(value = "瀹炴椂閲嶉噺") + private Double weight; + /**鐑1/鍐烽0*/ + @ApiModelProperty(value = "鐑1/鍐烽0") + private Integer wind; + /**鏃堕棿*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鏃堕棿", example = "2023-03-13 12:00:00") + private Date tim; + /**绉熸埛id*/ + @ApiModelProperty(value = "绉熸埛id", example = "1000") + private Integer tenantId; + + + /**钂告苯娑堣��*/ + @ApiModelProperty(value = "钂告苯娑堣��") + private Double steam; + + /**鐢佃兘娑堣��*/ + @ApiModelProperty(value = "鐢佃兘娑堣��") + private Double watt; + + + public DryOrderTrendVo(RealTimeDataVo realTimeDataVo) { + this.fanFrequency = realTimeDataVo.getFanfrq(); + this.weight = realTimeDataVo.getWeight3(); + this.moisture = realTimeDataVo.getMoisture2(); + this.fanTemp = realTimeDataVo.getTemp1(); + this.bellowsTemp = realTimeDataVo.getTemp2(); + this.dryTime = realTimeDataVo.getTime2(); + this.wind = realTimeDataVo.getWind()?1:0; + this.turn = realTimeDataVo.getTurntime(); + this.totalTime = realTimeDataVo.getTime3(); + this.orderId = realTimeDataVo.getOrderId(); + this.watt = realTimeDataVo.getWatt(); + this.steam = realTimeDataVo.getSteam(); + this.tim = new Date(); + } +} -- Gitblit v1.9.3