Merge branch 'master' into test

api-module/src/main/java/com/tzld/piaoquan/api/job/ContentPlatformDatastatJob.java

@@ -103,7 +103,7 @@ public class ContentPlatformDatastatJob {
                 }
 
                 if (Objects.nonNull(fissionCount) && fissionCount > 0 && firstLevelCount > 0) {
-                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() / firstLevelCount);
+                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() * 10 / firstLevelCount);
                     BigDecimal rounded = num.setScale(2, RoundingMode.HALF_UP);
                     item.setScore(rounded.doubleValue());
                 }
@@ -169,7 +169,7 @@ public class ContentPlatformDatastatJob {
                 item.setFansIncreaseCount(fansIncreaseCount);
 
                 if (Objects.nonNull(fissionCount) && fissionCount > 0 && firstLevelCount > 0) {
-                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() / firstLevelCount);
+                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() * 10 / firstLevelCount);
                     BigDecimal rounded = num.setScale(2, RoundingMode.HALF_UP);
                     item.setScore(rounded.doubleValue());
                 }
@@ -233,7 +233,7 @@ public class ContentPlatformDatastatJob {
                 }
 
                 if (Objects.nonNull(fissionCount) && fissionCount > 0 && firstLevelCount > 0) {
-                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() / firstLevelCount);
+                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() * 10 / firstLevelCount);
                     BigDecimal rounded = num.setScale(2, RoundingMode.HALF_UP);
                     item.setScore(rounded.doubleValue());
                 }
@@ -299,7 +299,7 @@ public class ContentPlatformDatastatJob {
                 item.setFansIncreaseCount(fansIncreaseCount);
 
                 if (Objects.nonNull(fissionCount) && fissionCount > 0 && firstLevelCount > 0) {
-                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() / firstLevelCount);
+                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() * 10 / firstLevelCount);
                     BigDecimal rounded = num.setScale(2, RoundingMode.HALF_UP);
                     item.setScore(rounded.doubleValue());
                 }
@@ -473,7 +473,7 @@ public class ContentPlatformDatastatJob {
                 }
 
                 if (Objects.nonNull(fissionCount) && fissionCount > 0 && firstLevelCount > 0) {
-                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() / firstLevelCount);
+                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() * 10 / firstLevelCount);
                     BigDecimal rounded = num.setScale(2, RoundingMode.HALF_UP);
                     item.setScore(rounded.doubleValue());
                 }
@@ -609,7 +609,7 @@ public class ContentPlatformDatastatJob {
                 }
 
                 if (Objects.nonNull(fissionCount) && fissionCount > 0 && firstLevelCount > 0) {
-                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() / firstLevelCount);
+                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() * 10 / firstLevelCount);
                     BigDecimal rounded = num.setScale(2, RoundingMode.HALF_UP);
                     item.setScore(rounded.doubleValue());
                 }
@@ -635,7 +635,7 @@ public class ContentPlatformDatastatJob {
                 item.setFirstLevelCount(item.getFirstLevelCount() + firstLevelCount);
 
                 if (Objects.nonNull(fissionCount) && fissionCount > 0 && firstLevelCount > 0) {
-                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() / firstLevelCount);
+                    BigDecimal num = BigDecimal.valueOf(fissionCount.doubleValue() * 10 / firstLevelCount);
                     BigDecimal rounded = num.setScale(2, RoundingMode.HALF_UP);
                     item.setScore(rounded.doubleValue());
                 }
@@ -644,7 +644,7 @@ public class ContentPlatformDatastatJob {
             }
         }
         if (CollectionUtils.isNotEmpty(saveList)) {
-            dataStatMapperExt.deleteQwDatastatReplyTotal(dt);
+            dataStatMapperExt.deleteQwDatastatSubChannel(dt);
             dataStatMapperExt.batchInsertQwDatastatSubChannel(saveList);
         }
         return ReturnT.SUCCESS;

api-module/src/main/java/com/tzld/piaoquan/api/job/ContentPlatformVideoJob.java

@@ -277,6 +277,7 @@ public class ContentPlatformVideoJob {
                     List<ContentPlatformVideoDataStat> statList = channelEntry.getValue();
                     Long sumFirstLevel = statList.stream().map(ContentPlatformVideoDataStat::getFirstLevel).reduce(0L, Long::sum);
                     Long sumFission0 = statList.stream().map(ContentPlatformVideoDataStat::getFission0).reduce(0L, Long::sum);
+                    sumFission0 = sumFission0 * 10;
                     ContentPlatformVideoDataStatAgg item = new ContentPlatformVideoDataStatAgg();
                     item.setDt(aggDt);
                     item.setVideoId(videoId);

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/ContentPlatformPlanService.java

@@ -23,7 +23,7 @@ public interface ContentPlatformPlanService {
         if (StringUtils.hasText(video.getCustomCover())) {
             return video.getCustomCover();
         }
-        return video.getCover();
+        return video.getCover().substring(0, video.getCover().indexOf("?"));
     }
 
     Page<GzhPlanItemVO> gzhPlanList(GzhPlanListParam param);

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformPlanServiceImpl.java

@@ -323,8 +323,10 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
             }
             String existsCover = dataList.get(0).getCoverUrl();
             String coverSuffix = existsCover.substring(existsCover.indexOf("?"));
+            String cover = video.getCover().substring(0, existsCover.indexOf("?"));
             cgiReplyBucketDataMapperExt.updateBucketDataTitleCoverByGhId(ghId, video.getVideoId(),
-                    video.getCustomTitle(), video.getCustomCover() + coverSuffix);
+                    StringUtils.hasText(video.getCustomTitle()) ? video.getCustomTitle() : video.getTitle(),
+                    StringUtils.hasText(video.getCustomCover()) ? video.getCustomCover() : cover + coverSuffix);
         }
     }
 

api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComServiceImpl.java

@@ -153,7 +153,7 @@ public class WeComServiceImpl implements WeComService {
             } else if (replyStaff.getId() == 3) {
                 msgData.setTitle(String.format("很高兴认识您！我是%s，每天给您推荐精彩视频~", name));
             } else {
-                msgData.setTitle("叔叔阿姨好，我是健康小助手，每天会为您定制全网热点视频，感谢您的关注，手动转发支持哦～");
+                msgData.setTitle("叔叔阿姨好，我是好看内容推荐官手，每天会为您定制全网热点视频，感谢您的关注，手动转发支持哦~");
             }
 
             msgDataList.add(0, msgData);