From 9aafec73f2a5df0ccee2712505c63d44d91336c6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 四月 2025 14:40:09 +0800
Subject: [PATCH] 1、端口、IP、标签配置.docx文档修改：民勤配置项变化； 2、农户取水年度统计逻辑变化； 3、灌溉计划迟延时间可配置。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java | 8 +++++++-
pipIrr-platform/文档/SaaS/端口、IP、标签配置.docx | 0
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml | 7 +++----
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 5 -----
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 92e5bc3..0c1679a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -478,8 +478,3 @@
vc:
#铏氭嫙鍗℃渶浣庝綑棰濇姤璀﹀��
alarmValue: 10
-
-#杞亴閰嶇疆
-rotation:
- #杞亴缁勬彁鍓嶅紑闃�鏃堕棿
- preOpeningTime: 10
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
index e33506e..066894a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
@@ -84,16 +84,22 @@
List<Integer> yearGrp = new ArrayList<Integer>();
int nowYear = Integer.parseInt(DateTime.yyyy()) ;
if(qo.year == null) {
- for(int i = startYear4YearStatistics; i <= nowYear; i++) {
+ int startYear = nowYear - 4 ;//鏌�5骞寸殑
+ if(startYear < startYear4YearStatistics){
+ startYear = startYear4YearStatistics ;
+ }
+ for(int i = startYear; i <= nowYear; i++) {
yearGrp.add(i) ;
}
}else{
+ /*
if(qo.year > nowYear){
qo.year = nowYear;
}
if(qo.year < startYear4YearStatistics){
qo.year = startYear4YearStatistics;
}
+ */
yearGrp.add(qo.year) ;
}
return BaseResponseUtils.buildSuccess(this.sv.selectStClientAmountYear(qo, yearGrp));
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
index 4be4c5f..2a3bbf3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -69,13 +69,13 @@
@Autowired
private CommandSv commandSv;
- @Value("${webchat.irr.plan.delay}")
+ @Value("${wechat.irr.plan.delay:5}")
private Integer irrPlanDelay ;//杞亴涓鍒掑紑闃�鐨勫欢杩熸椂闀�
private static final Integer irrPlanDelayDefault = 5 ;//杞亴涓鍒掑紑闃�鐨勯粯璁ゅ欢杩熸椂闀�
- @Value("${rotation.preOpeningTime}")
- private Long preOpeningTime;
+ @Value("${wechat.irr.plan.preOpeningTime:10}")
+ private Integer preOpeningTime;
/**
* 娣诲姞鐏屾簤璁″垝
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml
index 8a9c150..91832c2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/resources/application-self.yml
@@ -12,12 +12,11 @@
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
idSuffix: ${pipIrr.wechat.idSuffix}
-webchat:
+wechat:
irr:
plan:
- delay: 5 #杞亴涓鍒掑紑闃�鐨勫欢杩熸椂闀�
-
-
+ delay: 5 #杞亴涓鍒掑紑闃�鐨勫欢杩熸椂闀�(鍒嗛挓)
+ preOpeningTime: 10 #鎻愬墠鏃堕棿(鍒嗛挓)
#闃块噷鐭俊鏈嶅姟
aliyun:
sms:
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx" "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
index aa19e80..2af0c4b 100644
--- "a/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
+++ "b/pipIrr-platform/\346\226\207\346\241\243/SaaS/\347\253\257\345\217\243\343\200\201IP\343\200\201\346\240\207\347\255\276\351\205\215\347\275\256.docx"
Binary files differ
--
Gitblit v1.8.0