From cbc1f9db3d796683d88d6d30df3659984dfbeda3 Mon Sep 17 00:00:00 2001
From: webapp <webapp@home-server.attdns.com>
Date: 星期一, 30 九月 2019 22:56:12 +0800
Subject: [PATCH] 取消java110-common jar包，提升为CommonService服务,将之前的Java110-common内容变更为Java110-utils包
---
WebService/src/main/java/com/java110/web/smo/impl/UnitServiceSMOImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/UnitServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/UnitServiceSMOImpl.java
index d189d9e..84f6515 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/UnitServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/UnitServiceSMOImpl.java
@@ -1,9 +1,9 @@
package com.java110.web.smo.impl;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.util.Assert;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
import com.java110.core.context.IPageData;
import com.java110.web.core.BaseComponentSMO;
import com.java110.web.smo.IUnitServiceSMO;
@@ -60,8 +60,7 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
- String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/unit.queryUnits?floorId=" + floorId + "&communityId="
- + communityId;
+ String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/unit.queryUnits" + mapToUrlParam(paramIn);
responseEntity = this.callCenterService(restTemplate, pd, "",
apiUrl,
@@ -138,6 +137,49 @@
return responseEntity;
}
+ @Override
+ public ResponseEntity<String> deleteUnit(IPageData pd) {
+ //鏍￠獙鍏ュ弬
+ validateDeleteUnit(pd);
+
+ //鏍￠獙鐢ㄦ埛鏄惁鏈夋潈闄�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_UNIT);
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ String communityId = paramIn.getString("communityId");
+
+ ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
+
+ String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+ //鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
+ super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+
+ String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/unit.deleteUnit";
+
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+ apiUrl,
+ HttpMethod.POST);
+ return responseEntity;
+ }
+
+ /**
+ * 鍒犻櫎鍗曞厓淇℃伅鏍￠獙
+ *
+ * @param pd 椤甸潰鏁版嵁灏佽
+ */
+ private void validateDeleteUnit(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "floorId", "璇锋眰鎶ユ枃涓湭鍖呭惈floorId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "unitId", "璇锋眰鎶ユ枃涓湭鍖呭惈unitId鑺傜偣");
+
+ }
+
/**
* 鏍￠獙 淇濆瓨灏忓尯鍗曞厓鍙傛暟淇℃伅
*
--
Gitblit v1.8.0