2020年6月13日

This commit is contained in:
BA7LZD 2020-06-13 22:38:48 +08:00
parent 4ea650c749
commit 1b2027b9d0
11 changed files with 633 additions and 71 deletions

View File

@ -9,7 +9,7 @@ public class BabyBean{
private int familyId;
private int babyId;
private String babyName;
private Date babyBirthday;
private String babyBirthday;
private int isSelectBaby;
private int babyGender;
private String familyName;
@ -63,11 +63,11 @@ public class BabyBean{
this.babyName = babyName;
}
public Date getBabyBirthday() {
public String getBabyBirthday() {
return babyBirthday;
}
public void setBabyBirthday(Date babyBirthday) {
public void setBabyBirthday(String babyBirthday) {
this.babyBirthday = babyBirthday;
}

View File

@ -0,0 +1,80 @@
package com.yuxihan.bean;
import org.springframework.stereotype.Component;
import java.util.Date;
@Component
public class BabyGroupBean {
private int babyId;
private int familyId;
private String babyName;
private String babyHead;
private Double babyHeight;
private Double babyWeight;
private Double babyHeadWidth;
private String babyMonth;
public int getFamilyId() {
return familyId;
}
public void setFamilyId(int familyId) {
this.familyId = familyId;
}
public int getBabyId() {
return babyId;
}
public void setBabyId(int babyId) {
this.babyId = babyId;
}
public String getBabyName() {
return babyName;
}
public void setBabyName(String babyName) {
this.babyName = babyName;
}
public String getBabyHead() {
return babyHead;
}
public void setBabyHead(String babyHead) {
this.babyHead = babyHead;
}
public Double getBabyHeight() {
return babyHeight;
}
public void setBabyHeight(Double babyHeight) {
this.babyHeight = babyHeight;
}
public Double getBabyWeight() {
return babyWeight;
}
public void setBabyWeight(Double babyWeight) {
this.babyWeight = babyWeight;
}
public Double getBabyHeadWidth() {
return babyHeadWidth;
}
public void setBabyHeadWidth(Double babyHeadWidth) {
this.babyHeadWidth = babyHeadWidth;
}
public String getBabyMonth() {
return babyMonth;
}
public void setBabyMonth(String babyMonth) {
this.babyMonth = babyMonth;
}
}

View File

@ -7,12 +7,21 @@ public class FamilyBean {
private String familyName;
private int familyId;
private int userId;//创建者
private String userName;//创建者
private String invitedCode;
private int membersCount;
private int recordCount;
private String createdUserName;
private int isTop;
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public int getIsTop() {
return isTop;
}

View File

@ -12,6 +12,15 @@ public class PostCommentContentBean {
private String userName;
private String userHead;
private Date commentTime;
private String nickname;
public String getNickname() {
return nickname;
}
public void setNickname(String nickname) {
this.nickname = nickname;
}
public int getPostId() {
return postId;

View File

@ -14,14 +14,39 @@ public class PostDetailBean {
private String familyName;
private String userName;
private String userHead;
private String nickname;
private String babyName;
private String babyHead;
private int babyId;
private String postTextContent;//内容
private String postVideoUrl;//视频url
private String postPicUrls;//图片url
private Date postTime;//发帖时间
private String postTime;//发帖时间
private int isLikedByCurAccount;//当前用户是否点赞
private long createdTime;
public long getCreatedTime() {
return createdTime;
}
public void setCreatedTime(long createdTime) {
this.createdTime = createdTime;
}
public String getNickname() {
return nickname;
}
public void setNickname(String nickname) {
this.nickname = nickname;
}
public int getIsLikedByCurAccount() {
return isLikedByCurAccount;
}
public void setIsLikedByCurAccount(int isLikedByCurAccount) {
this.isLikedByCurAccount = isLikedByCurAccount;
}
public String getBabyName() {
return babyName;
@ -143,11 +168,11 @@ public class PostDetailBean {
this.postPicUrls = postPicUrls;
}
public Date getPostTime() {
public String getPostTime() {
return postTime;
}
public void setPostTime(Date postTime) {
public void setPostTime(String postTime) {
this.postTime = postTime;
}
}

View File

@ -6,6 +6,9 @@ import com.yuxihan.servies.UserServies;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -14,6 +17,111 @@ public class UserController {
@Autowired
private UserServies userServies;
/**
* 记录成长
* @param map
* @return
*/
@RequestMapping(value = "saveBabyGroup",method = RequestMethod.POST)
public ErrJson saveBabyGroup(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
//#{babyId},#{babyWeight},#{babyHeight},#{babyHeadWidth},#{babyMonth})
return userServies.saveBabyGroup(map.get("familyId"),map.get("babyId"),map.get("babyWeight"),map.get("babyHeight"),map.get("babyHeadWidth"),map.get("babyMonth"));
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 获取成长记录列表
* @param map
* @return
*/
@RequestMapping(value = "getBabyGroupList",method = RequestMethod.POST)
public ErrJson getBabyGroupList(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
return userServies.getBabyGroupList(Integer.parseInt(map.get("familyId")));
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 删除宝宝
* @param map
* @return
*/
@RequestMapping(value = "deleteBaby",method = RequestMethod.POST)
public ErrJson deleteBaby(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
return userServies.deleteBaby(Integer.parseInt(map.get("babyId")));
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 获取宝宝列表
* @param map
* @return
*/
@RequestMapping(value = "getBabyList",method = RequestMethod.POST)
public ErrJson getBabyList(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
//#{familyId},#{babyName},#{babyHead},#{babyGender},#{babyBirthday}
return userServies.getBabyList(Integer.parseInt(map.get("familyId")));
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 修改宝宝信息
* @param map
* @return
*/
@RequestMapping(value = "updateBaby",method = RequestMethod.POST)
public ErrJson updateBaby(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
//#{familyId},#{babyName},#{babyHead},#{babyGender},#{babyBirthday}
return userServies.addBaby(Integer.parseInt(map.get("familyId")),map.get("babyName"),map.get("babyHead"),Integer.parseInt(map.get("babyGender")),map.get("babyBirthday"),map.get("babyId"),1);
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 添加宝宝
* @param map
* @return
*/
@RequestMapping(value = "addBaby",method = RequestMethod.POST)
public ErrJson addBaby(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
//#{familyId},#{babyName},#{babyHead},#{babyGender},#{babyBirthday}
return userServies.addBaby(Integer.parseInt(map.get("familyId")),map.get("babyName"),map.get("babyHead"),Integer.parseInt(map.get("babyGender")),map.get("babyBirthday"),map.get("babyBirthday"),0);
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 获取评论列表
* @param map
* @return
*/
@RequestMapping(value = "getCommentList",method = RequestMethod.POST)
public ErrJson getCommentList(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
//#{userId},#{familyId},babyId,#{postTextContent},#{postVideoUrl},#{postPicUrls}
return userServies.getCommentList(Integer.parseInt(map.get("postId")));
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 评论
* @param map
* @return
*/
@RequestMapping(value = "saveComment",method = RequestMethod.POST)
public ErrJson saveComment(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
//#{userId},#{familyId},babyId,#{postTextContent},#{postVideoUrl},#{postPicUrls}
return userServies.saveComment(map.get("userName"),Integer.parseInt(map.get("postId")),map.get("commentContent"));
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 获取发帖列表
* @param map
@ -27,6 +135,7 @@ public class UserController {
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 发帖
* @param map
@ -36,11 +145,27 @@ public class UserController {
public ErrJson savePostDetail(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
//#{userId},#{familyId},babyId,#{postTextContent},#{postVideoUrl},#{postPicUrls}
return userServies.savePostDetail(map.get("userName"),Integer.parseInt(map.get("familyId")),Integer.parseInt(map.get("babyId")),map.get("postTextContent"),map.get("postVideoUrl"),map.get("postPicUrls"));
return userServies.savePostDetail(map.get("userName"),Integer.parseInt(map.get("familyId")),Integer.parseInt(map.get("babyId")),map.get("postTextContent"),map.get("postVideoUrl"),map.get("postPicUrls"),map.get("postTime"));
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 关注别的家庭
* @param map
* @return
*/
@RequestMapping(value = "addFamilyMembers",method = RequestMethod.POST)
public ErrJson addFamilyMembers(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
//num 2新建家庭时顺带添加入家庭成员列表 4直接添加家庭成员
//0 userName 1 familyId 2 membersNickname 3 invitedCode
System.out.println(map.get("membersNickname"));
return userServies.addFamilyMembers(3,map.get("userName"),/*map.get("membersNickname")*/"",map.get("invitedCode"));
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}
/**
* 获取邀请码
* @param map
@ -85,7 +210,7 @@ public class UserController {
@RequestMapping(value = "addFamily",method = RequestMethod.POST)
public ErrJson addFamily(@RequestBody Map<String,String> map) {
if ("0" == userServies.authenticateToken(map.get("userName"),map.get("token")).getErrCode()) {
return userServies.addFamily(map.get("familyName"),map.get("userName"));
return userServies.addFamily(map.get("familyName"),map.get("userName"),1);
}
return userServies.authenticateToken(map.get("userName"),map.get("token"));
}

View File

@ -115,12 +115,33 @@ public interface UserMapper {
* @return
*/
int getFamilyId(String userName);
/**
* 获取家庭名字
* @param userName
* @return
*/
String getFamilyName(String userName);
/**
* 获取邀请码
* @param familyId
* @return
*/
String getInvitedCode(int familyId);
/**
* 邀请码是否存在
* @param invitedCode
* @return
*/
int isExistsInvitedCode(String invitedCode);
/**
* 根据邀请码获取家庭ID
* @param invitedCode
* @return
*/
int getInvitedCodeFamilyId(String invitedCode);
/**
* 添加家庭成员
* @param familyMembers
@ -143,7 +164,7 @@ public interface UserMapper {
* @param babyBean
*/
void addBaby(BabyBean babyBean);
void updateBaby(BabyBean babyBean);
/**
* 删除宝宝
* @param babyId
@ -154,25 +175,26 @@ public interface UserMapper {
* 获取宝宝列表
* @return
*/
ArrayList<String> getBabyList();
ArrayList<BabyBean> getBabyList(int familyId);
/**
* 获取帖列表
* @return
*/
ArrayList<String> getPostDetailList();
ArrayList<PostDetailBean> getPostDetailList(int familyId);
/**
* 评论
* @param postDetail
*/
void saveComment(PostDetailBean postDetail);
void saveComment(PostCommentContentBean postDetail);
/**
* 获取评论列表
* @param postId
* @return
*/
ArrayList<String> getCommentList(String postId);
ArrayList<PostCommentContentBean> getCommentList(int postId);
/**
* 插入或更新验证码
@ -201,6 +223,18 @@ public interface UserMapper {
*/
UserBean getUserHeadName(String userName);
/**
* 记录成长
* @param babyGroupBean
*/
void saveBabyGroup(BabyGroupBean babyGroupBean);
/**
* 获取成长记录列表
* @param babyId
* @return
*/
ArrayList<BabyGroupBean> getBabyGroupList(int familyId);
}

View File

@ -3,6 +3,7 @@ package com.yuxihan.servies;
import com.yuxihan.bean.*;
import java.util.ArrayList;
import java.util.Date;
public interface UserServies {
@ -34,7 +35,7 @@ public interface UserServies {
ErrJson isUserCreatedFamily(String userName);
ErrJson addFamily(String familyName, String userName);
ErrJson addFamily(String familyName, String userName,int status);
ErrJson getFamilyList(String userName);
@ -44,7 +45,17 @@ public interface UserServies {
ErrJson getInvitedCode(int familyId);
ErrJson savePostDetail(String userName,int familyId,int babyId,String postTextContent,String postVideoUrl,String postPicUrls);
ErrJson savePostDetail(String userName,int familyId,int babyId,String postTextContent,String postVideoUrl,String postPicUrls,String postTime);
ErrJson getPostDetailList(int familyId);
ErrJson addBaby(int familyId, String babyName, String babyHead, int babyGender,String babyBirthday,String babyId,int status);
ErrJson updateBaby(int babyId,int familyId, String babyName, String babyHead, int babyGender,String babyBirthday);
ErrJson deleteBaby(int babyId);
ErrJson getBabyList(int familyId);
ErrJson saveComment(String userName,int postId,String commentCount);
ErrJson getCommentList(int postId);
ErrJson saveBabyGroup(String familyId,String babyId,String babyWeight,String babyHeight,String babyHeadWidth,String babyMonth);
ErrJson getBabyGroupList(int familyId);
}

View File

@ -23,13 +23,13 @@ public class UserServiesImpl implements UserServies {
private static final String SUCCESS = "0";
private static final String FAIL = "1";
private static final Integer ENABLE = 0;
private static final Integer STOP = 1;
private static final int ENABLE = 0;
private static final int STOP = 1;
private static final String TIME = "30";
private static final Integer TOP = 0;
private static final Integer NOTTOP = 1;
private static final int INIT = 2;
private static final int FUNCTION = 4;
private static final int FUNCTION = 3;
private static final int MAX_PERMISSION = 0;
private static final int MID_PERMISSION = 1;
private static final int MIN_PERMISSION = 2;
@ -56,6 +56,13 @@ public class UserServiesImpl implements UserServies {
private FamilyMembers familyMembers;
@Autowired
private PostDetailBean postDetail;
@Autowired
private BabyBean babyBean;
@Autowired
private PostCommentContentBean postCommentContentBean;
@Autowired
private BabyGroupBean babyGroupBean;
public ArrayList<UserBean> findAll() {
return userMapper.findAll();
@ -95,6 +102,7 @@ public class UserServiesImpl implements UserServies {
/**
* 验证token
*
* @param userName
* @param token
* @return
@ -177,6 +185,7 @@ public class UserServiesImpl implements UserServies {
/**
* 查询指定用户信息
*
* @param userName
* @return
*/
@ -185,10 +194,10 @@ public class UserServiesImpl implements UserServies {
Map<String, Object> result = new HashMap<>();
user = userMapper.getPersonalInfo(userName);
result.put("userHead",user.getUserHead());
result.put("nickname",user.getNickname());
result.put("userName",user.getUserName());
result.put("userId",user.getUserId());
result.put("userHead", user.getUserHead());
result.put("nickname", user.getNickname());
result.put("userName", user.getUserName());
result.put("userId", user.getUserId());
errJson.setErrCode(SUCCESS);
errJson.setResult(result);
return errJson;
@ -196,6 +205,7 @@ public class UserServiesImpl implements UserServies {
/**
* 查询用户是否可以创建小家
*
* @param userName
* @return
*/
@ -212,34 +222,48 @@ public class UserServiesImpl implements UserServies {
/**
* 新建小家
*
* @param familyName
* @param userName
* @return
*/
@Override
public ErrJson addFamily(String familyName, String userName) {
if (checkUserName(userName)) return errJson;
if (userMapper.isUserCreatedFamily(userName)>0) {
public ErrJson addFamily(String familyName, String userName, int status) {
if (status == ENABLE) {
if (checkUserName(userName)) return errJson;
}
if (userMapper.isUserCreatedFamily(userName) > 0) {
errJson.setErrMsg("用户已创建家庭");
return errJson;
}
if (familyName.isEmpty()) {
errJson.setErrMsg("家庭名不能为空");
return errJson;
switch (status) {
case STOP:
familyBean.setFamilyName(userName + "的家庭");
break;
case ENABLE:
familyBean.setFamilyName(familyName);
break;
}
errJson.setErrCode(SUCCESS);
familyBean.setUserId(userMapper.getUserId(userName));
familyBean.setInvitedCode(getVerificationCode());
familyBean.setFamilyName(familyName);
while (true){
String invitedCode = getVerificationCode();
if(0==userMapper.isExistsInvitedCode(invitedCode)){
familyBean.setInvitedCode(invitedCode);
break;
}
}
familyBean.setIsTop(NOTTOP);
userMapper.addFamily(familyBean);
addFamilyMembers(INIT,userName,userMapper.getFamilyId(userName)+"");
addFamilyMembers(INIT, userName, userMapper.getFamilyId(userName) + "");
return errJson;
}
/**
* 用户名是否为空或不存在
*
* @param userName
* @return
*/
@ -248,7 +272,7 @@ public class UserServiesImpl implements UserServies {
errJson.setErrMsg("用户名不能为空");
return true;
}
if (0 ==userMapper.isExistsUser(userName)) {
if (0 == userMapper.isExistsUser(userName)) {
errJson.setErrMsg("用户不存在");
return true;
}
@ -257,13 +281,14 @@ public class UserServiesImpl implements UserServies {
/**
* 获取当前用户的家庭列表
*
* @param userName
* @return
*/
@Override
public ErrJson getFamilyList(String userName) {
Map<String,Object> result = new HashMap<>();
result.put("familyList",userMapper.getFamilyList(userName));
Map<String, Object> result = new HashMap<>();
result.put("familyList", userMapper.getFamilyList(userName));
errJson.setResult(result);
errJson.setErrCode(SUCCESS);
return errJson;
@ -271,11 +296,12 @@ public class UserServiesImpl implements UserServies {
/**
* 不再关注某家庭或删除某成员
*
* @param userName,familyId
* @return
*/
@Override
public ErrJson deleteFamily(String userName,int familyId) {
public ErrJson deleteFamily(String userName, int familyId) {
familyMembers.setFamilyId(familyId);
familyMembers.setUserId(userMapper.getUserId(userName));
userMapper.deleteFamily(familyMembers);
@ -284,36 +310,39 @@ public class UserServiesImpl implements UserServies {
}
/**
*添加家庭成员
* 添加家庭成员
*
* @param num
* @param params
* @return
*/
@Override
public ErrJson addFamilyMembers(int num,String... params) {
//0 userName 1 familyId 2 membersNickname 3 invitedCode
public ErrJson addFamilyMembers(int num, String... params) {
//num 2新建家庭时顺带添加入家庭成员列表 4直接添加家庭成员
//0 userName 1 membersNickname 2 invitedCode
if (FUNCTION == num) {
int familyId = Integer.parseInt(params[1]);
String invitedCode = userMapper.getInvitedCode(familyId);
if (!params[3].equals(invitedCode)) {
if (0 == userMapper.isExistsInvitedCode(params[2])) {
errJson.setErrCode(FAIL);
errJson.setErrMsg("邀请码不正确");
return errJson;
}
}
familyMembers.setUserId(userMapper.getUserId(params[0]));
familyMembers.setFamilyId(Integer.parseInt(params[1]));
switch(num){
switch (num) {
case INIT:
familyMembers.setMembersNickname("一家之主");
familyMembers.setMembersPermission(MAX_PERMISSION);
familyMembers.setFamilyId(Integer.parseInt(params[1]));
break;
case FUNCTION:
if (params[2].isEmpty()) {
if (params[1].isEmpty()) {
familyMembers.setMembersNickname("其他");
}else {
familyMembers.setMembersNickname(params[2]);
} else {
familyMembers.setMembersNickname(params[1]);
}
familyMembers.setMembersPermission(MIN_PERMISSION);
familyMembers.setFamilyId(userMapper.getInvitedCodeFamilyId(params[2]));
break;
}
userMapper.addFamilyMembers(familyMembers);
@ -323,13 +352,14 @@ public class UserServiesImpl implements UserServies {
/**
* 获取邀请码
*
* @param familyId
* @return
*/
@Override
public ErrJson getInvitedCode(int familyId) {
Map<String,Object> result = new HashMap<>();
result.put("familyId",userMapper.getInvitedCode(familyId));
Map<String, Object> result = new HashMap<>();
result.put("familyId", userMapper.getInvitedCode(familyId));
errJson.setResult(result);
errJson.setErrCode(SUCCESS);
return errJson;
@ -337,6 +367,7 @@ public class UserServiesImpl implements UserServies {
/**
* 发帖
*
* @param userName
* @param familyId
* @param postTextContent
@ -345,7 +376,9 @@ public class UserServiesImpl implements UserServies {
* @return
*/
@Override
public ErrJson savePostDetail(String userName,int familyId,int babyId,String postTextContent,String postVideoUrl,String postPicUrls) {
public ErrJson savePostDetail(String userName, int familyId, int babyId,
String postTextContent, String postVideoUrl, String postPicUrls
, String postTime) {
//#{userId},#{familyId},#{postTextContent},#{postVideoUrl},#{postPicUrls}
postDetail.setUserId(userMapper.getUserId(userName));
postDetail.setFamilyId(familyId);
@ -353,6 +386,7 @@ public class UserServiesImpl implements UserServies {
postDetail.setPostVideoUrl(postVideoUrl);
postDetail.setPostPicUrls(postPicUrls);
postDetail.setBabyId(babyId);
postDetail.setPostTime(postTime);
userMapper.savePostDetail(postDetail);
errJson.setErrMsg("");
errJson.setErrCode(SUCCESS);
@ -361,20 +395,164 @@ public class UserServiesImpl implements UserServies {
/**
* 获取发帖列表
*
* @param familyId
* @return
*/
@Override
public ErrJson getPostDetailList(int familyId) {
ArrayList<String> postDetailList= userMapper.getPostDetailList();
Map<String,Object> result = new HashMap<>();
result.put("postDetailList",postDetailList);
Map<String, Object> result = new HashMap<>();
result.put("postDetailList",userMapper.getPostDetailList(familyId));
errJson.setResult(result);
errJson.setErrMsg("");
errJson.setErrCode(SUCCESS);
return errJson;
}
/**
* 添加宝宝或修改宝宝信息
*
* @param familyId
* @return
*/
@Override
public ErrJson addBaby(int familyId, String babyName, String babyHead, int babyGender,
String babyBirthday,String babyId,int status) {
//status 0添加宝宝 1修改宝宝信息
//#{familyId},#{babyName},#{babyHead},#{babyGender},#{babyBirthday}
babyBean.setFamilyId(familyId);
babyBean.setBabyName(babyName);
babyBean.setBabyHead(babyHead);
babyBean.setBabyGender(babyGender);
babyBean.setBabyBirthday(babyBirthday);
switch (status){
case ENABLE:
userMapper.addBaby(babyBean);
break;
case STOP:
babyBean.setBabyId(Integer.parseInt(babyId));
userMapper.updateBaby(babyBean);
break;
default:
break;
}
errJson.setErrMsg("");
errJson.setErrCode(SUCCESS);
return errJson;
}
@Override
public ErrJson updateBaby(int babyId,int familyId, String babyName, String babyHead, int babyGender,
String babyBirthday) {
//#{familyId},#{babyName},#{babyHead},#{babyGender},#{babyBirthday}
babyBean.setFamilyId(familyId);
babyBean.setBabyName(babyName);
babyBean.setBabyHead(babyHead);
babyBean.setBabyGender(babyGender);
babyBean.setBabyBirthday(babyBirthday);
babyBean.setBabyId(babyId);
userMapper.addBaby(babyBean);
errJson.setErrMsg("");
errJson.setErrCode(SUCCESS);
return null;
}
@Override
public ErrJson deleteBaby(int babyId) {
userMapper.deleteBaby(babyId);
errJson.setErrMsg("");
errJson.setErrCode(SUCCESS);
return errJson;
}
/**
* 获取宝宝列表
* @param familyId
* @return
*/
@Override
public ErrJson getBabyList(int familyId) {
Map<String,Object>result = new HashMap<>();
result.put("babyList",userMapper.getBabyList(familyId));
errJson.setErrCode(SUCCESS);
errJson.setErrMsg("");
errJson.setResult(result);
return errJson;
}
/**
* 评论
* @param userName
* @param postId
* @param commentContent
* @return
*/
@Override
public ErrJson saveComment(String userName,int postId,String commentContent) {
//#{userId},#{postId},#{commentCount}
postCommentContentBean.setUserId(userMapper.getUserId(userName));
postCommentContentBean.setPostId(postId);
postCommentContentBean.setCommentContent(commentContent);
userMapper.saveComment(postCommentContentBean);
errJson.setErrCode(SUCCESS);
errJson.setErrMsg("");
return errJson;
}
/**
* 获取评论列表
* @param postId
* @return
*/
@Override
public ErrJson getCommentList(int postId) {
Map<String,Object>result = new HashMap<>();
result.put("commentList",userMapper.getCommentList(postId));
errJson.setErrCode(SUCCESS);
errJson.setErrMsg("");
errJson.setResult(result);
return errJson;
}
/**
* 记录成长
* @param babyId
* @param babyWeight
* @param babyHeight
* @param babyHeadWidth
* @param babyMonth
* @return
*/
@Override
public ErrJson saveBabyGroup(String familyId,String babyId,String babyWeight,String babyHeight,String babyHeadWidth,String babyMonth) {
//#{babyId},#{babyWeight},#{babyHeight},#{babyHeadWidth},#{babyMonth})
babyGroupBean.setBabyHeight(Double.parseDouble(babyHeight));
babyGroupBean.setBabyHeadWidth(Double.parseDouble(babyHeadWidth));
babyGroupBean.setBabyWeight(Double.parseDouble(babyWeight));
babyGroupBean.setBabyId(Integer.parseInt(babyId));
babyGroupBean.setFamilyId(Integer.parseInt(babyId));
babyGroupBean.setBabyMonth(babyMonth);
userMapper.saveBabyGroup(babyGroupBean);
errJson.setErrCode(SUCCESS);
errJson.setErrMsg("");
return errJson;
}
/**
* 获取成长记录列表
* @param
* @return
*/
@Override
public ErrJson getBabyGroupList(int familyId) {
Map<String,Object>result = new HashMap<>();
result.put("babyGroupList",userMapper.getBabyGroupList(familyId));
errJson.setResult(result);
errJson.setErrCode(SUCCESS);
errJson.setErrMsg("");
return errJson;
}
/**
* 修改昵称
*
@ -403,14 +581,16 @@ public class UserServiesImpl implements UserServies {
* @return
*/
public ErrJson login(String userName, String password) {
if (isNotEmpty(userName, password)) return errJson;
if (isNotEmpty(userName, password, ENABLE)) return errJson;
user.setUserName(userName);
if (userMapper.getPsd(userName).equals(md5Util.string2MD5(password))) {
Map<String, Object> ticket = new HashMap<>();
ticket.put("token", addLoginTicket(userMapper.getUserId(userName)));
ticket.put("userHead",userMapper.getUserHeadName(userName).getUserHead());
ticket.put("nickname",userMapper.getUserHeadName(userName).getNickname());
ticket.put("userHead", userMapper.getUserHeadName(userName).getUserHead());
ticket.put("nickname", userMapper.getUserHeadName(userName).getNickname());
ticket.put("familyId", userMapper.getFamilyId(userName));
ticket.put("familyName", userMapper.getFamilyName(userName));
errJson.setErrCode(SUCCESS);
errJson.setResult(ticket);
return errJson;
@ -427,17 +607,19 @@ public class UserServiesImpl implements UserServies {
* @param userName,password
*/
public ErrJson addUser(String userName, String password, String verificationCode) {
if (isNotEmpty(userName, password)) return errJson;
if (isNotEmpty(userName, password, STOP)) return errJson;
user.setPassword(md5Util.string2MD5(password));
user.setUserName(userName);
//默认昵称
user.setNickname("用户" + Calendar.getInstance().getTimeInMillis());
if (1 == userMapper.isExistsUser(userName)) {
errJson.setErrMsg("用户名已存在");
return errJson;
} else if (null != verificationCode && verificationCode.equals(userMapper.getVeriCode(userName)) && 0 == userMapper.getCodeStatus(userName)) {
userMapper.addUser(user);
errJson.setErrCode(SUCCESS);
addFamily("", userName, STOP);
return errJson;
} else {
errJson.setErrMsg("验证码错误或过期");
@ -495,7 +677,7 @@ public class UserServiesImpl implements UserServies {
* @param password
* @return
*/
private boolean isNotEmpty(String userName,String password) {
private boolean isNotEmpty(String userName, String password, int status) {
errJson.setErrCode(FAIL);
errJson.setErrMsg("");
if (userName.isEmpty()) {
@ -506,7 +688,7 @@ public class UserServiesImpl implements UserServies {
errJson.setErrMsg("密码不能为空");
return true;
}
if (0 == userMapper.isExistsUser(userName)) {
if (status == 0 && 0 == userMapper.isExistsUser(userName)) {
errJson.setErrMsg("用户名不存在");
return true;
}
@ -515,6 +697,7 @@ public class UserServiesImpl implements UserServies {
/**
* 生成token
*
* @param userId
* @return
*/
@ -525,8 +708,10 @@ public class UserServiesImpl implements UserServies {
userMapper.insertToken(token);
return token.getUserToken();
}
/**
* 随机生成验证码或邀请码
*
* @return
*/
private String getVerificationCode() {

View File

@ -1,22 +1,77 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuxihan.mapper.UserMapper">
<!-- baby成长记录表 -->
<parameterMap id="BaseBabyGroupMap" type="com.yuxihan.bean.BabyGroupBean"/>
<sql id="Baby_Group_Column_List">family_id,baby_id,baby_weight,baby_height,baby_head_width,baby_month</sql>
<resultMap id="BaseBabyGroupMap" type="com.yuxihan.bean.BabyGroupBean">
<result column="baby_height" property="babyHeight"/>
<result column="baby_month" property="babyMonth"/>
<result column="baby_id" property="babyId"/>
<result column="baby_name" property="babyName"/>
<result column="baby_head" property="babyHead"/>
<result column="baby_weight" property="babyWeight"/>
<result column="family_id" property="familyId"/>
<result column="baby_head_width" property="babyHeadWidth"/>
</resultMap>
<!-- baby成长记录 -->
<insert id="saveBabyGroup" parameterMap="BaseBabyGroupMap">
insert into baby_group (<include refid="Baby_Group_Column_List"/>) values (#{familyId},#{babyId},#{babyWeight},#{babyHeight},#{babyHeadWidth},#{babyMonth})
</insert>
<!-- 查询成长记录 -->
<select id="getBabyGroupList" resultMap="BaseBabyGroupMap" parameterType="INTEGER">
select bg.baby_id,bl.baby_name,bl.baby_head,bg.baby_weight,bg.baby_head_width,bg.baby_height,bg.baby_month from baby_group bg left join baby_list bl on bg.baby_id=bl.baby_id
where bg.family_id=#{familyId}
</select>
<!-- baby表 -->
<parameterMap id="BaseBabyMap" type="com.yuxihan.bean.BabyBean"/>
<sql id="Baby_Column_List">family_id,baby_name,baby_head,baby_gender,birthday</sql>
<resultMap id="BaseBabyMap" type="com.yuxihan.bean.BabyBean">
<result column="family_id" property="familyId"/>
<result column="family_name" property="familyName"/>
<result column="baby_id" property="babyId"/>
<result column="baby_name" property="babyName"/>
<result column="baby_head" property="babyHead"/>
<result column="baby_gender" property="babyGender"/>
<result column="is_select_baby" property="isSelectBaby"/>
<result column="birthday" property="babyBirthday"/>
</resultMap>
<!--添加宝宝-->
<insert id="addBaby" parameterMap="BaseBabyMap">
insert into baby_list (<include refid="Baby_Column_List"/>) values (#{familyId},#{babyName},#{babyHead},#{babyGender},#{babyBirthday})
</insert>
<!--修改宝宝信息-->
<update id="updateBaby" parameterMap="BaseBabyMap">
update baby_list set family_id=#{familyId},baby_name=#{babyName},baby_head=#{babyHead},baby_gender=#{babyGender},birthday=#{babyBirthday} where baby_id=#{babyId}
</update>
<!-- 获取宝宝列表 -->
<select id="getBabyList" resultMap="BaseBabyMap" parameterType="INTEGER">
select family_id,baby_name,baby_head,baby_gender,birthday,baby_id,is_select_baby from baby_list
where family_id=#{familyId}
</select>
<!-- 删除宝宝 -->
<delete id="deleteBaby" parameterType="INTEGER">
delete from baby_list where baby_id=#{babyId}
</delete>
<!-- 评论表 -->
<parameterMap id="BaseCommentMap" type="com.yuxihan.bean.PostCommentContentBean"/>
<sql id="Comment_Column_List">user_id,post_id,comment_content</sql>
<sql id="Comment_Column_List">user_id,post_id,com_content</sql>
<resultMap id="BaseCommentMap" type="com.yuxihan.bean.PostCommentContentBean">
<result column="user_id" property="userId"/>
<result column="post_id" property="postId"/>
<result column="user_name" property="userName"/>
<result column="user_head" property="userHead"/>
<result column="comment_content" property="commentContent"/>
<result column="nickname" property="nickname"/>
<result column="com_content" property="commentContent"/>
<result column="comment_time" property="commentTime"/>
</resultMap>
<!-- 点赞表 -->
<sql id="PostLike_Column_List">user_id,post_id</sql>
<!-- 发帖表 -->
<parameterMap id="BasePostMap" type="com.yuxihan.bean.PostDetailBean"/>
<sql id="Post_Column_List">user_id,family_id,baby_id,post_text_content,post_video_url,post_pic_urls</sql>
<sql id="Post_Column_List">user_id,family_id,baby_id,post_text_content,post_video_url,post_pic_urls,post_time</sql>
<resultMap id="BasePostMap" type="com.yuxihan.bean.PostDetailBean">
<result column="family_id" property="familyId"/>
<result column="user_id" property="userId"/>
@ -26,6 +81,7 @@
<result column="family_name" property="familyName"/>
<result column="user_name" property="userName"/>
<result column="user_head" property="userHead"/>
<result column="nickname" property="nickname"/>
<result column="post_text_content" property="postTextContent"/>
<result column="post_video_url" property="postVideoUrl"/>
<result column="post_pic_urls" property="postPicUrls"/>
@ -33,25 +89,37 @@
<result column="baby_id" property="babyId"/>
<result column="baby_name" property="babyName"/>
<result column="baby_head" property="babyHead"/>
<result column="content" property="commentContent"/>
<result column="comment_time" property="commentTime"/>
<result column="is_like_by_cur_account" property="isLikedByCurAccount"/>
<result column="created_time" property="createdTime"/>
</resultMap>
<!--发帖-->
<!--获取评论列表 -->
<select id="getCommentList" parameterType="INTEGER" resultMap="BaseCommentMap">
select c.user_id,c.post_id,c.com_content,c.comment_time,u.nickname,u.user_name,u.user_head from comment_content c
left join user_info u on c.user_id=u.user_id where c.post_id=#{postId}
</select>
<!--发帖 -->
<insert id="savePostDetail" parameterMap="BasePostMap">
insert into post_detail (<include refid="Post_Column_List"/>) values (#{userId},#{familyId},#{babyId},#{postTextContent},#{postVideoUrl},#{postPicUrls})
insert into post_detail (<include refid="Post_Column_List"/>) values (#{userId},#{familyId},#{babyId},#{postTextContent},#{postVideoUrl},#{postPicUrls},#{postTime})
</insert>
<!--评论-->
<insert id="saveComment" parameterMap="BaseCommentMap">
insert into comment_content (<include refid="Comment_Column_List"/>) values (#{userId},#{postId},#{commentContent})
</insert>
<!--根据家族获取发帖列表-->
<select id="getPostDetailList" resultMap="BasePostMap" parameterType="INTEGER">
select pbufci.*,count(is.user_id) is_like_by_cur_account from(select
p.family_id,p.user_id,count(i.user_id) post_like_count,count(c.user_id) comment_count ,p.post_id,f.family_name,u.user_head,u.user_name,p.baby_id,b.baby_name,b.baby_head,p.post_video_url, p.post_pic_urls, p.post_text_content
select
p.family_id,p.user_id,count(i.user_id) post_like_count,count(c.user_id) comment_count ,p.post_id,unix_timestamp(p.created_time) created_time,f.family_name,u.user_head,u.user_name,u.nickname,p.baby_id,b.baby_name,b.baby_head,p.post_video_url, p.post_pic_urls, p.post_text_content,p.post_time
from post_detail p
left join comment_content c on p.post_id=c.post_id
left join is_liked_by_cur_account i on p.post_id=i.post_id
left join user_info u on p.user_id = u.user_id
left join family_list f on p.family_id=f.family_id
left join baby_list b on p.baby_id=b.baby_id
where p.family_id=#{familyId} group by p.post_id order by p.post_time desc)as pbufci left join is_liked_by_cur_account is on pbufci.post_id=is.post_id where is.user_id=#{userId}
where p.family_id=#{familyId} group by p.post_id order by p.post_time,p.created_time desc
</select>
<!-- 验证码 -->
<parameterMap id="BaseVerCodeMap" type="com.yuxihan.bean.VerificationBean"/>
<sql id="VerCode_Column_List">phone_num,verification_code,code_status</sql>
@ -83,6 +151,7 @@
<resultMap id="BaseFamilyMap" type="com.yuxihan.bean.FamilyBean">
<result column="family_name" property="familyName"/>
<result column="user_id" property="userId"/>
<result column="user_name" property="userName"/>
<result column="family_id" property="familyId"/>
<result column="members_count" property="membersCount"/>
<result column="record_count" property="recordCount"/>
@ -115,7 +184,7 @@
</insert>
<!-- 根据用户获取家庭列表 -->
<select id="getFamilyList" resultMap="BaseFamilyMap" parameterType="String">
select fmpc.family_id,fmpc.family_name,fmpc.is_top,fmpc.record_count,fmpc.members_count,u.nickname from
select fmpc.family_id,fmpc.family_name,fmpc.is_top,fmpc.record_count,fmpc.members_count,fmpc.invited_code,u.nickname,u.user_name from
(
select fmp.*,fmc.members_count from
(select fm.user_id,fm.family_id,fm.family_name,fm.is_top,fm.invited_code,count(p.post_id) record_count from
@ -124,7 +193,7 @@
family_list f inner join (
select family_id,user_id from family_members_list where user_id = (select user_id from user_info where user_name=#{userName})
)as m on f.family_id = m.family_id
) as fm left join post_detail p on fm.family_id=p.family_id group by p.post_id
) as fm left join post_detail p on fm.family_id=p.family_id group by fm.family_id
) as fmp
left join family_members_count_v fmc on fmp.family_id=fmc.family_id
) as fmpc
@ -136,6 +205,12 @@
select user_id from user_info where user_name=#{userName}
)
</select>
<!-- 获取家庭I名字 -->
<select id="getFamilyName" parameterType="String" resultType="String">
select family_name from family_list where user_id = (
select user_id from user_info where user_name=#{userName}
)
</select>
<!-- 不再关注某家庭或删除某成员 -->
<delete id="deleteFamily" parameterMap="BaseFamilyMembersMap" >
delete from family_members_list where family_id=#{familyId} and user_id=#{userId}
@ -148,9 +223,18 @@
<select id="getInvitedCode" resultType="String" parameterType="INTEGER">
select
invited_code
from family_list where family_id=#{family_id}
from family_list where family_id=#{familyId}
</select>
<!--邀请码是否存在-->
<select id="isExistsInvitedCode" resultType="INTEGER" parameterType="String">
select
count(invited_code)
from family_list where invited_code=#{invitedCode}
</select>
<!-- 根据邀请码获取家庭ID -->
<select id="getInvitedCodeFamilyId" parameterType="String" resultType="INTEGER">
select family_id from family_list where invited_code = #{invitedCode}
</select>
<!-- user_token 用户token表-->
<parameterMap id="BaseTokenMap" type="com.yuxihan.bean.TokenBean"/>
<sql id="Token_Column_List">user_id,user_token</sql>