From 0240ff9393ff8c1716a8aa308d8b6e35d2fe6824 Mon Sep 17 00:00:00 2001
From: duckweed <duckweed_lzy@aliyun.com>
Date: 星期三, 23 十月 2019 18:13:29 +0800
Subject: [PATCH] 物品出入库页面生成(待测试)

---
 WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java
index 92d73dc..95b3dbf 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java
@@ -2,10 +2,10 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.AttrCdConstant;
-import com.java110.common.constant.CredentialsConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.util.Assert;
+import com.java110.utils.constant.AttrCdConstant;
+import com.java110.utils.constant.CredentialsConstant;
+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.ICompanyServiceSMO;
@@ -15,7 +15,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
-import springfox.documentation.spring.web.json.Json;
 
 /**
  * 鍒濆鍖栧叕鍙稿疄鐜扮被
@@ -131,6 +130,26 @@
         return responseEntity;
     }
 
+    /**
+     * 鏌ヨ 鎵�鏈夌渷甯�
+     * @param pd
+     * @return
+     */
+    @Override
+    public ResponseEntity<String> getAreas(IPageData pd) {
+        ResponseEntity<String> responseEntity = null;
+        Assert.hasLength(pd.getUserId(),"鐢ㄦ埛杩樻湭鐧诲綍璇峰厛鐧诲綍");
+
+        responseEntity = this.callCenterService(restTemplate,pd,"", ServiceConstant.SERVICE_API_URL+"/api/api.queryAreas", HttpMethod.GET);
+
+        if(responseEntity.getStatusCode() == HttpStatus.OK){
+            Assert.jsonObjectHaveKey(responseEntity.getBody(),"areas","鏌ヨ涓績鏈嶅姟寮傚父锛屼笉鏄湁鏁坖son鎴栨湭鍖呭惈areas鑺傜偣");
+            //灏哸reas 杩斿洖鍑哄幓
+            responseEntity = new ResponseEntity<String>(JSONObject.parseObject(responseEntity.getBody()).getJSONArray("areas").toJSONString(),HttpStatus.OK);
+        }
+        return responseEntity;
+    }
+
 
     /**
      * 鏍¢獙鍏徃淇℃伅

--
Gitblit v1.8.0