From 6a4f68b8f99dca3a00c297cbcff82c065575212c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:25:20 +0800
Subject: [PATCH] 1、完善代码；2、作物去除lat属性，采用关联气象站的lat；3、project模块增加查询全部气象站的方法。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdCrops.java | 6 --
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java | 88 ++++++++++++++++++++++++++++-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml | 19 +-----
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java | 13 +++-
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/weather/WeatherCtrl.java | 24 ++++++++
5 files changed, 122 insertions(+), 28 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 290bc33..9e845ff 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
@@ -138,12 +138,6 @@
public Double life4Factor ;
/**
- * 绾害
- */
- @Schema(description = "绾害", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Double lat;
-
- /**
* 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
*/
@Schema(description = "鍋滄璁＄畻鏍囪瘑", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
index 29521b4..2704449 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoCrops.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -16,7 +17,9 @@
*/
@Data
-@JsonPropertyOrder({"id", "name", "startDt", "endDt", "stopped", "isStopped", "remarks", "createDt"})
+@JsonPropertyOrder({"id", "name", "startDt", "endDt",
+
+ "stopped", "stoppedStr", "remarks", "createDt"})
public class VoCrops implements Serializable {
public static final long serialVersionUID = 202508061124001L;
@@ -45,14 +48,74 @@
public String endDt;
/**
- * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
+ * 鐢熼暱鍒濇湡寮�濮嬪ぉ鏁帮紙榛樿鏄�1锛�
*/
- public Byte stopped;
+ public Integer life1Start;
+
+ /**
+ * 鐢熼暱鍒濇湡缁撴潫澶╂暟
+ */
+ public Integer life1End;
+
+ /**
+ * 鐢熼暱鍒濇湡浣滅墿绯绘暟
+ */
+ public Double life1Factor ;
+
+ /**
+ * 蹇�熺敓闀挎湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱鍒濇湡缁撴潫澶╂暟+1锛�
+ */
+ public Integer life2Start;
+
+ /**
+ * 蹇�熺敓闀挎湡缁撴潫澶╂暟
+ */
+ public Integer life2End;
+
+ /**
+ * 蹇�熺敓闀挎湡浣滅墿绯绘暟
+ */
+ public Double life2Factor ;
+
+ /**
+ * 鐢熼暱涓湡寮�濮嬪ぉ鏁帮紙榛樿蹇�熺敓闀挎湡缁撴潫澶╂暟+1锛�
+ */
+ public Integer life3Start;
+
+ /**
+ * 鐢熼暱涓湡缁撴潫澶╂暟
+ */
+ public Integer life3End;
+
+ /**
+ * 鐢熼暱涓湡浣滅墿绯绘暟
+ */
+ public Double life3Factor ;
+
+ /**
+ * 鐢熼暱鏈湡寮�濮嬪ぉ鏁帮紙榛樿鐢熼暱涓湡缁撴潫澶╂暟+1锛�
+ */
+ public Integer life4Start;
+
+ /**
+ * 鐢熼暱鏈湡缁撴潫澶╂暟
+ */
+ public Integer life4End;
+
+ /**
+ * 鐢熼暱鏈湡浣滅墿绯绘暟
+ */
+ public Double life4Factor ;
+
+ /**
+ * 绾害
+ */
+ public Double lat;
/**
* 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
*/
- public String stoppedStr;
+ public Byte stopped;
/**
* 澶囨敞
@@ -65,4 +128,21 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date createDt;
+ /**
+ * 宸茬粡鐢熸垚鏃堕暱锛堝ぉ锛�
+ */
+ public Integer lifeLen;
+ /**
+ * 褰撳墠鐢熼暱闃舵
+ */
+ public String lifeCur ;
+ /**
+ * 瀵瑰簲浣滅墿鐢熼暱闃舵鐨勭郴鏁�
+ */
+ public Double lifeFactor ;
+ /**
+ * 鏄惁鍋滄璁＄畻锛�1鏄紝0鍚�
+ */
+ public String stoppedStr;
+
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
index 6ba2ad2..29a6e2d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/MdCropsMapper.xml
@@ -18,7 +18,6 @@
<result column="life3_end" jdbcType="INTEGER" property="life3End" />
<result column="life4_start" jdbcType="INTEGER" property="life4Start" />
<result column="life4_end" jdbcType="INTEGER" property="life4End" />
- <result column="lat" jdbcType="DOUBLE" property="lat" />
<result column="stopped" jdbcType="TINYINT" property="stopped" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
<result column="create_dt" jdbcType="TIMESTAMP" property="createDt" />
@@ -31,7 +30,7 @@
life2_start, life2_end, life2_factor,
life3_start, life3_end, life3_factor,
life4_start, life4_end, life4_factor,
- lat, stopped, remarks, create_dt, deleted
+ stopped, remarks, create_dt, deleted
</sql>
<sql id="Part_Column_List">
id, weather_id, `name`, start_dt, end_dt,
@@ -39,7 +38,7 @@
life2_start, life2_end, life2_factor,
life3_start, life3_end, life3_factor,
life4_start, life4_end, life4_factor,
- lat, stopped, remarks, create_dt
+ stopped, remarks, create_dt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -60,7 +59,7 @@
life2_start, life2_end, life2_factor,
life3_start, life3_end, life3_factor,
life4_start, life4_end, life4_factor,
- lat, stopped, remarks, create_dt, deleted
+ stopped, remarks, create_dt, deleted
)
values (#{id,jdbcType=BIGINT}, #{weatherId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
#{startDt,jdbcType=VARCHAR}, #{endDt,jdbcType=VARCHAR},
@@ -68,7 +67,7 @@
#{life2Start,jdbcType=INTEGER}, #{life2End,jdbcType=INTEGER}, #{life2Factor,jdbcType=DOUBLE},
#{life3Start,jdbcType=INTEGER}, #{life3End,jdbcType=INTEGER}, #{life3Factor,jdbcType=DOUBLE},
#{life4Start,jdbcType=INTEGER}, #{life4End,jdbcType=INTEGER}, #{life4Factor,jdbcType=DOUBLE},
- #{lat,jdbcType=DOUBLE}, #{stopped,jdbcType=TINYINT},
+ #{stopped,jdbcType=TINYINT},
#{remarks,jdbcType=VARCHAR}, #{createDt,jdbcType=TIMESTAMP}, #{deleted,jdbcType=TINYINT}
)
</insert>
@@ -126,9 +125,6 @@
</if>
<if test="life4Factor != null">
life4_factor,
- </if>
- <if test="lat != null">
- lat,
</if>
<if test="stopped != null">
stopped,
@@ -194,9 +190,6 @@
</if>
<if test="life4Factor != null">
#{life4Factor,jdbcType=DOUBLE},
- </if>
- <if test="lat != null">
- #{lat,jdbcType=DOUBLE},
</if>
<if test="stopped != null">
#{stopped,jdbcType=TINYINT},
@@ -264,9 +257,6 @@
<if test="life4Factor != null">
life4_factor = #{life4Factor,jdbcType=DOUBLE},
</if>
- <if test="lat != null">
- lat = #{lat,jdbcType=DOUBLE},
- </if>
<if test="stopped != null">
stopped = #{stopped,jdbcType=TINYINT},
</if>
@@ -301,7 +291,6 @@
life4_start = #{life4Start,jdbcType=INTEGER},
life4_end = #{life4End,jdbcType=INTEGER},
life4_factor = #{life4Factor,jdbcType=DOUBLE},
- lat = #{lat,jdbcType=DOUBLE},
stopped = #{stopped,jdbcType=TINYINT},
remarks = #{remarks,jdbcType=VARCHAR},
create_dt = #{createDt,jdbcType=TIMESTAMP},
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
index a5d2f82..d278197 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrModel.crops;
import com.dy.common.aop.SsoAop;
+import com.dy.common.util.DateTime;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
@@ -127,11 +128,17 @@
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- po.id = null ;
- po.createDt = new Date();
- po.deleted = 0 ;
int count;
try {
+ po.id = null ;
+ po.createDt = new Date();
+ po.deleted = 0 ;
+ if(po.life4End != null && po.startDt != null && !po.startDt.trim().equals("")){
+ String nowYear = DateTime.yyyy() ;
+ String startDt = nowYear + "-" + po.startDt ;
+ String endDt = DateTime.nextXDay_yyyy_MM_dd(startDt, po.life4End) ;
+ po.endDt = endDt.substring(5, 10) ;
+ }
count = this.sv.save(po);
} catch (Exception e) {
log.error("淇濆瓨浣滅墿寮傚父", e);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/weather/WeatherCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/weather/WeatherCtrl.java
index e4c0c3e..523d071 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/weather/WeatherCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/weather/WeatherCtrl.java
@@ -44,6 +44,30 @@
}
/**
+ * 鏌ヨ鍏ㄩ儴姘旇薄绔欒褰�
+ * @return
+ */
+ @Operation(summary = "鑾峰緱鍏ㄩ儴姘旇薄绔欒褰�", description = "杩斿洖鍏ㄩ儴姘旇薄绔欐暟鎹�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖鍏ㄩ儴姘旇薄绔欐暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoWeather.class))}
+ )
+ })
+ @GetMapping(path = "/all")
+ @SsoAop()
+ public BaseResponse<List<VoWeather>> all(){
+ try {
+ return BaseResponseUtils.buildSuccess(this.sv.allSimple());
+ } catch (Exception e) {
+ log.error("鑾峰彇姘旇薄绔欒褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
* 鍒嗛〉鏌ヨ姘旇薄绔欒褰�
* @param vo
* @return
--
Gitblit v1.8.0