From e1f1023dee5d094fcb1e428f36cce09211c4542a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 九月 2025 11:29:11 +0800
Subject: [PATCH] 蒸腾改为蒸散
---
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java | 14 +++++++-------
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporQo.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java | 6 +++---
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/ModelListener.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/TestCtrl.java | 8 ++++----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoEt0Simple.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/ModelCalculator.java | 4 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/vapor/VaporCtrl.java | 10 +++++-----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java | 8 ++++----
9 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java
index 0ba9b23..2918a92 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoMd/MdEt0.java
@@ -17,7 +17,7 @@
/**
* @Author: liurunyu
* @Date: 2025/8/19 8:35
- * @Description 浣滅墿钂歌吘閲�
+ * @Description 浣滅墿钂告暎閲�
*/
@TableName(value="md_et0", autoResultMap = true)
@Data
@@ -25,7 +25,7 @@
@ToString
@NoArgsConstructor
@AllArgsConstructor
-@Schema(name = "浣滅墿钂歌吘閲�")
+@Schema(name = "浣滅墿钂告暎閲�")
public class MdEt0 implements BaseEntity {
public static final long serialVersionUID = 202508190840001L;
@@ -78,9 +78,9 @@
public Date dt;
/**
- * 钂歌吘閲�
+ * 钂告暎閲�
*/
- @Schema(description = "鏈棩浣滅墿钂歌吘閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鏈棩浣滅墿钂告暎閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(shape = JsonFormat.Shape.NUMBER, pattern = "0.00")
public Double et0;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoEt0Simple.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoEt0Simple.java
index da0e437..06989cf 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoEt0Simple.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voMd/VoEt0Simple.java
@@ -31,9 +31,9 @@
public Date dt;
/**
- * 钂歌吘閲�
+ * 钂告暎閲�
*/
- @Schema(description = "鏈棩浣滅墿钂歌吘閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Schema(description = "鏈棩浣滅墿钂告暎閲�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonFormat(shape = JsonFormat.Shape.NUMBER, pattern = "0.00")
public Double et0;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/ModelCalculator.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/ModelCalculator.java
index bd02b1c..8abfc5b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/ModelCalculator.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/ModelCalculator.java
@@ -44,7 +44,7 @@
this.executeOnCrop(crop, voWeather);
}
}catch (Exception e){
- log.error("璁＄畻浣滅墿锛坕d=" + crop.id + "锛夎捀鑵炬暟鎹椂寮傚父", e);
+ log.error("璁＄畻浣滅墿锛坕d=" + crop.id + "锛夎捀鏁ｆ暟鎹椂寮傚父", e);
}
}
}
@@ -60,7 +60,7 @@
if(tmps != null && tmps.size() > 0){
VoWeatherMaxMinTmp voMmTmp = tmps.get(0);//鍙兘鏈変竴鏉¤褰�
if(voMmTmp != null && voMmTmp.maxAirTemperature != null && voMmTmp.minAirTemperature != null){
- Double et0 = this.calculateEt0(yesterday_ymd, vo, voWeather, voMmTmp, factor) ;//璁＄畻钂歌吘鏁版嵁
+ Double et0 = this.calculateEt0(yesterday_ymd, vo, voWeather, voMmTmp, factor) ;//璁＄畻钂告暎鏁版嵁
this.saveEt0(yesterday_ymd, vo, voWeather, voMmTmp, factor, et0) ;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/ModelListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/ModelListener.java
index b61e846..b01147e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/ModelListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/timingTask/ModelListener.java
@@ -19,7 +19,7 @@
* @Author: liurunyu
* @Date: 2025/8/6 9:32
* @Description
- * 浣滅墿钂歌吘鑷姩璁＄畻
+ * 浣滅墿钂告暎鑷姩璁＄畻
*/
@Slf4j
@Component
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/TestCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/TestCtrl.java
index d428097..dc7f626 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/TestCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/TestCtrl.java
@@ -14,11 +14,11 @@
/**
* @Author: liurunyu
* @Date: 2025/8/22 10:20
- * @Description 涓嶈鍒犻櫎锛侊紒锛� 涓哄墠绔捀鑵鹃噺璁＄畻鎻愪緵鐨勬湇鍔�
+ * @Description 涓嶈鍒犻櫎锛侊紒锛� 涓哄墠绔捀鏁ｉ噺璁＄畻鎻愪緵鐨勬湇鍔�
*/
@Slf4j
-@Tag(name = "浣滅墿鏃ヨ捀鑵鹃噺璁＄畻娴嬭瘯", description = "浣滅墿鏃ヨ捀鑵鹃噺璁＄畻娴嬭瘯")
+@Tag(name = "浣滅墿鏃ヨ捀鏁ｉ噺璁＄畻娴嬭瘯", description = "浣滅墿鏃ヨ捀鏁ｉ噺璁＄畻娴嬭瘯")
@RestController
@RequestMapping(path = "mdTest")
public class TestCtrl {
@@ -51,7 +51,7 @@
}
return BaseResponseUtils.buildSuccess(vo);
} catch (Exception e) {
- log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲忓紓甯�", e);
+ log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲忓紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
@@ -89,7 +89,7 @@
Double et0 = Hargreaves.ET0(qo.kc, qo.maxTmp, qo.minTmp, zenithRadiation);
return BaseResponseUtils.buildSuccess(et0);
} catch (Exception e) {
- log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲忓紓甯�", e);
+ log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲忓紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
index 11d6c51..c57dc04 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
@@ -28,7 +28,7 @@
* @Description
*/
@Slf4j
-@Tag(name = "浣滅墿鏃ヨ捀鑵鹃噺", description = "浣滅墿鏃ヨ捀鑵鹃噺鏌ヨ绛夋搷浣�")
+@Tag(name = "浣滅墿鏃ヨ捀鏁ｉ噺", description = "浣滅墿鏃ヨ捀鏁ｉ噺鏌ヨ绛夋搷浣�")
@RestController
@RequestMapping(path = "mdVapor")
public class VaporCtrl {
@@ -40,14 +40,14 @@
/**
- * 瀹㈡埛绔姹傚緱鍒版墍鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲�
- * @return 鎵�鏈夋墍鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲�
+ * 瀹㈡埛绔姹傚緱鍒版墍鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲�
+ * @return 鎵�鏈夋墍鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲�
*/
- @Operation(summary = "鑾峰緱浣滅墿鐨勬槰鏃ヨ捀鑵鹃噺", description = "杩斿洖鎵�鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲忔暟鎹�")
+ @Operation(summary = "鑾峰緱浣滅墿鐨勬槰鏃ヨ捀鏁ｉ噺", description = "杩斿洖鎵�鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲忔暟鎹�")
@ApiResponses(value = {
@ApiResponse(
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖浣滅墿鐨勬槰鏃ヨ捀鑵鹃噺鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+ description = "杩斿洖浣滅墿鐨勬槰鏃ヨ捀鏁ｉ噺鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
schema = @Schema(implementation = MdEt0.class))}
)
@@ -63,13 +63,13 @@
List<MdEt0> res = this.sv.selectEt0(ymd) ;
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲忓紓甯�", e);
+ log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲忓紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
- * 鏍规嵁鎸囧畾鏉′欢浣滅墿鏌ヨ涓�娈垫椂闂村唴鐨勮捀鑵鹃噺
+ * 鏍规嵁鎸囧畾鏉′欢浣滅墿鏌ヨ涓�娈垫椂闂村唴鐨勮捀鏁ｉ噺
* @param qo
* @return
*/
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporQo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporQo.java
index c4c8e85..3d84be1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporQo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporQo.java
@@ -16,7 +16,7 @@
@NoArgsConstructor
@AllArgsConstructor
@Builder
-@Schema(name = "浣滅墿鏃ヨ捀鑵炬煡璇㈡潯浠�")
+@Schema(name = "浣滅墿鏃ヨ捀鏁ｆ煡璇㈡潯浠�")
public class VaporQo extends QueryConditionVo {
/**
* 浣滅墿ID
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
index 83081c7..16c2df6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
@@ -201,14 +201,14 @@
/**
- * 寰楀埌涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鑵鹃噺
+ * 寰楀埌涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鏁ｉ噺
* @return 鏁版嵁闆嗗悎
*/
- @Operation(summary = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鑵鹃噺", description = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鑵鹃噺")
+ @Operation(summary = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鏁ｉ噺", description = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鏁ｉ噺")
@ApiResponses(value = {
@ApiResponse(
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鑵鹃噺锛圔aseResponse.content:[VoTopXIntake{}]锛�",
+ description = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鏁ｉ噺锛圔aseResponse.content:[VoTopXIntake{}]锛�",
content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
schema = @Schema(implementation = VoEt0Simple.class))}
)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/vapor/VaporCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/vapor/VaporCtrl.java
index 69ebb79..9a7ee79 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/vapor/VaporCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/vapor/VaporCtrl.java
@@ -20,7 +20,7 @@
* @Description
*/
@Slf4j
-@Tag(name = "浣滅墿鏃ヨ捀鑵鹃噺", description = "浣滅墿鏃ヨ捀鑵鹃噺鏌ヨ绛夋搷浣�")
+@Tag(name = "浣滅墿鏃ヨ捀鏁ｉ噺", description = "浣滅墿鏃ヨ捀鏁ｉ噺鏌ヨ绛夋搷浣�")
@RestController
@RequestMapping(path = "mdVapor")
public class VaporCtrl {
@@ -32,8 +32,8 @@
/**
- * 瀹㈡埛绔姹傚緱鍒版墍鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲�
- * @return 鎵�鏈夋墍鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲�
+ * 瀹㈡埛绔姹傚緱鍒版墍鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲�
+ * @return 鎵�鏈夋墍鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲�
*/
@GetMapping(path = "allCropsWithYesterday")
public BaseResponse<List<MdEt0>> allYesterday(){
@@ -45,13 +45,13 @@
List<MdEt0> res = this.sv.selectEt0(ymd) ;
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲忓紓甯�", e);
+ log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲忓紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
- * 鏍规嵁鎸囧畾鏉′欢浣滅墿鏌ヨ涓�娈垫椂闂村唴鐨勮捀鑵鹃噺
+ * 鏍规嵁鎸囧畾鏉′欢浣滅墿鏌ヨ涓�娈垫椂闂村唴鐨勮捀鏁ｉ噺
* @param qo
* @return
*/
--
Gitblit v1.8.0