From e2a02c09b9d087a49ae5dd9f70856967390237de Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期五, 01 十一月 2024 16:54:23 +0800
Subject: [PATCH] 兼容机台自建配方，实时数据通过mqtt转发
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java | 189 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 171 insertions(+), 18 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 cd6a4b6..7ceb381 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,30 +1,38 @@
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.*;
+
@Data
@ToString
+@NoArgsConstructor
public class DryOrderVo {
/**id*/
@ApiModelProperty(value = "id")
- private Integer id;
- /**鎵规鏃堕棿*/
+ private String id;
+ /**宸ュ崟鏃堕棿*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鎵规鏃堕棿", example = "2023-03-01 12:11:10")
+ @ApiModelProperty(value = "宸ュ崟鏃堕棿", example = "2023-03-01 12:11:10")
private Date orderTime;
- /**鎵规鍙�*/
- @ApiModelProperty(value = "鎵规鍙�", example = "202303011211")
+ /**宸ュ崟鍙�*/
+ @ApiModelProperty(value = "宸ュ崟鍙�", example = "202303011211")
private String code;
/**鑽潗*/
@ApiModelProperty(value = "鑽潗", example = "1085571074")
- private Integer herbId;
+ private String herbId;
+ /**鑽潗鍚嶇О*/
+ @ApiModelProperty(value="鑽潗鍚嶇О", example = "浼哥瓔鑽�")
+ private String herbName;
/**鍒濆鍚按鐜�*/
@ApiModelProperty(value = "鍒濆鍚按鐜�", example = "75.51")
private Double initial;
@@ -32,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;
@@ -42,24 +52,167 @@
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 = "褰撳墠闃舵棰勮鍓╀綑鏃堕棿")
+ private Integer curRemain;
/**璁惧*/
- @ApiModelProperty(value = "璁惧", example = "")
- private Integer equId;
+ @ApiModelProperty(value = "璁惧", example = "S1001")
+ private String equId;
+ /**璁惧缂栧彿*/
+ @ApiModelProperty(value = "璁惧缂栧彿", example = "GM001")
+ private String machineCode;
/**杞﹂棿*/
- @ApiModelProperty(value = "杞﹂棿")
- private Integer shopId;
+ @ApiModelProperty(value = "杞﹂棿", example = "S1")
+ private String shopId;
/**绉熸埛id*/
- @ApiModelProperty(value = "绉熸埛id")
+ @ApiModelProperty(value = "绉熸埛id", example = "1000")
private Integer tenantId;
- /**鎵规鐘舵��*/
- @ApiModelProperty(value = "鎵规鐘舵��")
+ /**宸ュ崟鐘舵��
+ * 0: 鍑嗗
+ * 1: 涓婃枡
+ * 2: 鐢熶骇
+ * fan1: 骞茬嚗
+ * roller4: 缈绘枡
+ * roller5: 鍑烘枡
+ * 3: 鏆傚仠
+ * 4: 瀹屾垚
+ * */
+ @ApiModelProperty(value = "宸ュ崟鐘舵��")
private Integer orderStatus;
/**鎿嶄綔浜�*/
- @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+
@ApiModelProperty(value = "鎿嶄綔浜�")
private String operator;
+
+
+ /**钂告苯娑堣��*/
+ @ApiModelProperty(value = "钂告苯娑堣��")
+ private Double steam;
+
+ /**鐢佃兘娑堣��*/
+ @ApiModelProperty(value = "鐢佃兘娑堣��")
+ private Double watt;
+ /**鏁呴殰*/
+ @ApiModelProperty(value = "鏁呴殰")
+ private String fault;
+
+ private List<String> faultList = new ArrayList<>();
+
+ @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;
+
+ /**瀵规瘮鏈哄彴鍙�*/
+ private List<String> compEqpNum;
+
+ /**瀵规瘮鏈哄彴鏁堢巼*/
+ private List<Double> compEqpEffic;
+
+
+ /**鎺ョ鐘舵�� 0锛氳嚜鍔� 1锛氭墜鍔� */
+ private Integer state_auto;
+
+ /**椋庣鐘舵�� 0锛氫綆浣嶉潤姝� 1锛氶珮浣嶉潤姝� 2锛氭鍦ㄤ笂鍗� 3锛氭鍦ㄤ笅闄�*/
+ private Integer state_windbox;
+
+ /**婊氱瓛鐘舵�� 0锛氶珮浣嶉潤姝� 1锛氫綆浣嶉潤姝� 2锛氭鍦ㄤ笂鍗� 3锛氭鍦ㄤ笅闄� 4锛氭杞� 5锛氬弽杞�*/
+ private Integer state_roller;
+
+ /**椋庢満鐘舵�� 0锛氬叧闂� 1锛氬紑鍚�*/
+ private Integer state_fan;
+
+ /**钂告苯闃�鐘舵�� 0锛氬叧闂� 1锛氬紑鍚�*/
+ private Integer state_valve;
+
+ /**鎶ヨ**/
+ private String warning;
+
+ /**鐘舵��**/
+// private Map<String, Object> eqp_state;
+
+ /**璁惧鐘舵��**/
+ private String eqp_status;
+
+ private String level;
+
+ /**
+ * 骞茬嚗鍑忓皯閲嶉噺
+ */
+ private Double reduce;
+
+
+ /**骞冲潎鏁堢巼**/
+ private Double efficAvg;
+
+ /**骞冲潎姹借��**/
+ private Double steamAvg;
+
+ /**骞冲潎鐢佃��**/
+ private Double wattAvg;
+
+ 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();
+ this.watt = realTimeDataVo.getWatt();
+ this.steam = realTimeDataVo.getSteam();
+ this.envHum = realTimeDataVo.getEnvhum();
+ this.envTemp = realTimeDataVo.getEnvtemp();
+ this.remain = realTimeDataVo.getAi_total_time();
+ this.orderStatus = realTimeDataVo.getWorkorder_status();
+ }
}
--
Gitblit v1.9.3