From 49e81b765077fdba50c7c679e0abdb5f188f8037 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 19 五月 2021 16:59:13 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/impl/RoomServiceSMOImpl.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/impl/RoomServiceSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/impl/RoomServiceSMOImpl.java
old mode 100644
new mode 100755
index 029461a..bda33e6
--- a/service-front/src/main/java/com/java110/front/smo/impl/RoomServiceSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/impl/RoomServiceSMOImpl.java
@@ -2,15 +2,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.component.BaseComponentSMO;
+import com.java110.core.context.IPageData;
+import com.java110.front.smo.IRoomServiceSMO;
import com.java110.utils.constant.FeeTypeConstant;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
import com.java110.utils.util.Assert;
-import com.java110.core.context.IPageData;
-import com.java110.core.component.BaseComponentSMO;
-import com.java110.front.smo.IRoomServiceSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -141,7 +141,7 @@
feeMap.put("communityId", communityId);
feeMap.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
feeMap.put("roomId", roomObj.getString("roomId"));
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.queryFee" + mapToUrlParam(feeMap);
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.listFee" + mapToUrlParam(feeMap);
responseEntity = this.callCenterService(restTemplate, pd, "",
apiUrl,
HttpMethod.GET);
@@ -423,31 +423,19 @@
private void validateSaveRoom(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "unitId", "璇锋眰鎶ユ枃涓湭鍖呭惈unitId鑺傜偣");
+ //Assert.jsonObjectHaveKey(pd.getReqData(), "unitId", "璇锋眰鎶ユ枃涓湭鍖呭惈unitId鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "roomNum", "璇锋眰鎶ユ枃涓湭鍖呭惈roomNum鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "layer", "璇锋眰鎶ユ枃涓湭鍖呭惈layer鑺傜偣");
/*Assert.jsonObjectHaveKey(pd.getReqData(), "section", "璇锋眰鎶ユ枃涓湭鍖呭惈section鑺傜偣");*/
- Assert.jsonObjectHaveKey(pd.getReqData(), "apartment", "璇锋眰鎶ユ枃涓湭鍖呭惈apartment鑺傜偣");
+ //Assert.jsonObjectHaveKey(pd.getReqData(), "apartment", "璇锋眰鎶ユ枃涓湭鍖呭惈apartment鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "builtUpArea", "璇锋眰鎶ユ枃涓湭鍖呭惈builtUpArea鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state鑺傜偣");
+ //Assert.jsonObjectHaveKey(pd.getReqData(), "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state鑺傜偣");
/*Assert.jsonObjectHaveKey(pd.getReqData(), "unitPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈unitPrice鑺傜偣");*/
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
Assert.hasLength(reqJson.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
- Assert.isInteger(reqJson.getString("section"), "鎴块棿鏁颁笉鏄湁鏁堟暟瀛�");
Assert.isMoney(reqJson.getString("builtUpArea"), "寤虹瓚闈㈢Н鏁版嵁鏍煎紡閿欒");
Assert.isMoney(reqJson.getString("feeCoefficient"), "绠楄垂绯绘暟鏁版嵁鏍煎紡閿欒");
-
- /* 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"))
- && !"2003".equals(reqJson.getString("state"))
- && !"2004".equals(reqJson.getString("state"))) {
- throw new IllegalArgumentException("涓嶆槸鏈夋晥鎴垮眿鐘舵�� 浼犲叆鏁版嵁閿欒");
- }
}
--
Gitblit v1.8.0