From 2ed55123b99cb5e4f0395a07ccde5652856ed643 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 19 八月 2024 20:40:01 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java | 5 ++++-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java | 2 --
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java | 7 ++-----
pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 6 +++---
5 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
index 7bfbf5e..bfe0ad6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
@@ -14,14 +14,12 @@
* 褰撳墠鏌ヨ椤�
*/
@Schema(description = "褰撳墠椤�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "褰撳墠椤典笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
public Integer pageCurr;
/**
* 姣忛〉鏁版嵁鏉℃暟
*/
@Schema(description = "姣忛〉璁板綍鏁�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "姣忛〉璁板綍鏁颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
public Integer pageSize;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
index e346337..1a13d73 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml
@@ -4,9 +4,9 @@
<!-- 澶氫釜缁勭粐锛岀敤缂栧彿鍖哄垎锛岀紪鍙蜂粠1寮�濮� -->
<org1 tag="ym" name="鍏冭皨">
<districts>
- <province name="浜戝崡鐪�" num="53" level="1">
- <city name="妤氶泟褰濇棌鑷不宸�" num="23" level="2">
- <country name="鍏冭皨鍘�" num="28" level="3" />
+ <province name="浜戝崡鐪�" num="53" level="0">
+ <city name="妤氶泟褰濇棌鑷不宸�" num="23" level="1">
+ <country name="鍏冭皨鍘�" num="28" level="2" />
</city>
</province>
</districts>
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
index d528969..a6bb146 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
@@ -94,15 +94,12 @@
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鐗囧尯锛�2024-08-14鏂板锛屾浛鎹㈠師鏉ョ殑鐗囧尯鍒嗛〉鏌ヨ
*
* @param qo
- * @param bindingResult
+ * @param
* @return
*/
@GetMapping(path = "/some")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoBlock>>> getBlocks(@Valid QueryVo qo, BindingResult bindingResult) {
- if (bindingResult != null && bindingResult.hasErrors()) {
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
- }
+ public BaseResponse<QueryResultVo<List<VoBlock>>> getBlocks(QueryVo qo) {
try {
return BaseResponseUtils.buildSuccess(this.sv.getBlocks(qo));
} catch (Exception e) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index 47438b6..2286f3d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -83,7 +83,7 @@
* @return
*/
public QueryResultVo<List<VoBlock>> getBlocks(QueryVo vo){
- vo.setPageCurr((vo.pageCurr -1) * vo.pageSize);
+ vo.setPageCurr((vo.getPageCurr() -1) * vo.getPageSize());
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(vo) ;
Long itemTotal = this.dao.getBlocksCount(params) ;
@@ -127,6 +127,9 @@
job_block.put("graphs", array_mapGraphs);
}
}
+ }else {//澧炲姞鍋ュ．鎬�
+ QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
+ return rsVo ;
}
QueryResultVo<List<VoBlock>> rsVo = new QueryResultVo<>() ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
index d60bf3e..033a2f9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
@@ -78,7 +78,7 @@
@GetMapping(path = "all")
@SsoAop()
public BaseResponse<List<BaDistrict>> all() {
- List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.City.code);
+ List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.Province.code);
return BaseResponseUtils.buildSuccess(list);
}
--
Gitblit v1.8.0