补丁

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

@@ -164,6 +164,60 @@ public class JnbHighServerController extends BaseController {
     }
 
     /**
+     * 小程序获取乡村婚恋列表
+     */
+    @GetMapping("/loveAtVillageList")
+    public TableDataInfo getLoveAtVillage(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getLoveAtVillage(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取乡村婚恋详情
+     */
+    @GetMapping("/loveAtVillageDetails/{id}")
+    public AjaxResult loveAtVillageDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.loveAtVillageDetails(id));
+    }
+
+    /**
+     * 小程序获取法律服务列表
+     */
+    @GetMapping("/legalServiceList")
+    public TableDataInfo getLegalService(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getLegalService(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获法律服务询详情
+     */
+    @GetMapping("/legalServiceDetails/{id}")
+    public AjaxResult legalServiceDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.legalServiceDetails(id));
+    }
+
+    /**
+     * 小程序获取金融基建列表
+     */
+    @GetMapping("/financialInfrastructureList")
+    public TableDataInfo getFinancialInfrastructure(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getFinancialInfrastructure(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获金融基建询详情
+     */
+    @GetMapping("/financialInfrastructureDetails/{id}")
+    public AjaxResult financialInfrastructureDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.financialInfrastructureDetails(id));
+    }
+
+    /**
      * 小程序获取线上问诊列表
      */
     @GetMapping("/inquiryList")

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

@@ -77,6 +77,18 @@ public interface JnbHighServerMapper {
 
     JnbHighServerVO psychologyDetails(Long id);
 
+    List<JnbHighServerVO> getLoveAtVillage(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO loveAtVillageDetails(Long id);
+
+    List<JnbHighServerVO> getLegalService(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO legalServiceDetails(Long id);
+
+    List<JnbHighServerVO> getFinancialInfrastructure(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO financialInfrastructureDetails(Long id);
+
     List<JnbHighServerVO> getInquiry(JnbHighServer jnbHighServer);
 
     JnbHighServerVO inquiryDetails(Long id);

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

@@ -76,6 +76,18 @@ public interface IJnbHighServerService {
 
     JnbHighServerVO psychologyDetails(Long id);
 
+    List<JnbHighServerVO> getLoveAtVillage(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO loveAtVillageDetails(Long id);
+
+    List<JnbHighServerVO> getLegalService(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO legalServiceDetails(Long id);
+
+    List<JnbHighServerVO> getFinancialInfrastructure(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO financialInfrastructureDetails(Long id);
+
     List<JnbHighServerVO> getInquiry(JnbHighServer jnbHighServer);
 
     JnbHighServerVO inquiryDetails(Long id);

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

@@ -220,6 +220,69 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
     }
 
     @Override
+    public List<JnbHighServerVO> getLoveAtVillage(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getLoveAtVillage(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+    @Override
+    public JnbHighServerVO loveAtVillageDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.loveAtVillageDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        jnbHighServerMapper.updateLikeNumber(id,7);
+        jnbHighServerMapper.updateWatchNumber(id,7);
+        return jnbHighServerVO;
+    }
+
+    @Override
+    public List<JnbHighServerVO> getLegalService(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getLegalService(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+    @Override
+    public JnbHighServerVO legalServiceDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.legalServiceDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        jnbHighServerMapper.updateLikeNumber(id,8);
+        jnbHighServerMapper.updateWatchNumber(id,8);
+        return jnbHighServerVO;
+    }
+
+    @Override
+    public List<JnbHighServerVO> getFinancialInfrastructure(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getFinancialInfrastructure(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+    @Override
+    public JnbHighServerVO financialInfrastructureDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.financialInfrastructureDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        jnbHighServerMapper.updateLikeNumber(id,9);
+        jnbHighServerMapper.updateWatchNumber(id,9);
+        return jnbHighServerVO;
+    }
+
+    @Override
     public List<JnbHighServerVO> getInquiry(JnbHighServer jnbHighServer) {
         List<JnbHighServerVO> list = jnbHighServerMapper.getInquiry(jnbHighServer);
         for (JnbHighServerVO var : list) {

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

@@ -254,6 +254,120 @@
         GROUP BY jhs.id
     </select>
 
+    <select id="getLoveAtVillage" 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 = 7
+        GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
+    </select>
+    <select id="loveAtVillageDetails" 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 = 7 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
+
+    <select id="getLegalService" 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 = 8
+        GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
+    </select>
+    <select id="legalServiceDetails" 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 = 8 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
+
+    <select id="getFinancialInfrastructure" 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 = 9
+        GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
+    </select>
+    <select id="financialInfrastructureDetails" 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 = 9 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
+
     <select id="getInquiry" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
         SELECT jhs.id,
                title_name,