wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/personality/PersonalityAnswer.java

@@ -0,0 +1,43 @@
+package com.iamberry.wechat.core.entity.personality;
+
+import java.io.Serializable;
+
+public class PersonalityAnswer implements Serializable{
+    private static final long serialVersionUID = -4702084902336779541L;
+    private Integer answerId;
+    private String answerName;//答案名称
+    private Integer answerScore;//答案分数
+    private Integer answerSubjectId;//题目id
+
+    public Integer getAnswerId() {
+        return answerId;
+    }
+
+    public void setAnswerId(Integer answerId) {
+        this.answerId = answerId;
+    }
+
+    public String getAnswerName() {
+        return answerName;
+    }
+
+    public void setAnswerName(String answerName) {
+        this.answerName = answerName;
+    }
+
+    public Integer getAnswerScore() {
+        return answerScore;
+    }
+
+    public void setAnswerScore(Integer answerScore) {
+        this.answerScore = answerScore;
+    }
+
+    public Integer getAnswerSubjectId() {
+        return answerSubjectId;
+    }
+
+    public void setAnswerSubjectId(Integer answerSubjectId) {
+        this.answerSubjectId = answerSubjectId;
+    }
+}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/personality/PersonalityBooks.java

@@ -0,0 +1,43 @@
+package com.iamberry.wechat.core.entity.personality;
+
+import java.io.Serializable;
+
+public class PersonalityBooks implements Serializable{
+    private static final long serialVersionUID = 5743874966613980116L;
+    private Integer booksId;
+    private String booksName;//书籍名称
+    private String booksDesc;//书籍简介
+    private Integer booksRecommendedId;//推荐内容id
+
+    public Integer getBooksId() {
+        return booksId;
+    }
+
+    public void setBooksId(Integer booksId) {
+        this.booksId = booksId;
+    }
+
+    public String getBooksName() {
+        return booksName;
+    }
+
+    public void setBooksName(String booksName) {
+        this.booksName = booksName;
+    }
+
+    public String getBooksDesc() {
+        return booksDesc;
+    }
+
+    public void setBooksDesc(String booksDesc) {
+        this.booksDesc = booksDesc;
+    }
+
+    public Integer getBooksRecommendedId() {
+        return booksRecommendedId;
+    }
+
+    public void setBooksRecommendedId(Integer booksRecommendedId) {
+        this.booksRecommendedId = booksRecommendedId;
+    }
+}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/personality/PersonalityRecommended.java

@@ -0,0 +1,52 @@
+package com.iamberry.wechat.core.entity.personality;
+
+import java.io.Serializable;
+
+public class PersonalityRecommended implements Serializable {
+    private static final long serialVersionUID = -7432868161064829901L;
+    private Integer recommendedId;
+    private String recommendedTitle;//推荐标题
+    private String recommendedDesc;//推荐内容
+    private Integer recommendedIsHighlow;//高分/低分推荐
+    private Integer recommendedTypeId;//人格类型id
+
+    public Integer getRecommendedId() {
+        return recommendedId;
+    }
+
+    public void setRecommendedId(Integer recommendedId) {
+        this.recommendedId = recommendedId;
+    }
+
+    public String getRecommendedTitle() {
+        return recommendedTitle;
+    }
+
+    public void setRecommendedTitle(String recommendedTitle) {
+        this.recommendedTitle = recommendedTitle;
+    }
+
+    public String getRecommendedDesc() {
+        return recommendedDesc;
+    }
+
+    public void setRecommendedDesc(String recommendedDesc) {
+        this.recommendedDesc = recommendedDesc;
+    }
+
+    public Integer getRecommendedIsHighlow() {
+        return recommendedIsHighlow;
+    }
+
+    public void setRecommendedIsHighlow(Integer recommendedIsHighlow) {
+        this.recommendedIsHighlow = recommendedIsHighlow;
+    }
+
+    public Integer getRecommendedTypeId() {
+        return recommendedTypeId;
+    }
+
+    public void setRecommendedTypeId(Integer recommendedTypeId) {
+        this.recommendedTypeId = recommendedTypeId;
+    }
+}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/personality/PersonalitySubject.java

