Merge branch 'zhaoyue-dev4' into 'master'

Zhaoyue dev4



See merge request !66

@@ -11,10 +11,12 @@ import com.xkl.domain.User;
 import com.xkl.domain.XklAdminEntity;
 import com.xkl.domain.XklAdminEntity;
 import com.xkl.domain.XklMemberEntity;
 import com.xkl.domain.XklMemberEntity;
 import com.xkl.model.ResultModel;
 import com.xkl.model.ResultModel;
+import com.xkl.model.UsrInfoModelForUSPIH;
 import com.xkl.repository.UserRepository;
 import com.xkl.repository.UserRepository;
 import com.xkl.repository.XklMemberRespository;
 import com.xkl.repository.XklMemberRespository;
 import com.xkl.security.AntiXSS;
 import com.xkl.security.AntiXSS;
 import com.xkl.security.SecurityTool;
 import com.xkl.security.SecurityTool;
+import com.xkl.tools.DatetimeTools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
@@ -25,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 
 /**
 /**
  * @author zhaoyue
  * @author zhaoyue
@@ -34,7 +38,9 @@ import javax.servlet.http.HttpServletRequest;
 public class UserAccountController {
 public class UserAccountController {
     @Autowired
     @Autowired
     private UserRepository userRepository;
     private UserRepository userRepository;
-
+    @Autowired
+    private  XklMemberRespository memberRespository;
+    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//小写的mm表示的是分钟
 
 
     @RequestMapping(method = RequestMethod.GET)
     @RequestMapping(method = RequestMethod.GET)
     @AntiXSS
     @AntiXSS
@@ -47,7 +53,17 @@ public class UserAccountController {
         if (user == null) {//用户未找到
         if (user == null) {//用户未找到
             return new ResponseEntity<>(ResultModel.error(ResultStatus.USER_NOT_FOUND), HttpStatus.OK);
             return new ResponseEntity<>(ResultModel.error(ResultStatus.USER_NOT_FOUND), HttpStatus.OK);
         }
         }
-        return new ResponseEntity<>(ResultModel.ok(), HttpStatus.OK);
+        XklMemberEntity xklMemberEntity = memberRespository.findOne((long) user.getMemberId());
+        Date birthDate = new Date();
+        try {
+            birthDate = sdf.parse(xklMemberEntity.getBirthDate());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        int age = DatetimeTools.getAge(birthDate, new Date());
+        UsrInfoModelForUSPIH usrInfo = new UsrInfoModelForUSPIH(xklMemberEntity.getName(), xklMemberEntity.isSex() ?
+                1 : 0, age);
+        return new ResponseEntity<>(ResultModel.ok(usrInfo), HttpStatus.OK);
     }
     }
 
 
 
 

+package com.xkl.model;
+
+import lombok.Data;
+
+/**
+ * USPIH用户验证时返回的用户信息
+ */
+@Data
+public class UsrInfoModelForUSPIH {
+    private String name;
+    private int sex;
+    private int age;
+
+    public UsrInfoModelForUSPIH(String name, int sex, int age) {
+        this.name = name;
+        this.sex = sex;
+        this.age = age;
+    }
+}