bihuisong пре 1 година
родитељ
комит
c808308d05

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

@@ -90,4 +90,22 @@ public class JnbHighServerController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids,@PathVariable("type") Integer type) {
         return toAjax(jnbHighServerService.deleteJnbHighServerByIds(ids,type));
     }
+
+    /**
+     * 小程序获取直播带货列表
+     */
+    @GetMapping("/liveBroadcastList")
+    public TableDataInfo getLiveBroadcast(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getLiveBroadcast(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取直播带货详情
+     */
+    @GetMapping("/liveBroadcastDetails/{id}")
+    public AjaxResult liveBroadcastDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.liveBroadcastDetails(id));
+    }
 }

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

@@ -60,4 +60,8 @@ public interface JnbHighServerMapper {
      * @return 结果
      */
     public int deleteJnbHighServerByIds(@Param("ids") Long[] ids, @Param("type")  Integer type);
+
+    List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO liveBroadcastDetails(Long id);
 }

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

@@ -59,4 +59,8 @@ public interface IJnbHighServerService {
      * @return 结果
      */
     public int deleteJnbHighServerById(Long id,Integer type);
+
+    List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO liveBroadcastDetails(Long id);
 }

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

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.sooka.jnb.highServer.domain.JnbHighServer;
 import com.sooka.jnb.highServer.domain.JnbHighServerImg;
@@ -38,8 +39,8 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      * @return 高频服务
      */
     @Override
-    public JnbHighServerVO selectJnbHighServerById(Long id,Integer type) {
-        return jnbHighServerMapper.selectJnbHighServerById(id,type);
+    public JnbHighServerVO selectJnbHighServerById(Long id, Integer type) {
+        return jnbHighServerMapper.selectJnbHighServerById(id, type);
     }
 
     /**
@@ -62,6 +63,7 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertJnbHighServer(JnbHighServerVO jnbHighServerVO) {
+        jnbHighServerVO.setCreateBy(SecurityUtils.getUsername());
         jnbHighServerVO.setCreateTime(DateUtils.getNowDate());
         jnbHighServerMapper.insertJnbHighServer(jnbHighServerVO);
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
@@ -88,10 +90,11 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateJnbHighServer(JnbHighServerVO jnbHighServerVO) {
+        jnbHighServerVO.setUpdateBy(SecurityUtils.getUsername());
         jnbHighServerVO.setUpdateTime(DateUtils.getNowDate());
         jnbHighServerMapper.updateJnbHighServer(jnbHighServerVO);
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
-            jnbHighServerImgMapper.deleteJnbHighServerByServerId(jnbHighServerVO.getId(),jnbHighServerVO.getType());
+            jnbHighServerImgMapper.deleteJnbHighServerByServerId(jnbHighServerVO.getId(), jnbHighServerVO.getType());
             List<String> imgUrlArray = Arrays.asList(jnbHighServerVO.getImgUrlList().split(","));
             List<JnbHighServerImg> saveList = new ArrayList<>();
             for (int i = 0; i < imgUrlArray.size(); i++) {
@@ -114,9 +117,9 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteJnbHighServerByIds(Long[] ids,Integer type) {
-        jnbHighServerImgMapper.deleteJnbHighServerByServerIds(ids,type);
-        return jnbHighServerMapper.deleteJnbHighServerByIds(ids,type);
+    public int deleteJnbHighServerByIds(Long[] ids, Integer type) {
+        jnbHighServerImgMapper.deleteJnbHighServerByServerIds(ids, type);
+        return jnbHighServerMapper.deleteJnbHighServerByIds(ids, type);
     }
 
     /**
@@ -126,7 +129,23 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      * @return 结果
      */
     @Override
-    public int deleteJnbHighServerById(Long id,Integer type) {
-        return jnbHighServerMapper.deleteJnbHighServerById(id,type);
+    public int deleteJnbHighServerById(Long id, Integer type) {
+        return jnbHighServerMapper.deleteJnbHighServerById(id, type);
+    }
+
+    @Override
+    public List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getLiveBroadcast(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+        }
+        return list;
+    }
+
+    @Override
+    public JnbHighServerVO liveBroadcastDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.liveBroadcastDetails(id);
+        jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        return jnbHighServerVO;
     }
 }

+ 5 - 0
sooka-jnb/src/main/java/com/sooka/jnb/highServer/vo/JnbHighServerVO.java

@@ -91,4 +91,9 @@ public class JnbHighServerVO {
      */
      private String imgUrlList;
 
+     /**
+     * 高频服务图片路径集合
+     */
+     private List<String> pictureList;
+
 }

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

@@ -27,7 +27,9 @@
                jhs.update_by,
                jhs.update_time,
                GROUP_CONCAT(jhsi.id)       AS imgId,
-               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList
+               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 = #{type}
@@ -98,4 +100,41 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="getLiveBroadcast" 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 = 5
+        GROUP BY jhs.id
+    </select>
+    <select id="liveBroadcastDetails" 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 = 5 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
 </mapper>