@@ -0,0 +1,58 @@
+package com.iamberry.wechat.core.entity.personality;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description 1.1.1	人格-题目表
+ * @author 爱贝源
+ * @date 2020年3月2日11:36:48
+ */
+public class PersonalitySubject implements Serializable {
+    private static final long serialVersionUID = 5684130403044687877L;
+    private Integer subjectId;
+    private String subjectName;//题目名称
+    private Integer subjectNumber;//题目序号
+    private Integer subjectType;//题目类型
+    private List<PersonalityAnswer> listPersonalityAnswer;
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public Integer getSubjectNumber() {
+        return subjectNumber;
+    }
+
+    public void setSubjectNumber(Integer subjectNumber) {
+        this.subjectNumber = subjectNumber;
+    }
+
+    public Integer getSubjectType() {
+        return subjectType;
+    }
+
+    public void setSubjectType(Integer subjectType) {
+        this.subjectType = subjectType;
+    }
+
+    public List<PersonalityAnswer> getListPersonalityAnswer() {
+        return listPersonalityAnswer;
+    }
+
+    public void setListPersonalityAnswer(List<PersonalityAnswer> listPersonalityAnswer) {
+        this.listPersonalityAnswer = listPersonalityAnswer;
+    }
+}

wechat-common-core/src/main/java/com/iamberry/wechat/core/entity/personality/PersonalityType.java

@@ -0,0 +1,34 @@
+package com.iamberry.wechat.core.entity.personality;
+
+import java.io.Serializable;
+
+public class PersonalityType implements Serializable {
+    private static final long serialVersionUID = 55293470174130494L;
+    private Integer typeId;//
+    private String typeName;//类型名称
+    private Integer typeScore;//类型中间值
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public Integer getTypeScore() {
+        return typeScore;
+    }
+
+    public void setTypeScore(Integer typeScore) {
+        this.typeScore = typeScore;
+    }
+}

