1111212121212

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

@@ -1,6 +1,7 @@
 package com.iamberry.wechat.core.entity.personality;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class PersonalityRecommended implements Serializable {
     private static final long serialVersionUID = -7432868161064829901L;
@@ -9,6 +10,7 @@ public class PersonalityRecommended implements Serializable {
     private String recommendedDesc;//推荐内容
     private Integer recommendedIsHighlow;//高分/低分推荐
     private Integer recommendedTypeId;//人格类型id
+    private List<PersonalityBooks> listPersonalityBooks;
 
     public Integer getRecommendedId() {
         return recommendedId;
@@ -49,4 +51,12 @@ public class PersonalityRecommended implements Serializable {
     public void setRecommendedTypeId(Integer recommendedTypeId) {
         this.recommendedTypeId = recommendedTypeId;
     }
+
+    public List<PersonalityBooks> getListPersonalityBooks() {
+        return listPersonalityBooks;
+    }
+
+    public void setListPersonalityBooks(List<PersonalityBooks> listPersonalityBooks) {
+        this.listPersonalityBooks = listPersonalityBooks;
+    }
 }

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

@@ -15,6 +15,7 @@ public class PersonalitySubject implements Serializable {
     private Integer subjectNumber;//题目序号
     private Integer subjectType;//题目类型
     private List<PersonalityAnswer> listPersonalityAnswer;
+    private List<PersonalityType> listPersonalityType;
 
     public Integer getSubjectId() {
         return subjectId;
@@ -55,4 +56,12 @@ public class PersonalitySubject implements Serializable {
     public void setListPersonalityAnswer(List<PersonalityAnswer> listPersonalityAnswer) {
         this.listPersonalityAnswer = listPersonalityAnswer;
     }
+
+    public List<PersonalityType> getListPersonalityType() {
+        return listPersonalityType;
+    }
+
+    public void setListPersonalityType(List<PersonalityType> listPersonalityType) {
+        this.listPersonalityType = listPersonalityType;
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.iamberry.wechat.face.wechat;
+package com.iamberry.wechat.face.Personality;
 
 import com.iamberry.wechat.core.entity.personality.*;
 
@@ -12,7 +12,7 @@ public interface PersonalitySubjectService {
     //查询题目类型
     public List<PersonalityType> getType(Integer typeId);
     //查询推荐内容
-    public List<PersonalityRecommended> getRecommended(Integer recommendedTypeId);
+    public PersonalityRecommended getRecommended(PersonalityRecommended personalityRecommended);
     //查询推荐书籍
     public List<PersonalityBooks> getBooks(Integer booksRecommendedId);
 }

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

@@ -1,18 +1,10 @@
 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.face.Personality.PersonalitySubjectService;
 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;
 
@@ -43,8 +35,8 @@ public class PersonalitySubjectServiceImpl implements PersonalitySubjectService
 	}
 
 	@Override
-	public List<PersonalityRecommended> getRecommended(Integer recommendedTypeId) {
-		return personalitySubjectMapper.getRecommended(recommendedTypeId);
+	public PersonalityRecommended getRecommended(PersonalityRecommended personalityRecommended) {
+		return personalitySubjectMapper.getRecommended(personalityRecommended);
 	}
 
 	@Override

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

@@ -1,7 +1,6 @@
 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;
 
@@ -13,7 +12,7 @@ public interface PersonalitySubjectMapper {
 	//查询题目类型
 	public List<PersonalityType> getType(Integer typeId);
 	//查询推荐内容
-	public List<PersonalityRecommended> getRecommended(Integer recommendedTypeId);
+	public PersonalityRecommended getRecommended(PersonalityRecommended personalityRecommended);
 	//查询推荐书籍
 	public List<PersonalityBooks> getBooks(Integer booksRecommendedId);
 }

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

@@ -3,13 +3,14 @@
 <!-- 命名，每一个映射对象不一样
 	namespace:必须与对应的接口全类名一致
  -->
-<mapper namespace="com.iamberry.wechat.service.mapper.PersonalitySubjecMapper">
+<mapper namespace="com.iamberry.wechat.service.mapper.PersonalitySubjectMapper">
 	<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"/>
+		<collection property="listPersonalityType" column="subject_type" ofType="PersonalityType" select="getType"/>
 	</resultMap>
 	
 	<select id="listSubject"  resultMap="personalitySubjecMap">
@@ -24,8 +25,10 @@
 		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 id="getRecommended" parameterType="PersonalityRecommended" resultType="PersonalityRecommended">
+		SELECT * FROM tb_personality_recommended where
+		recommended_type_id = #{recommendedTypeId}
+		AND recommended_is_highlow = #{recommendedIsHighlow}
 	</select>
 
 	<select id="getBooks" parameterType="Integer" resultType="PersonalityBooks">

wechat-wechat-web/src/main/java/com/iamberry/wechat/filters/AdminLoginFilter.java

@@ -1,6 +1,7 @@
 package com.iamberry.wechat.filters;
 
 import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
 import java.io.IOException;
 /**
  * @company	深圳爱贝源科技有限公司
@@ -10,7 +11,7 @@ import java.io.IOException;
  * @date	2016年10月18日
  * @explain	管理员登陆过滤器，未登陆时不能访问/main/*、/admin/*中资源; <br>
  * 			注意：绝对不允许添加/admin/*或者admin/**此类的权限路径，"admin/**"是绝对不允许的
- *//*@WebFilter(value = { "/main*//*", "/admin*//*" })*/
+ */@WebFilter(value = { "/main", "/admin" })
 
 public class AdminLoginFilter implements Filter {
 	

wechat-wechat-web/src/main/java/com/iamberry/wechat/filters/CSRFTokenFilter.java

@@ -10,6 +10,7 @@ import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -29,7 +30,7 @@ import com.iamberry.wechat.tools.IpAddressUtil;
  * 			使用注意：如果多次重复启动，可能导致系统拒绝服务，这只是因为tomcat默认最多接受200个cookie的缘故,关闭浏览器重新打开即可。
  * 			另外系统本身已经做了优化处理，保证99%情况下不会出现问题。
  */
-//@WebFilter(value = {"/admin/*", "/loginUI"})
+/*@WebFilter(value = {"/admin/*", "/loginUI"})*/
 public class CSRFTokenFilter implements Filter {
 
 	/**

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

@@ -1,35 +1,67 @@
 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.core.entity.personality.PersonalityAnswer;
+import com.iamberry.wechat.core.entity.personality.PersonalityBooks;
+import com.iamberry.wechat.core.entity.personality.PersonalityRecommended;
+import com.iamberry.wechat.core.entity.personality.PersonalitySubject;
+import com.iamberry.wechat.face.Personality.PersonalitySubjectService;
+import com.iamberry.wechat.face.member.MemberService;
 import com.iamberry.wechat.tools.ResultInfo;
+import org.springframework.beans.factory.annotation.Autowired;
 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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/wechat/personality")
 public class personalityHandler {
+
+    @Autowired
+    private PersonalitySubjectService personalitySubjectService;
+
+    @Autowired
+    private MemberService memberService;
     /**
-     * 测试
+     * 获取题目
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/test", method = RequestMethod.POST)
+    @RequestMapping(value = "/listSubject")
     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);
-
+        /*Member member = WechatUtils.getUserBySession(request);*/
+        List<PersonalitySubject> listPersonalitySubject = personalitySubjectService.listSubject();
+        Map<String,Object> map = new HashMap<String,Object>();
+        map.put("listPersonalitySubject", listPersonalitySubject);
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        msg.setData(map);
+        return msg;
+    }
+    /**
+     * 获取推荐内容
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getRecommended")
+    public ResultMsg getPersonalityRecommended(HttpServletRequest request,PersonalityRecommended personalityRecommended) {
+        ResultMsg msg = new ResultMsg();
+        /*Member member = WechatUtils.getUserBySession(request);*/
+        PersonalityRecommended recommended = personalitySubjectService.getRecommended(personalityRecommended);
+        List<PersonalityBooks> listBooks = personalitySubjectService.getBooks(recommended.getRecommendedId());
+        recommended.setListPersonalityBooks(listBooks);
+        Map<String,Object> map = new HashMap<String,Object>();
+        map.put("recommended", recommended);
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        msg.setData(map);
         return msg;
     }
 }

wechat-wechat-web/src/main/java/com/iamberry/wechat/handles/wechat/config/ConfigHandler.java

@@ -29,7 +29,7 @@ public class ConfigHandler {
 	public void setConfigService(ConfigService configService) {
 		this.configService = configService;
 	}
-	
+
 	@RequestMapping(value="/get", method=RequestMethod.GET)
 	public void getConfig(HttpServletRequest request, HttpServletResponse response) throws IOException{
 		// 如果数据不为空,拼装数据

wechat-wechat-web/src/main/resources/jdbc.properties

@@ -1,8 +1,8 @@
 jdbc.driver=com.mysql.jdbc.Driver
 #��ʽ��
-jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_tooth?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=tooth
-jdbc.password=Tooth123223
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/wechat_rg?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=wechat_rg
+jdbc.password=wechat_rg123
 
 
 #���Կ�

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

@@ -98,6 +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"/>
+		<mapper resource="com/iamberry/wechat/service/mapper/personalitySubjectMapper.xml"/>
 	</mappers>
 </configuration>

wechat-wechat-web/src/main/resources/platform.properties

@@ -17,17 +17,35 @@ TIME_FORMAT=HH:mm:ss
 DATE_TIME_FORMAT=yyyy-MM-dd HH:mm:ss
 # date_time_format1
 DATE_TIME_FORMAT1=yyyy/MM/dd HH:mm:ss
-
+#
 # pubNo -- soodo
-pubNo=gh_cdd0a86d3b19
+#pubNo=gh_cdd0a86d3b19
 # appId-soodo
-appId=wxdb090f0af89e0be3
+#appId=wxdb090f0af89e0be3
 # appSecret-soodo
-appSecret=518114a120274f625530750c1803921b
+#appSecret=518114a120274f625530750c1803921b
+
+# token
+#token=weixin
+
 
+#watero
+# pubNo
+pubNo=gh_c73446c8ce91
 # token
 token=weixin
 
+# appId-test
+#appId=wxc71b789fad06a2d7
+# appId-watero
+appId=wx27c9f825761a861b
+
+# appSecret-test
+#appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
+# appSecret-watero
+appSecret=97b2f2991e4ff0f2567fbc625f858377
+
+
 # partnerkey
 partnerkey=8a90e3ab0e2db7772f5f64e7ed2f4b98