From 6b291f18e944053ebb1dcd51495839b7b32b668d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 16 二月 2020 19:19:53 +0800
Subject: [PATCH] 优化权限组修改功能
---
WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java
index ec5cedc..2aaa3c7 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java
@@ -1,13 +1,14 @@
package com.java110.web.smo.impl;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.exception.SMOException;
-import com.java110.common.util.Assert;
+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.web.core.BaseComponentSMO;
+import com.java110.core.component.BaseComponentSMO;
import com.java110.web.smo.IParkingSpaceServiceSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,6 +18,9 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* 灏忓尯妤煎疄鐜扮被
@@ -200,6 +204,39 @@
responseEntity = this.callCenterService(restTemplate, pd, "",
apiUrl,
HttpMethod.GET);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+
+ JSONObject psInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ JSONArray pss = psInfo.getJSONArray("parkingSpaces");
+
+ Map feeMap = null;
+ JSONObject resultFeeInfo = null;
+ JSONObject psObj = null;
+ for (int roomIndex = 0; roomIndex < pss.size(); roomIndex++) {
+ psObj = pss.getJSONObject(roomIndex);
+ feeMap = new HashMap();
+ feeMap.put("communityId", communityId);
+ feeMap.put("psId", psObj.getString("psId"));
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeByParkingSpace" + mapToUrlParam(feeMap);
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ apiUrl,
+ HttpMethod.GET);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ //throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "褰撳墠鎴垮眿[" + roomObj.getString("roomNum") + "]娌℃湁鐗╀笟璐逛俊鎭紝鏁版嵁閿欒");
+
+ continue;
+ }
+
+ resultFeeInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ psObj.putAll(resultFeeInfo);
+
+ }
+
+ responseEntity = new ResponseEntity(psInfo.toJSONString(), HttpStatus.OK);
+
return responseEntity;
}
@@ -269,9 +306,9 @@
private void validateEditParkingSpace(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
Assert.jsonObjectHaveKey(pd.getReqData(), "psId", "鏈寘鍚玴sId");
- Assert.jsonObjectHaveKey(pd.getReqData(), "num", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
- Assert.jsonObjectHaveKey(pd.getReqData(), "area", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
- Assert.jsonObjectHaveKey(pd.getReqData(), "typeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "num", "璇锋眰鎶ユ枃涓湭鍖呭惈num");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "area", "璇锋眰鎶ユ枃涓湭鍖呭惈area");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍋滆溅鍦轰俊鎭�");
}
/**
@@ -281,9 +318,9 @@
*/
private void validateSaveParkingSpace(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(pd.getReqData(), "num", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
- Assert.jsonObjectHaveKey(pd.getReqData(), "area", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
- Assert.jsonObjectHaveKey(pd.getReqData(), "typeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "num", "璇锋眰鎶ユ枃涓湭鍖呭惈num");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "area", "璇锋眰鎶ユ枃涓湭鍖呭惈area");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈鍋滆溅鍦轰俊鎭�");
}
/**
--
Gitblit v1.8.0