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/NavServiceSMOImpl.java | 54 ++++++++++++++++++++++++------------------------------
1 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java
index ca5b789..f534752 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java
@@ -2,11 +2,12 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.constant.StatusConstant;
-import com.java110.common.util.CommonUtil;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.constant.StateConstant;
+import com.java110.utils.util.CommonUtil;
import com.java110.core.context.IPageData;
-import com.java110.web.core.BaseComponentSMO;
+import com.java110.core.component.BaseComponentSMO;
+import com.java110.utils.util.StringUtil;
import com.java110.web.smo.ICommunityServiceSMO;
import com.java110.web.smo.INavServiceSMO;
import org.slf4j.Logger;
@@ -60,34 +61,27 @@
@Override
public ResponseEntity<String> getUserInfo(IPageData pd) {
Assert.hasLength(pd.getUserId(), "鐢ㄦ埛鏈櫥褰曡鍏堢櫥褰�");
- /*ResponseEntity<String> responseEntity = null;
- responseEntity = this.callCenterService(restTemplate,pd,"",
- ServiceConstant.SERVICE_API_URL+"/api/query.user.userInfo?userId="+pd.getUserId(), HttpMethod.GET);
- // 杩囨护杩斿洖鎶ユ枃涓殑瀛楁锛屽彧杩斿洖name瀛楁
- //{"address":"","orderTypeCd":"Q","serviceCode":"","responseTime":"20190401194712","sex":"",
- "localtionCd":"","userId":"302019033054910001","levelCd":"00","transactionId":"-1","dataFlowId":"-1",
- "response":{"code":"0000","message":"鎴愬姛"},"name":"996icu","tel":"18909780341","bId":"-1","businessType":"","email":""}
-
- if(responseEntity.getStatusCode() == HttpStatus.OK){
- JSONObject tmpUserInfo = JSONObject.parseObject(responseEntity.getBody().toString());
- JSONObject resultUserInfo = new JSONObject();
- resultUserInfo.put("name",tmpUserInfo.getString("name"));
- responseEntity = new ResponseEntity<String>(resultUserInfo.toJSONString(),HttpStatus.OK);
- }*/
ResponseEntity<String> responseEntity = null;
responseEntity = super.getUserInfo(pd, restTemplate);
- if (responseEntity.getStatusCode() == HttpStatus.OK) {
- JSONObject tmpUserInfo = JSONObject.parseObject(responseEntity.getBody().toString());
- JSONObject resultUserInfo = new JSONObject();
- resultUserInfo.put("name", tmpUserInfo.getString("name"));
- resultUserInfo.put("address", tmpUserInfo.getString("address"));
- resultUserInfo.put("sex", tmpUserInfo.getString("sex"));
- resultUserInfo.put("localtionCd", tmpUserInfo.getString("localtionCd"));
- resultUserInfo.put("levelCd", tmpUserInfo.getString("levelCd"));
- resultUserInfo.put("tel", CommonUtil.mobileEncrypt(tmpUserInfo.getString("tel")));
- resultUserInfo.put("email", tmpUserInfo.getString("email"));
- responseEntity = new ResponseEntity<String>(resultUserInfo.toJSONString(), HttpStatus.OK);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
}
+ JSONObject tmpUserInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ JSONObject resultUserInfo = new JSONObject();
+ responseEntity = super.getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() == HttpStatus.OK && StringUtil.jsonHasKayAndValue(responseEntity.getBody().toString(),"storeTypeCd")) {
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+ resultUserInfo.put("storeTypeCd", storeTypeCd);
+ }
+ resultUserInfo.put("name", tmpUserInfo.getString("name"));
+ resultUserInfo.put("address", tmpUserInfo.getString("address"));
+ resultUserInfo.put("sex", tmpUserInfo.getString("sex"));
+ resultUserInfo.put("localtionCd", tmpUserInfo.getString("localtionCd"));
+ resultUserInfo.put("levelCd", tmpUserInfo.getString("levelCd"));
+ resultUserInfo.put("tel", CommonUtil.mobileEncrypt(tmpUserInfo.getString("tel")));
+ resultUserInfo.put("email", tmpUserInfo.getString("email"));
+ responseEntity = new ResponseEntity<String>(resultUserInfo.toJSONString(), HttpStatus.OK);
+
return responseEntity;
}
@@ -109,7 +103,7 @@
for (int communityIndex = 0; communityIndex < communitys.size(); communityIndex++) {
tempCommunity = communitys.getJSONObject(communityIndex);
- if (!StatusConstant.STATUS_CD_AUDIT_COMPLETE.equals(tempCommunity.getString("auditStatusCd"))) {
+ if (!StateConstant.AGREE_AUDIT.equals(tempCommunity.getString("auditStatusCd"))) {
continue;
}
newCommunity = new JSONObject();
--
Gitblit v1.8.0