From 42f4246ff22f871b7cee15113cbe7523de8ab578 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 六月 2020 14:24:37 +0800
Subject: [PATCH] 优化创建物业功能
---
FrontService/src/main/java/com/java110/front/smo/impl/RegisterServiceSMOImpl.java | 109 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 44 deletions(-)
diff --git a/FrontService/src/main/java/com/java110/front/smo/impl/RegisterServiceSMOImpl.java b/FrontService/src/main/java/com/java110/front/smo/impl/RegisterServiceSMOImpl.java
index b0c6551..131d935 100644
--- a/FrontService/src/main/java/com/java110/front/smo/impl/RegisterServiceSMOImpl.java
+++ b/FrontService/src/main/java/com/java110/front/smo/impl/RegisterServiceSMOImpl.java
@@ -1,6 +1,8 @@
package com.java110.front.smo.impl;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.SendSmsFactory;
+import com.java110.core.factory.TencentSendMessageFactory;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ServiceConstant;
@@ -21,9 +23,8 @@
import org.springframework.web.client.RestTemplate;
/**
- *
* 鐢ㄦ埛娉ㄥ唽涓氬姟澶勭悊绫�
- *
+ * <p>
* Created by wuxw on 2019/3/23.
*/
@Service("registerServiceSMOImpl")
@@ -34,68 +35,69 @@
@Autowired
private RestTemplate restTemplate;
+
@Override
public ResponseEntity<String> doRegister(IPageData pd) {
ResponseEntity<String> responseEntity = null;
- Assert.jsonObjectHaveKey(pd.getReqData(),"username","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛鍚嶄俊鎭�");
- Assert.jsonObjectHaveKey(pd.getReqData(),"passwd","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈瀵嗙爜淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(),"repasswd","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈纭瀵嗙爜淇℃伅");
- Assert.jsonObjectHaveKey(pd.getReqData(),"tel","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎵嬫満淇℃伅淇℃伅");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "username", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鐢ㄦ埛鍚嶄俊鎭�");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "passwd", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈瀵嗙爜淇℃伅");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "repasswd", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈纭瀵嗙爜淇℃伅");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "tel", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎵嬫満淇℃伅淇℃伅");
JSONObject registerInfo = JSONObject.parseObject(pd.getReqData());
//鏍￠獙瀵嗙爜
- if(!registerInfo.getString("passwd").equals(registerInfo.getString("repasswd"))){
- responseEntity = new ResponseEntity<String>("瀵嗙爜鍜岀‘璁ゅ瘑鐮佷笉涓�鑷�",HttpStatus.INTERNAL_SERVER_ERROR);
+ if (!registerInfo.getString("passwd").equals(registerInfo.getString("repasswd"))) {
+ responseEntity = new ResponseEntity<String>("瀵嗙爜鍜岀‘璁ゅ瘑鐮佷笉涓�鑷�", HttpStatus.INTERNAL_SERVER_ERROR);
return responseEntity;
}
//璋冪敤 鎵嬫満楠岃瘉鐮�
- responseEntity = this.invokeComponent("validate-tel","validate",pd);
- if(responseEntity.getStatusCode() != HttpStatus.OK){
+ responseEntity = this.invokeComponent("validate-tel", "validate", pd);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
- responseEntity = this.checkNameAndTelExists(pd,registerInfo.getString("username"),"");
- if(responseEntity.getStatusCode()!=HttpStatus.OK){
+ responseEntity = this.checkNameAndTelExists(pd, registerInfo.getString("username"), "");
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
- responseEntity = this.checkNameAndTelExists(pd,"",registerInfo.getString("tel"));
- if(responseEntity.getStatusCode()!=HttpStatus.OK){
+ responseEntity = this.checkNameAndTelExists(pd, "", registerInfo.getString("tel"));
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
}
registerInfo.put("passwd", AuthenticationFactory.passwdMd5(registerInfo.getString("passwd")));
- registerInfo.put("name",registerInfo.getString("username"));
- registerInfo.put("password",registerInfo.getString("passwd"));
- responseEntity = this.callCenterService(restTemplate,pd,registerInfo.toJSONString(), ServiceConstant.SERVICE_API_URL+"/api/user.service.register", HttpMethod.POST);
+ registerInfo.put("name", registerInfo.getString("username"));
+ registerInfo.put("password", registerInfo.getString("passwd"));
+ responseEntity = this.callCenterService(restTemplate, pd, registerInfo.toJSONString(), ServiceConstant.SERVICE_API_URL + "/api/user.service.register", HttpMethod.POST);
return responseEntity;
}
- private ResponseEntity<String> checkNameAndTelExists(IPageData pd,String name,String tel){
+ private ResponseEntity<String> checkNameAndTelExists(IPageData pd, String name, String tel) {
ResponseEntity<String> responseEntity = null;
//鏍￠獙鐢ㄦ埛鍚嶆垨鎵嬫満鏄惁瀛樺湪
- responseEntity = this.callCenterService(restTemplate,pd,"",
- ServiceConstant.SERVICE_API_URL+"/api/check.hasUser.byNameOrTel?name="+name+"&tel="+tel,
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/check.hasUser.byNameOrTel?name=" + name + "&tel=" + tel,
HttpMethod.GET);
- if(responseEntity.getStatusCode()!=HttpStatus.OK){
- logger.error("璋冪敤鍚庣鏈嶅姟寮傚父锛歿}",responseEntity);
- return new ResponseEntity<String>("璋冪敤涓績鏈嶅姟寮傚父",HttpStatus.INTERNAL_SERVER_ERROR);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ logger.error("璋冪敤鍚庣鏈嶅姟寮傚父锛歿}", responseEntity);
+ return new ResponseEntity<String>("璋冪敤涓績鏈嶅姟寮傚父", HttpStatus.INTERNAL_SERVER_ERROR);
}
- Assert.jsonObjectHaveKey(responseEntity.getBody(),"userCount","璋冪敤涓績鏈嶅姟寮傚父锛屾姤鏂囦腑鏈寘鍚玼serCount鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody(), "userCount", "璋冪敤涓績鏈嶅姟寮傚父锛屾姤鏂囦腑鏈寘鍚玼serCount鑺傜偣");
JSONObject userInfo = JSONObject.parseObject(responseEntity.getBody());
- if(userInfo.getIntValue("userCount") > 0){
- return new ResponseEntity<String>(StringUtil.isNullOrNone(name)?"鎵嬫満鍙峰凡鍗犵敤":"鐢ㄦ埛鍚嶅凡鍗犵敤",HttpStatus.INTERNAL_SERVER_ERROR);
+ if (userInfo.getIntValue("userCount") > 0) {
+ return new ResponseEntity<String>(StringUtil.isNullOrNone(name) ? "鎵嬫満鍙峰凡鍗犵敤" : "鐢ㄦ埛鍚嶅凡鍗犵敤", HttpStatus.INTERNAL_SERVER_ERROR);
}
- responseEntity = new ResponseEntity<>("鎴愬姛",HttpStatus.OK);
+ responseEntity = new ResponseEntity<>("鎴愬姛", HttpStatus.OK);
return responseEntity;
@@ -103,35 +105,37 @@
/**
* 鍙戦�侀獙璇佺爜
+ *
* @param pd
* @return
*/
@Override
public ResponseEntity<String> sendTelMessageCode(IPageData pd) {
- Assert.jsonObjectHaveKey(pd.getReqData(),"tel","璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎵嬫満鍙蜂俊鎭�");
-
+ Assert.jsonObjectHaveKey(pd.getReqData(), "tel", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎵嬫満鍙蜂俊鎭�");
JSONObject telInfo = JSONObject.parseObject(pd.getReqData());
String verifyCode = AliSendMessageFactory.generateMessageCode();
ResponseEntity<String> sendMessageResult = null;
- String verifyStr="婕旂ず鐜楠岃瘉鐮�:"+verifyCode;
+ String verifyStr = "婕旂ず鐜楠岃瘉鐮�:" + verifyCode;
try {
- if("ON".equals(MappingCache.getValue("SMS_SEND_SWITCH"))){
- //寮�濮嬪彂閫侀獙璇佺爜
- AliSendMessageFactory.sendMessage(telInfo.getString("tel"),verifyCode);
+ if ("ON".equals(MappingCache.getValue(SendSmsFactory.SMS_SEND_SWITCH))) {
+ //寮�濮嬪彂閫侀獙璇佺爜
+ //AliSendMessageFactory.sendMessage(telInfo.getString("tel"), verifyCode);
- verifyStr ="楠岃瘉鐮佸凡涓嬪彂鑷虫偍鐨勬墜鏈�!";
+ TencentSendMessageFactory.sendMessage(telInfo.getString("tel"), verifyCode);
+
+ verifyStr = "楠岃瘉鐮佸凡涓嬪彂鑷虫偍鐨勬墜鏈�!";
}
//灏嗛獙璇佺爜瀛樺叆Redis涓�
- CommonCache.setValue(telInfo.getString("tel")+"_validateTel",verifyCode.toLowerCase(),CommonCache.defaultExpireTime);
+ CommonCache.setValue(telInfo.getString("tel") + "_validateTel", verifyCode.toLowerCase(), CommonCache.defaultExpireTime);
sendMessageResult = new ResponseEntity<>(verifyStr, HttpStatus.OK);
- }catch (Exception e){
- logger.error("鐢熸垚楠岃瘉鐮佸け璐ワ紝",e);
+ } catch (Exception e) {
+ logger.error("鐢熸垚楠岃瘉鐮佸け璐ワ紝", e);
sendMessageResult = new ResponseEntity<>("", HttpStatus.INTERNAL_SERVER_ERROR);
}
return sendMessageResult;
@@ -140,22 +144,23 @@
/**
* 鏍￠獙楠岃瘉鐮�
+ *
* @param pd 椤甸潰璇锋眰瀵硅薄
* @return
*/
- public ResponseEntity<String> validate(IPageData pd){
+ public ResponseEntity<String> validate(IPageData pd) {
- logger.debug("鏍￠獙楠岃瘉鐮佸弬鏁�:{}",pd.toString());
+ logger.debug("鏍￠獙楠岃瘉鐮佸弬鏁�:{}", pd.toString());
ResponseEntity<String> verifyResult = null;
- Assert.jsonObjectHaveKey(pd.getReqData(),"messageCode","璇锋眰鎶ユ枃涓湭鍖呭惈 楠岃瘉鐮�"+pd.toString());
- Assert.jsonObjectHaveKey(pd.getReqData(),"tel","璇锋眰鎶ユ枃涓湭鍖呭惈 鎵嬫満鍙�"+pd.toString());
+ Assert.jsonObjectHaveKey(pd.getReqData(), "messageCode", "璇锋眰鎶ユ枃涓湭鍖呭惈 楠岃瘉鐮�" + pd.toString());
+ Assert.jsonObjectHaveKey(pd.getReqData(), "tel", "璇锋眰鎶ユ枃涓湭鍖呭惈 鎵嬫満鍙�" + pd.toString());
JSONObject telInfo = JSONObject.parseObject(pd.getReqData());
- String code = CommonCache.getValue(telInfo.getString("tel")+"_validateTel");
+ String code = CommonCache.getValue(telInfo.getString("tel") + "_validateTel");
- if(telInfo.getString("messageCode").toLowerCase().equals(code)){
+ if (telInfo.getString("messageCode").toLowerCase().equals(code)) {
verifyResult = new ResponseEntity<>("鎴愬姛", HttpStatus.OK);
- }else{
+ } else {
pd.setToken("");
verifyResult = new ResponseEntity<>("楠岃瘉鐮侀敊璇�", HttpStatus.INTERNAL_SERVER_ERROR);
}
@@ -163,4 +168,20 @@
return verifyResult;
}
+
+ /**
+ * 鍔犺浇鍦板尯
+ *
+ * @param pd 椤甸潰璇锋眰瀵硅薄
+ * @return
+ */
+ public ResponseEntity<String> loadArea(IPageData pd) {
+ ResponseEntity responseEntity = null;
+ JSONObject paramObj = JSONObject.parseObject(pd.getReqData());
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/area.listAreas?" + super.mapToUrlParam(paramObj),
+ HttpMethod.GET);
+
+ return responseEntity;
+ }
}
--
Gitblit v1.8.0