Merge branch 'master' into feature/huanguguan

# Conflicts:
#	src/main/resources/config/dev/xyqb.properties

src/main/java/cn/quantgroup/xyqb/controller/external/index/HelloController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/hello")
 public class HelloController {
+  
   @RequestMapping("/hello")
   public String hello(){
     return "ok";

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -18,11 +18,13 @@ import cn.quantgroup.xyqb.model.AddressRet;
 import cn.quantgroup.xyqb.model.ContactRet;
 import cn.quantgroup.xyqb.model.IdType;
 import cn.quantgroup.xyqb.model.JsonResult;
+import cn.quantgroup.xyqb.model.UserAssociation;
 import cn.quantgroup.xyqb.model.UserDetailRet;
 import cn.quantgroup.xyqb.model.UserExtInfoRet;
 import cn.quantgroup.xyqb.model.UserInfo;
 import cn.quantgroup.xyqb.model.UserRet;
 import cn.quantgroup.xyqb.model.UserSpouseRet;
+import cn.quantgroup.xyqb.model.XContactInfo;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
@@ -45,6 +47,7 @@ import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
 import java.sql.Timestamp;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -513,6 +516,106 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("success", wechatUserInfo.getOpenId());
   }
 
+  @RequestMapping("/user-association/search/phone")
+  @LogHttpCaller
+  public JsonResult findUserAssociationByPhone(String phoneNo) {
+    UserDetail userDetail = userDetailService.findByPhoneNo(phoneNo);
+    UserAssociation bean = new UserAssociation();
+
+    if (null != userDetail) {
+      Address address = addressService.findByUserId(userDetail.getUserId());
+      List<Contact> contacts = contactService.findByUserId(userDetail.getUserId());
+      UserExtInfo extInfo = userExtInfoService.findByUserId(userDetail.getUserId());
+      bean.setUserId(userDetail.getUserId());
+      bean.setPhoneNo(userDetail.getPhoneNo());
+      bean.setName(userDetail.getName());
+      bean.setIdNo(userDetail.getIdNo());
+      bean.setQq(userDetail.getQq());
+      if (null != userDetail.getGender()) {
+        bean.setGender(userDetail.getGender().getName());
+      }
+
+      if (null != address) {
+        bean.setCity(address.getCity());
+        bean.setDistrict(address.getDistrict());
+        bean.setAddress(address.getAddress());
+        bean.setProvince(address.getProvince());
+      }
+      if (null != extInfo) {
+        bean.setEducationEnum(extInfo.getEducationEnum().getName());
+        bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
+        bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
+      }
+      if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
+        List<XContactInfo> userContacts = contacts2ContactRets(contacts);
+        bean.setContractResults(userContacts);
+      }
+    }
+
+    return JsonResult.buildSuccessResult("", bean);
+  }
+  @RequestMapping("/user-association/search/uid")
+  @LogHttpCaller
+  public JsonResult findUserAssociationByUid(Long uid) {
+    UserDetail userDetail = userDetailService.findByUserId(uid);
+    UserAssociation bean = new UserAssociation();
+
+    if (null != userDetail) {
+      Address address = addressService.findByUserId(userDetail.getUserId());
+      List<Contact> contacts = contactService.findByUserId(userDetail.getUserId());
+      UserExtInfo extInfo = userExtInfoService.findByUserId(userDetail.getUserId());
+      bean.setUserId(userDetail.getUserId());
+      bean.setPhoneNo(userDetail.getPhoneNo());
+      bean.setName(userDetail.getName());
+      bean.setIdNo(userDetail.getIdNo());
+      bean.setQq(userDetail.getQq());
+      if (null != userDetail.getGender()) {
+        bean.setGender(userDetail.getGender().getName());
+      }
+
+      if (null != address) {
+        bean.setCity(address.getCity());
+        bean.setDistrict(address.getDistrict());
+        bean.setAddress(address.getAddress());
+        bean.setProvince(address.getProvince());
+      }
+      if (null != extInfo) {
+        bean.setEducationEnum(extInfo.getEducationEnum().getName());
+        bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
+        bean.setMarryStatus(extInfo.getMarryStatus().getDescription());
+      }
+      if (org.apache.commons.collections.CollectionUtils.isNotEmpty(contacts)) {
+        List<XContactInfo> userContacts = contacts2ContactRets(contacts);
+        bean.setContractResults(userContacts);
+      }
+    }
+
+    return JsonResult.buildSuccessResult("", bean);
+  }
+
+  public static XContactInfo contact2ContactRet(Contact c) {
+    if (c == null) {
+      return null;
+    }
+    XContactInfo ret = new XContactInfo();
+    ret.setId(c.getId());
+    ret.setUserId(c.getUserId());
+    ret.setName(c.getName());
+    ret.setPhoneNo(c.getPhoneNo());
+    ret.setRelation(c.getRelation().getDescription());
+    return ret;
+  }
+
+  public static List<XContactInfo> contacts2ContactRets(List<Contact> cs) {
+    if (org.apache.commons.collections.CollectionUtils.isEmpty(cs)) {
+      return Collections.emptyList();
+    }
+    List<XContactInfo> contactRets = new ArrayList<>();
+    for (Contact c : cs) {
+      contactRets.add(contact2ContactRet(c));
+    }
+    return contactRets;
+  }
   @RequestMapping("/user/wechat/phone_no")
   @LogHttpCaller
   public JsonResult queryOpenIdByPhoneNo(String phoneNo) {

src/main/java/cn/quantgroup/xyqb/controller/external/user/center/UserCenterController.java

@@ -68,7 +68,6 @@ public class UserCenterController {
         }
         UserDetail userDetail = userDetailService.findByUserId(userId);
         if(userDetail != null) {
-            
             result.put("name", userDetail.getName());
             result.put("sex", userDetail.getGender().ordinal() + "");
             result.put("phoneNo", userDetail.getPhoneNo().substring(0,3)+"****"+userDetail.getPhoneNo().substring(7,11));
@@ -183,6 +182,8 @@ public class UserCenterController {
         return JsonResult.buildSuccessResult(null, null);
     }
 
+
+
     /**
      * 个人资料信息
      * @param phoneNo

src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

@@ -26,7 +26,7 @@ import java.io.PrintWriter;
 public class RequestFilter implements Filter {
 
   private static final String[] ALLOWED_PATTERNS = {
-      "/innerapi/**", "/user/exist", "/motan/**", "/user/register", "/user/login", "/user/register/fast","/auth/info/login",
+      "/hello/**","/innerapi/**", "/user/exist", "/motan/**", "/user/register", "/user/login", "/user/register/fast","/auth/info/login",
       "/user/login/fast", "/user/reset_password", "/user/exist_check","/user/center/**",
       "/jr58/**", "/app/login", "/app/login_super","/app/login2","/user/login2", "/wechat/**", "/config/**", "/api/**", "/user/exists_token","/query/**",
       "/platform/api/page/return_url", "/MP_" +

src/main/java/cn/quantgroup/xyqb/model/UserAssociation.java

+package cn.quantgroup.xyqb.model;
+
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * Created by xuran on 2017/8/1.
+ */
+@Data
+public class UserAssociation implements Serializable {
+  private static final long serialVersionUID = -1L;
+  private Long userId;
+  private String phoneNo;
+  private String idNo;
+  private String name;
+  private String   gender;
+  private String marryStatus;
+  private String educationEnum;
+  private String occupationEnum;
+  private String province;
+  private String city;
+  private String district;
+  private String address;
+  private String qq;
+  private List<XContactInfo> contractResults;
+}

src/main/java/cn/quantgroup/xyqb/model/XContactIn.java

+package cn.quantgroup.xyqb.model;
+
+import lombok.Data;
+
+/**
+ * Created by xuran on 2017/8/1.
+ */
+@Data
+public class XContactIn {
+  private static final long serialVersionUID = -1L;
+  private Long id;
+  private Long userId;
+  private String name;
+  private String phoneNo;
+  private String relation;
+
+}

src/main/java/cn/quantgroup/xyqb/model/XContactInfo.java

+package cn.quantgroup.xyqb.model;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * Created by xuran on 2017/8/1.
+ */
+@Data
+public class XContactInfo  implements Serializable {
+  private static final long serialVersionUID = -1L;
+  private Long id;
+  private Long userId;
+  private String name;
+  private String phoneNo;
+  private String relation;
+}