From 88880cf067bf4d3aacdf9ba70353b731888cf9fe Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 27 三月 2023 10:57:30 +0800
Subject: [PATCH] 实时数据接口与移动端接口

---
 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java |   83 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
index 2ac9388..c4d9107 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
@@ -1,17 +1,20 @@
 package org.jeecg.modules.dry.vo;
 
+import cn.hutool.core.util.IdUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Data
 @ToString
+@NoArgsConstructor
 public class DryOrderVo {
     /**id*/
     @ApiModelProperty(value = "id")
@@ -27,6 +30,9 @@
     /**鑽潗*/
     @ApiModelProperty(value = "鑽潗", example = "1085571074")
     private String herbId;
+    /**鑽潗鍚嶇О*/
+    @ApiModelProperty(value="鑽潗鍚嶇О", example = "浼哥瓔鑽�")
+    private String herbName;
     /**鍒濆鍚按鐜�*/
     @ApiModelProperty(value = "鍒濆鍚按鐜�", example = "75.51")
     private Double initial;
@@ -34,8 +40,10 @@
     @ApiModelProperty(value = "鐩爣鍚按鐜�", example="12")
     private Double target;
     /**鎶曟枡閲�*/
-    @ApiModelProperty(value = "鎶曟枡閲�", example = "32")
-    private Double feed;
+    @ApiModelProperty(value = "鎶曟枡閲�", example = "16")
+    private Integer feed;
+    @ApiModelProperty(value = "鍒濆閲嶉噺")
+    private Double originWeight;
     /**棰勮骞茬嚗鏃堕棿*/
     @ApiModelProperty(value = "棰勮骞茬嚗鏃堕棿(min)", example = "120")
     private Integer et;
@@ -44,13 +52,31 @@
     private Double yield;
     /**骞茬嚗鏃堕棿*/
     @ApiModelProperty(value = "骞茬嚗鏃堕棿")
-    private Integer drying;
+    private Integer dryTime;
+    /**鐑娓╁害*/
+    @ApiModelProperty(value = "鐑娓╁害")
+    private Double windTemp;
+    /**鐜娓╁害*/
+    @ApiModelProperty(value = "鐜娓╁害")
+    private Double envTemp;
+    /**鐜婀垮害*/
+    @ApiModelProperty(value = "鐜婀垮害")
+    private Double envHum;
+    /**鑽℃枡寤舵椂ms*/
+    @ApiModelProperty(value = "鑽℃枡寤舵椂ms")
+    private Integer delay;
+    /**缈绘枡娆℃暟*/
+    @ApiModelProperty(value = "缈绘枡娆℃暟")
+    private Integer turn;
     /**棰勮鍓╀綑鏃堕棿*/
     @ApiModelProperty(value = "棰勮鍓╀綑鏃堕棿")
     private Integer remain;
     /**璁惧*/
     @ApiModelProperty(value = "璁惧", example = "S1001")
     private String equId;
+    /**璁惧缂栧彿*/
+    @ApiModelProperty(value = "璁惧缂栧彿", example = "GM001")
+    private String machineCode;
     /**杞﹂棿*/
     @ApiModelProperty(value = "杞﹂棿", example = "S1")
     private String shopId;
@@ -66,6 +92,49 @@
     private String operator;
 
 
-    @ApiModelProperty(value = "瀹炴椂鏄庣粏鏁版嵁")
-    private List<DryOrderTrendVo> DetailList;
+    @ApiModelProperty(value = "鏄庣粏鏁版嵁鍒楄〃")
+    private List<DryOrderTrendVo> detailList = new ArrayList<>();
+    @ApiModelProperty(value = "鏄庣粏")
+    private DryOrderTrendVo trendVo;
+
+    private Map<Integer, Double> bellowsTemp = new HashMap<>();
+
+    /**寮�濮嬪共鐖�*/
+    private Boolean start;
+    /**鑷姩 true/鎵嬪姩 false*/
+    private Boolean auto;
+    /**鏆傚仠鏍囧織 true/false*/
+    private Boolean stop;
+    /**涓婁綅鏈� true/PLC false*/
+    private Boolean plcdisable;
+    /**娓╁害杩囦綆 true/姝ｅ父 false*/
+    private Boolean lowalarm;
+    /**鐑 true/鍐烽 false*/
+    private Boolean wind;
+
+    public DryOrderVo(RealTimeDataVo realTimeDataVo) {
+        this.id = IdUtil.fastSimpleUUID();
+        this.code = realTimeDataVo.getWorkorder();
+        this.herbName = realTimeDataVo.getName();
+        this.delay = realTimeDataVo.getDelay();
+        this.turn = realTimeDataVo.getTurntime();
+        this.feed = realTimeDataVo.getWeight1();
+        this.originWeight = realTimeDataVo.getWeight2();
+        this.initial = realTimeDataVo.getMoisture1();
+        this.target = realTimeDataVo.getMoisture3();
+        this.windTemp = realTimeDataVo.getTemp3();
+        this.et = realTimeDataVo.getTime1();
+        this.dryTime = realTimeDataVo.getTime3();
+        this.start = realTimeDataVo.getStart();
+        this.auto = realTimeDataVo.getAuto();
+        this.stop = realTimeDataVo.getStop();
+        this.plcdisable = realTimeDataVo.getPlcdisable();
+        this.lowalarm = realTimeDataVo.getLowalarm();
+        this.wind = realTimeDataVo.getWind();
+        this.machineCode = realTimeDataVo.getMachineid();
+        this.tenantId = realTimeDataVo.getTenantid();
+        this.orderTime = new Date();
+        this.yield = realTimeDataVo.getWeight3();
+
+    }
 }

--
Gitblit v1.9.3