Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/highServer/JnbHighServerController.java

@@ -144,4 +144,40 @@ public class JnbHighServerController extends BaseController {
     public AjaxResult travelGuideDetails(@PathVariable Long id) {
         return success(jnbHighServerService.travelGuideDetails(id));
     }
+
+    /**
+     * 小程序获取心理咨询列表
+     */
+    @GetMapping("/psychologyList")
+    public TableDataInfo getPsychology(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getPsychology(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取心理咨询详情
+     */
+    @GetMapping("/psychologyDetails/{id}")
+    public AjaxResult psychologyDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.psychologyDetails(id));
+    }
+
+    /**
+     * 小程序获取线上问诊列表
+     */
+    @GetMapping("/inquiryList")
+    public TableDataInfo getInquiry(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getInquiry(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取线上问诊详情
+     */
+    @GetMapping("/inquiryDetails/{id}")
+    public AjaxResult inquiryDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.inquiryDetails(id));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/knowledge/JnbKnowledgeBaserController.java

@@ -102,4 +102,14 @@ public class JnbKnowledgeBaserController extends BaseController {
         List<JnbKnowledgeBaseVO> list = jnbKnowledgeBaseService.popularKnowledgeList(jnbKnowledgeBaseVO);
         return getDataTable(list);
     }
+
+    /**
+     * 查询已付费的知识库
+     */
+    @GetMapping("/knowledgePayList")
+    public TableDataInfo knowledgePayList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
+        startPage();
+        List<JnbKnowledgeBaseVO> list = jnbKnowledgeBaseService.knowledgePayList(jnbKnowledgeBaseVO);
+        return getDataTable(list);
+    }
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/mapper/JnbHighServerMapper.java

@@ -73,6 +73,14 @@ public interface JnbHighServerMapper {
 
     JnbHighServerVO travelGuideDetails(Long id);
 
+    List<JnbHighServerVO> getPsychology(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO psychologyDetails(Long id);
+
+    List<JnbHighServerVO> getInquiry(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO inquiryDetails(Long id);
+
     void updateLikeNumber(@Param("id") Long id, @Param("type") Integer type);
     void updateWatchNumber(@Param("id") Long id, @Param("type") Integer type);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/service/IJnbHighServerService.java

@@ -71,4 +71,12 @@ public interface IJnbHighServerService {
     List<JnbHighServerVO> getTravelGuide(JnbHighServer jnbHighServer);
 
     JnbHighServerVO travelGuideDetails(Long id);
+
+    List<JnbHighServerVO> getPsychology(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO psychologyDetails(Long id);
+
+    List<JnbHighServerVO> getInquiry(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO inquiryDetails(Long id);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/service/impl/JnbHighServerServiceImpl.java

@@ -187,13 +187,56 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
         }
         return list;
     }
-
     @Override
     public JnbHighServerVO travelGuideDetails(Long id) {
         JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.travelGuideDetails(id);
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
             jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
         }
+        jnbHighServerMapper.updateLikeNumber(id,1);
+        jnbHighServerMapper.updateWatchNumber(id,1);
+        return jnbHighServerVO;
+    }
+
+    @Override
+    public List<JnbHighServerVO> getPsychology(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getPsychology(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+    @Override
+    public JnbHighServerVO psychologyDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.travelGuideDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        jnbHighServerMapper.updateLikeNumber(id,2);
+        jnbHighServerMapper.updateWatchNumber(id,2);
+        return jnbHighServerVO;
+    }
+
+    @Override
+    public List<JnbHighServerVO> getInquiry(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getInquiry(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+    @Override
+    public JnbHighServerVO inquiryDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.inquiryDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        jnbHighServerMapper.updateLikeNumber(id,3);
+        jnbHighServerMapper.updateWatchNumber(id,3);
         return jnbHighServerVO;
     }
 }

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/mapper/JnbKnowledgeBaseMapper.java

@@ -65,4 +65,6 @@ public interface JnbKnowledgeBaseMapper {
     int updateIsPopular(JnbKnowledgeBaseDTO jnbKnowledgeBaseDTO);
 
     List<JnbKnowledgeBaseVO> popularKnowledgeList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO);
+
+    List<JnbKnowledgeBaseVO> knowledgePayList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO);
 }

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/service/IJnbKnowledgeBaseService.java

@@ -64,4 +64,6 @@ public interface IJnbKnowledgeBaseService {
     int updateIsPopular(JnbKnowledgeBaseDTO jnbKnowledgeBaseDTO);
 
     List<JnbKnowledgeBaseVO> popularKnowledgeList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO);
+
+    List<JnbKnowledgeBaseVO> knowledgePayList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO);
 }

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/service/impl/JnbKnowledgeBaseServiceImpl.java

@@ -139,4 +139,9 @@ public class JnbKnowledgeBaseServiceImpl implements IJnbKnowledgeBaseService {
     public List<JnbKnowledgeBaseVO> popularKnowledgeList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
         return jnbKnowledgeBaseMapper.popularKnowledgeList(jnbKnowledgeBaseVO);
     }
+
+    @Override
+    public List<JnbKnowledgeBaseVO> knowledgePayList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
+        return jnbKnowledgeBaseMapper.knowledgePayList(jnbKnowledgeBaseVO);
+    }
 }

sooka-jnb/src/main/resources/mapper/highServer/JnbHighServerMapper.xml

@@ -215,6 +215,84 @@
         where jhs.del_flag = 0 and jhs.type = 1 and jhs.id = #{id}
         GROUP BY jhs.id
     </select>
+
+    <select id="getPsychology" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id)       AS imgId,
+               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 2
+        GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
+    </select>
+    <select id="psychologyDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id) AS imgId,
+               GROUP_CONCAT(jhsi.img_url) AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 2 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
+
+    <select id="getInquiry" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id)       AS imgId,
+               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 3
+        GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
+    </select>
+    <select id="inquiryDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id) AS imgId,
+               GROUP_CONCAT(jhsi.img_url) AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 3 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
+
+
     <update id="updateLikeNumber">
         update jnb_high_server set like_num = like_num + 1 where id = #{id} and type = #{type}
     </update>

sooka-jnb/src/main/resources/mapper/knowledge/JnbKnowledgeBaseMapper.xml

@@ -149,4 +149,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY jkb.id
         order by create_time,watch_num,like_num desc
     </select>
+
+    <select id="knowledgePayList" parameterType="JnbKnowledgeBase" resultType="com.sooka.jnb.knowledge.vo.JnbKnowledgeBaseVO">
+        select kb.* FROM jnb_knowledge_base kb  LEFT JOIN jnb_score_operate so on so.relevance_data_id = kb.id
+        WHERE so.relevance = 1 AND so.user_id  = #{createId}
+    </select>
 </mapper>