From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java | 206 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 130 insertions(+), 76 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
index ed2f16c..d528900 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java
@@ -1,114 +1,168 @@
package com.dy.pipIrrGlobal.pojoMd;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import org.hibernate.validator.constraints.Length;
+
import java.util.Date;
/**
* @Author: liurunyu
- * @Date: 2025/8/6 10:51
+ * @Date: 2025/8/15 15:22
* @Description
*/
-public class MdCrops {
+@TableName(value="md_crops", autoResultMap = true)
+@Data
+@Builder
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(name = "浣滅墿瀹炰綋")
+public class MdCrops implements BaseEntity {
+
+ public static final long serialVersionUID = 202508061126001L;
/**
- * 涓婚敭
- */
- private Long id;
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableId(type = IdType.INPUT)
+ @Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Long id;
/**
- * 浣滅墿鍚嶇О
- */
- private String name;
+ * 鎸囧悜姘旇薄绔欏閿�
+ */
+ @Schema(description = "鍏宠仈鐨勬皵璞＄珯", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍏宠仈鐨勬皵璞＄珯涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ public Long weatherId;
/**
- * 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
- */
- private Date startDt;
+ * 浣滅墿鍚嶇О
+ */
+ @Schema(description = "浣滅墿鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "浣滅墿鍚嶇О涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Length(message = "浣滅墿鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
+ public String name;
/**
- * 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
- */
- private Date endDt;
+ * 璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ */
+ @Schema(description = "璁＄畻寮�濮嬫棩鏈燂紙涓�骞寸敓浣滅墿鏄妞嶆椂闂存垨鍑鸿娊鏃堕棿锛夛紝濡傛灉涓虹┖鍊煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(pattern = "MM-dd")
+ public String startDt;
/**
- * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
- */
- private Byte stopped;
+ * 璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd
+ */
+ @Schema(description = "璁＄畻鎴鏃ユ湡锛堜竴骞寸敓浣滅墿鏄仠姝㈢亴婧夋椂闂达級锛屽鏋滀负绌哄�煎垯涓洪暱涔呰绠楋紝鏍煎紡yyyy-mm-dd", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JsonFormat(pattern = "MM-dd")
+ public String endDt;
+
/**
- * 澶囨敞
- */
- private String remarks;
+ * 鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�
+ */
+ @Schema(description = "鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life1Start;
/**
- * 鏁版嵁璁板綍鍒涘缓鏃ユ湡锛屾牸寮弝yyy-mm-dd hh:mm:ss
- */
- private Date createDt;
+ * 鐢熼暱鍒濇湡缁撴潫澶╂暟
+ */
+ @Schema(description = "鐢熼暱鍒濇湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life1End;
/**
- * 鏄惁鍒犻櫎锛�1鏄紝0鍚�
- */
- private Byte deleted;
+ * 鐢熼暱鍒濇湡浣滅墿绯绘暟
+ */
+ @Schema(description = "鐢熼暱鍒濇湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double life1Factor ;
- public Long getId() {
- return id;
- }
+ /**
+ * 蹇�熺敓闀挎湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱鍒濇湡缁撴潫澶╂暟+1锛�
+ */
+ @Schema(description = "蹇�熺敓闀挎湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱鍒濇湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life2Start;
- public void setId(Long id) {
- this.id = id;
- }
+ /**
+ * 蹇�熺敓闀挎湡缁撴潫澶╂暟
+ */
+ @Schema(description = "蹇�熺敓闀挎湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life2End;
- public String getName() {
- return name;
- }
+ /**
+ * 蹇�熺敓闀挎湡浣滅墿绯绘暟
+ */
+ @Schema(description = "蹇�熺敓闀挎湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double life2Factor ;
- public void setName(String name) {
- this.name = name;
- }
+ /**
+ * 鐢熼暱涓湡寮�濮嬪ぉ鏁帮紙榛樿蹇�熺敓闀挎湡缁撴潫澶╂暟+1锛�
+ */
+ @Schema(description = "鐢熼暱涓湡寮�濮嬪ぉ鏁帮紙榛樿蹇�熺敓闀挎湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life3Start;
- public Date getStartDt() {
- return startDt;
- }
+ /**
+ * 鐢熼暱涓湡缁撴潫澶╂暟
+ */
+ @Schema(description = "鐢熼暱涓湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life3End;
- public void setStartDt(Date startDt) {
- this.startDt = startDt;
- }
+ /**
+ * 鐢熼暱涓湡浣滅墿绯绘暟
+ */
+ @Schema(description = "鐢熼暱涓湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double life3Factor ;
- public Date getEndDt() {
- return endDt;
- }
+ /**
+ * 鐢熼暱鏈湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱涓湡缁撴潫澶╂暟+1锛�
+ */
+ @Schema(description = "鐢熼暱鏈湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱涓湡缁撴潫澶╂暟+1锛�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life4Start;
- public void setEndDt(Date endDt) {
- this.endDt = endDt;
- }
+ /**
+ * 鐢熼暱鏈湡缁撴潫澶╂暟
+ */
+ @Schema(description = "鐢熼暱鏈湡缁撴潫澶╂暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Integer life4End;
- public Byte getStopped() {
- return stopped;
- }
+ /**
+ * 鐢熼暱鏈湡浣滅墿绯绘暟
+ */
+ @Schema(description = "鐢熼暱鏈湡浣滅墿绯绘暟", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Double life4Factor ;
- public void setStopped(Byte stopped) {
- this.stopped = stopped;
- }
+ /**
+ * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
+ */
+ @Schema(description = "鍋滄璁＄畻鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Byte stopped;
- public String getRemarks() {
- return remarks;
- }
+ /**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 100)
+ public String remarks;
- public void setRemarks(String remarks) {
- this.remarks = remarks;
- }
+ /**
+ * 鏁版嵁璁板綍鍒涘缓鏃ユ湡锛屾牸寮弝yyy-mm-dd hh:mm:ss
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ public Date createDt;
- public Date getCreateDt() {
- return createDt;
- }
+ /**
+ * 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
+ */
+ @Schema(description = "浣滅墿鍒犻櫎鏍囧織锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ public Byte deleted;
- public void setCreateDt(Date createDt) {
- this.createDt = createDt;
- }
-
- public Byte getDeleted() {
- return deleted;
- }
-
- public void setDeleted(Byte deleted) {
- this.deleted = deleted;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0