From baea4f5679dba13a99de960e3891635968dbe35c Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期五, 06 三月 2020 10:25:34 +0800
Subject: [PATCH] 优化巡检计划AddInspectionPlanSMOImpl
---
WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
index 29d9112..2f77063 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
@@ -2,13 +2,13 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.FeeTypeConstant;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.util.Assert;
-import com.java110.common.util.StringUtil;
+import com.java110.utils.constant.FeeTypeConstant;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import com.java110.core.context.IPageData;
-import com.java110.web.core.BaseComponentSMO;
+import com.java110.core.component.BaseComponentSMO;
import com.java110.web.smo.IFeeServiceSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +36,7 @@
validateLoadPropertyConfigFee(pd);
//鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
- super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_PROPERTY_CONFIG_FEE);
+ //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_PROPERTY_CONFIG_FEE);
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
String communityId = paramIn.getString("communityId");
@@ -55,12 +55,12 @@
paramIn.put("feeTypeCd", feeTypeCd);
}
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeConfig" + mapToUrlParam(paramIn),
+ ServiceConstant.SERVICE_API_URL + "/api/feeConfig.listFeeConfigs" + mapToUrlParam(paramIn),
HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
- JSONArray feeConfigs = JSONArray.parseArray(responseEntity.getBody().toString());
+ JSONArray feeConfigs = JSONObject.parseObject(responseEntity.getBody().toString()).getJSONArray("feeConfigs");
if (feeConfigs != null && feeConfigs.size() > 1) {
responseEntity = new ResponseEntity<String>("鏁版嵁寮傚父锛岃妫�鏌ラ厤缃暟鎹�", HttpStatus.BAD_REQUEST);
@@ -340,9 +340,9 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
- responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
- ServiceConstant.SERVICE_API_URL + "/api/fee.queryArrearsFee",
- HttpMethod.POST);
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/fee.queryArrearsFee" + super.mapToUrlParam(paramIn),
+ HttpMethod.GET);
return responseEntity;
}
@@ -370,13 +370,17 @@
}
- private void validateListFee(IPageData pd){
+ private void validateListFee(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "feeTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈feeTypeCd鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈row鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
Assert.hasLength(paramIn.getString("feeTypeCd"), "鍋滆溅浣峟eeTypeCd涓嶈兘涓虹┖");
+ Assert.isInteger(paramIn.getString("row"), "row蹇呴』涓烘暟瀛�");
+ Assert.isInteger(paramIn.getString("page"), "page蹇呴』涓烘暟瀛�");
}
@@ -415,6 +419,8 @@
*/
private void validateLoadPropertyConfigFee(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈row鑺傜偣");
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
@@ -479,9 +485,9 @@
Assert.isMoney(reqJson.getString("builtUpArea"), "寤虹瓚闈㈢Н鏁版嵁鏍煎紡閿欒");
Assert.isMoney(reqJson.getString("unitPrice"), "鎴垮眿鍗曚环鏁版嵁鏍煎紡閿欒");
- if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
+ /* if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
throw new IllegalArgumentException("涓嶆槸鏈夋晥鎴垮眿鎴峰瀷 浼犲叆鏁版嵁閿欒");
- }
+ }*/
if (!"2001".equals(reqJson.getString("state"))
&& !"2002".equals(reqJson.getString("state"))
--
Gitblit v1.8.0