Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/dao/entity/QuanNews.java

@@ -58,8 +58,8 @@ public class QuanNews implements Serializable {
     /**
      * 视频地址
      */
-    @TableField("video_path")
-    private String videoPath;
+    @TableField("video_url")
+    private String videoUrl;
 
     /**
      * 发布时间

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/service/impl/QuanNewsServiceImpl.java

@@ -46,7 +46,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
     public RestResponse news(QuanNewsReq request) {
         Page<QuanNews> page = new Page<>(request.getPageNum(), request.getPageSize());
         IPage<Map<String, Object>> news = this.pageMaps(page, new QueryWrapper<QuanNews>()
-                .select("id", "title", "content", "top_serial topSerial", "video_path videoPath", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
+                .select("id", "title", "content", "top_serial topSerial", "video_url videoUrl", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
                 .like(null != request.getDistrict(), "district", request.getDistrict())
                 .like(null != request.getTitle(), "title", request.getTitle())
                 .eq("top_serial", "0")
@@ -60,7 +60,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         result.put("news", news);
         if (request.getHaveTops() == 1) {
             List<Map<String, Object>> topNews = this.listMaps(new QueryWrapper<QuanNews>()
-                    .select("id", "title", "content", "top_serial topSerial", "video_path videoPath", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
+                    .select("id", "title", "content", "top_serial topSerial", "video_url videoUrl", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
                     .ne("top_serial", "0")
                     .orderByAsc("top_serial"));
             //把点赞的用户数量和浏览量整入新闻字段中
@@ -155,7 +155,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
             Object id = record.get("id");
             //如果没有浏览量
             if (lookTimes.isEmpty()) {
-                record.put("lookNum", "0");
+                record.put("lookNum", 0);
             } else {
                 //遍历lookTimes，查看对应id的新闻浏览量
                 for (Map.Entry<Object, Object> entry : lookTimes.entrySet()) {
@@ -165,12 +165,12 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
                         record.put("lookNum", value);
                         break;
                     }
-                    record.put("lookNum", "0");
+                    record.put("lookNum", 0);
                 }
             }
             //如果没有用户喜爱
             if (likeUsers.isEmpty()) {
-                record.put("likeNum", "0");
+                record.put("likeNum", 0);
             } else {
                 //遍历likeUsers，查看对应id的新闻的点赞量
                 for (Map.Entry<Object, Object> entry : likeUsers.entrySet()) {
@@ -180,7 +180,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
                         record.put("likeNum", v.size());
                         break;
                     }
-                    record.put("likeNum", "0");
+                    record.put("likeNum", 0);
                 }
             }
         }