wechat-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -6,6 +6,8 @@ package com.iamberry.wechat.tools;
  * @date 2016-4-19
  */
 public class ResultInfo {
+	public  static String SUCCESSCODE="200";
+	public  static String ERRORCODE="500";
 	public  static String barCodePrefix="MACHINE_QR_CODE";
 	public  static String barCodeActivity="ACTIVITY_OPENID";
 	public  static String barCodeMainChannelId="main_channel_id_";

wechat-wechat-interface/src/main/java/com/iamberry/wechat/face/wechat/PersonalitySubjectService.java

@@ -0,0 +1,18 @@
+package com.iamberry.wechat.face.wechat;
+
+import com.iamberry.wechat.core.entity.personality.*;
+
+import java.util.List;
+
+public interface PersonalitySubjectService {
+    //查询题目
+    public List<PersonalitySubject> listSubject();
+    //查询答案
+    public List<PersonalityAnswer> getAnswer(Integer subjectId);
+    //查询题目类型
+    public List<PersonalityType> getType(Integer typeId);
+    //查询推荐内容
+    public List<PersonalityRecommended> getRecommended(Integer recommendedTypeId);
+    //查询推荐书籍
+    public List<PersonalityBooks> getBooks(Integer booksRecommendedId);
+}

wechat-wechat-service/src/main/java/com/iamberry/wechat/service/Personality/PersonalitySubjectServiceImpl.java

@@ -0,0 +1,54 @@
+package com.iamberry.wechat.service.Personality;
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.app.tool.log.RatFWLogger;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.core.entity.personality.*;
+import com.iamberry.wechat.face.member.MemberService;
+import com.iamberry.wechat.face.wechat.PersonalitySubjectService;
+import com.iamberry.wechat.service.mapper.MemberMapper;
+import com.iamberry.wechat.service.mapper.PersonalitySubjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import util.PageUtil;
+
+import java.util.List;
+
+/**
+ * 人格测试 service 实现
+ * 2020年3月3日11:00:06
+ * @author Administrator
+ *
+ */
+@Service
+public class PersonalitySubjectServiceImpl implements PersonalitySubjectService {
+	@Autowired
+	private PersonalitySubjectMapper personalitySubjectMapper;
+
+	@Override
+	public List<PersonalitySubject> listSubject() {
+		return personalitySubjectMapper.listSubject();
+	}
+
+	@Override
+	public List<PersonalityAnswer> getAnswer(Integer subjectId) {
+		return personalitySubjectMapper.getAnswer(subjectId);
+	}
+
+	@Override
+	public List<PersonalityType> getType(Integer typeId) {
+		return personalitySubjectMapper.getType(typeId);
+	}
+
+	@Override
+	public List<PersonalityRecommended> getRecommended(Integer recommendedTypeId) {
+		return personalitySubjectMapper.getRecommended(recommendedTypeId);
+	}
+
+	@Override
+	public List<PersonalityBooks> getBooks(Integer booksRecommendedId) {
+		return personalitySubjectMapper.getBooks(booksRecommendedId);
+	}
+}

wechat-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/PersonalitySubjectMapper.java

@@ -0,0 +1,19 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.personality.*;
+import com.iamberry.wechat.core.entity.wx.Config;
+
+import java.util.List;
+
+public interface PersonalitySubjectMapper {
+	//查询题目
+	public List<PersonalitySubject> listSubject();
+	//查询答案
+	public List<PersonalityAnswer> getAnswer(Integer subjectId);
+	//查询题目类型
+	public List<PersonalityType> getType(Integer typeId);
+	//查询推荐内容
+	public List<PersonalityRecommended> getRecommended(Integer recommendedTypeId);
+	//查询推荐书籍
+	public List<PersonalityBooks> getBooks(Integer booksRecommendedId);
+}

wechat-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/personalitySubjecMapper.xml

@@ -0,0 +1,35 @@
+<?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">
+<!-- 命名，每一个映射对象不一样
+	namespace:必须与对应的接口全类名一致
+ -->
+<mapper namespace="com.iamberry.wechat.service.mapper.PersonalitySubjecMapper">
+	<resultMap type="PersonalitySubject" id="personalitySubjecMap">
+		<id column="subject_id" property="subjectId"/>
+		<result column="subject_name" property="subjectName"/>
+		<result column="subject_number" property="subjectNumber"/>
+		<result column="subject_type" property="subjectType"/>
+		<collection property="listPersonalityAnswer" column="subject_id" ofType="PersonalityAnswer" select="getAnswer"/>
+	</resultMap>
+	
+	<select id="listSubject"  resultMap="personalitySubjecMap">
+		SELECT * FROM tb_personality_subject
+	</select>
+
+	<select id="getAnswer" parameterType="Integer" resultType="PersonalityAnswer">
+		SELECT * FROM tb_personality_answer where answer_subject_id = #{subjectId}
+	</select>
+
+	<select id="getType" parameterType="Integer" resultType="PersonalityType">
+		SELECT * FROM tb_personality_type where type_id = #{typeId}
+	</select>
+
+	<select id="getRecommended" parameterType="Integer" resultType="PersonalityRecommended">
+		SELECT * FROM tb_personality_recommended where recommended_type_id = #{recommendedTypeId}
+	</select>
+
+	<select id="getBooks" parameterType="Integer" resultType="PersonalityBooks">
+		SELECT * FROM tb_personality_books where books_recommended_id = #{booksRecommendedId}
+	</select>
+
+</mapper>

wechat-wechat-web/src/main/java/com/iamberry/wechat/handles/personality/personalityHandler.java

@@ -0,0 +1,35 @@
+package com.iamberry.wechat.handles.personality;
+
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/wechat/personality")
+public class personalityHandler {
+    /**
+     * 测试
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/test", method = RequestMethod.POST)
+    public ResultMsg checkOrderPaySuccess(HttpServletRequest request) {
+        ResultMsg msg = new ResultMsg();
+        msg.setResultCode(ResultInfo.ERRORCODE);
+        Member member = WechatUtils.getUserBySession(request);
+        msg.setResultCode(ResultInfo.ERRORCODE);
+        msg.setMessage(NameUtils.getConfig("ERRORINFO"));
+        msg.setStatus(false);
+
+        return msg;
+    }
+}

wechat-wechat-web/src/main/resources/mybatis.xml

@@ -67,6 +67,11 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WxPrepayIdErrorResult" alias="WxPrepayIdErrorResult"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.ZTreeBean" alias="ZTreeBean"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WechatShare" alias="WechatShare"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.personality.PersonalityAnswer" alias="PersonalityAnswer"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.personality.PersonalityBooks" alias="PersonalityBooks"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.personality.PersonalityRecommended" alias="PersonalityRecommended"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.personality.PersonalitySubject" alias="PersonalitySubject"/>
+		<typeAlias type="com.iamberry.wechat.core.entity.personality.PersonalityType" alias="PersonalityType"/>
 
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
@@ -93,5 +98,6 @@
 		<mapper resource="com/iamberry/wechat/service/mapper/temporaryQrcodeMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/tokenMapper.xml"/>
 		<mapper resource="com/iamberry/wechat/service/mapper/wechatShareMapper.xml"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/personalitySubjecMapper.xml"/>
 	</mappers>
 </configuration>