Merge branch '20250516-wyp-datastat' into test

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

@@ -77,7 +77,7 @@ public class ContentPlatformDatastatJob {
         List<Long> accountIds = accountList.stream().map(ContentPlatformGzhAccount::getId).collect(Collectors.toList());
         List<String> ghIds = accountList.stream().map(ContentPlatformGzhAccount::getGhId).collect(Collectors.toList());
         List<String> accountExternalIds = accountList.stream().map(ContentPlatformGzhAccount::getExternalId).collect(Collectors.toList());
-        String dateStr = DateUtil.getBeforeDayDateString("yyyy-MM-dd");
+        String dateStr = dt.substring(0, 4) + "-" + dt.substring(4, 6) + "-" + dt.substring(6, 8);
         List<WxAccountDatastatVO> wxAccountDatastatVOList = aigcApiService.getWxAccountDatastat(dateStr, accountExternalIds);
         Map<String, WxAccountDatastatVO> wxAccountDatastatMap = wxAccountDatastatVOList.stream()
                 .collect(Collectors.toMap(WxAccountDatastatVO::getAccountId, wxAccountDatastatVO -> wxAccountDatastatVO));
@@ -164,7 +164,7 @@ public class ContentPlatformDatastatJob {
                 .collect(Collectors.groupingBy(ContentPlatformGzhAccount::getCreateAccountId));
         List<Long> accountIds = gzhAccountList.stream().map(ContentPlatformGzhAccount::getId).collect(Collectors.toList());
         List<String> accountExternalIds = gzhAccountList.stream().map(ContentPlatformGzhAccount::getExternalId).collect(Collectors.toList());
-        String dateStr = DateUtil.getBeforeDayDateString("yyyy-MM-dd");
+        String dateStr = dt.substring(0, 4) + "-" + dt.substring(4, 6) + "-" + dt.substring(6, 8);
         List<WxAccountDatastatVO> wxAccountDatastatVOList = aigcApiService.getWxAccountDatastat(dateStr, accountExternalIds);
         Map<String, WxAccountDatastatVO> wxAccountDatastatMap = wxAccountDatastatVOList.stream()
                 .collect(Collectors.toMap(WxAccountDatastatVO::getAccountId, wxAccountDatastatVO -> wxAccountDatastatVO));
@@ -259,7 +259,7 @@ public class ContentPlatformDatastatJob {
         List<Long> accountIds = accountList.stream().map(ContentPlatformGzhAccount::getId).collect(Collectors.toList());
         List<String> ghIds = accountList.stream().map(ContentPlatformGzhAccount::getGhId).collect(Collectors.toList());
         List<String> accountExternalIds = accountList.stream().map(ContentPlatformGzhAccount::getExternalId).collect(Collectors.toList());
-        String dateStr = DateUtil.getBeforeDayDateString("yyyy-MM-dd");
+        String dateStr = dt.substring(0, 4) + "-" + dt.substring(4, 6) + "-" + dt.substring(6, 8);
         List<WxAccountDatastatVO> wxAccountDatastatVOList = aigcApiService.getWxAccountDatastat(dateStr, accountExternalIds);
         Map<String, WxAccountDatastatVO> wxAccountDatastatMap = wxAccountDatastatVOList.stream()
                 .collect(Collectors.toMap(WxAccountDatastatVO::getAccountId, wxAccountDatastatVO -> wxAccountDatastatVO));
@@ -346,7 +346,7 @@ public class ContentPlatformDatastatJob {
                 .collect(Collectors.groupingBy(ContentPlatformGzhAccount::getCreateAccountId));
         List<Long> accountIds = gzhAccountList.stream().map(ContentPlatformGzhAccount::getId).collect(Collectors.toList());
         List<String> accountExternalIds = gzhAccountList.stream().map(ContentPlatformGzhAccount::getExternalId).collect(Collectors.toList());
-        String dateStr = DateUtil.getBeforeDayDateString("yyyy-MM-dd");
+        String dateStr = dt.substring(0, 4) + "-" + dt.substring(4, 6) + "-" + dt.substring(6, 8);
         List<WxAccountDatastatVO> wxAccountDatastatVOList = aigcApiService.getWxAccountDatastat(dateStr, accountExternalIds);
         Map<String, WxAccountDatastatVO> wxAccountDatastatMap = wxAccountDatastatVOList.stream()
                 .collect(Collectors.toMap(WxAccountDatastatVO::getAccountId, wxAccountDatastatVO -> wxAccountDatastatVO));
@@ -614,6 +614,7 @@ public class ContentPlatformDatastatJob {
             List<String> channels = saveList.stream().map(ContentPlatformQwDataStatTotal::getChannel).distinct().collect(Collectors.toList());
             List<ContentPlatformQwDataStatTotal> channelScoreList = dataStatMapperExt.getQwTotalDatastatScoreList(dt, channels);
             Map<String, Double> channelScoreMap = channelScoreList.stream()
+                    .filter(o -> Objects.nonNull(o.getChannel()) && Objects.nonNull(o.getScore()))
                     .collect(Collectors.toMap(ContentPlatformQwDataStatTotal::getChannel, ContentPlatformQwDataStatTotal::getScore, (a, b) -> a));
             for (ContentPlatformQwDataStatTotal item : saveList) {
                 item.setScore(channelScoreMap.get(item.getChannel()));

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/GzhDatastatItemExportVO.java

@@ -22,6 +22,9 @@ public class GzhDatastatItemExportVO {
     @ExcelProperty("公众号名称")
     private String name;
 
+    @ExcelProperty("公众号ghId")
+    private String ghId;
+
     @ExcelProperty("新增粉丝数")
     private Integer fansIncreaseCount;
 

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/GzhDatastatItemVO.java

@@ -12,6 +12,9 @@ public class GzhDatastatItemVO {
     @ApiModelProperty(value = "公众号名称")
     private String name;
 
+    @ApiModelProperty(value = "公众号ghId")
+    private String ghId;
+
     @ApiModelProperty(value = "新增粉丝数")
     private Integer fansIncreaseCount;
 

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

@@ -133,6 +133,7 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
             ContentPlatformGzhAccount account = accountMap.get(datastat.getAccountId());
             if (Objects.nonNull(account)) {
                 vo.setName(account.getName());
+                vo.setGhId(account.getGhId());
             }
             vo.setFansIncreaseCount(datastat.getFansIncreaseCount());
             vo.setFirstLevel(datastat.getFirstLevelCount());
@@ -286,7 +287,7 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         param.setPageSize(10000);
         Page<GzhDatastatItemVO> pageResult = gzhDatastatList(param);
         List<GzhDatastatItemVO> dataList = pageResult.getObjs();
-        if (param.getType() == 1) {
+        if (param.getType() == 1 || param.getType() == 3) {
             return generateGzhDatastatExcelFile(dataList);
         } else {
             return generateTotalGzhDatastatExcelFile(dataList);
@@ -315,7 +316,7 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         ArrayList<GzhDatastatItemExportVO> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(dataList)) {
             for (GzhDatastatItemVO data : dataList) {
-                list.add(new GzhDatastatItemExportVO(data.getDateStr(), data.getName(),
+                list.add(new GzhDatastatItemExportVO(data.getDateStr(), data.getName(), data.getGhId(),
                         data.getFansIncreaseCount(), data.getFirstLevel(), data.getOpenRate(), data.getScore()));
             }
         } else {

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComHistoryDataJob.java

@@ -175,13 +175,10 @@ public class WeComHistoryDataJob {
             failSendCount += sendCountList.get(3);
             if (count != 0 && sendCountList.get(0) > 0 && !specialStaffIdList.contains(sendDetail.getStaffId())) {
                 LarkRobotUtil.sendMessage(sendDetail.getRemark() + "存在未发送记录，请检查");
-                if (sendDetail.getStaffId() == 3) {
-                    LarkRobotUtil.sendTipMessage(sendDetail.getRemark() + "存在未发送记录，请检查");
-                } else {
-                    //8点前报警
-                    if (DateUtil.getHourOfDay() < 8) {
-                        LarkRobotUtil.sendNotPushMessage("<at user_id=\"all\">所有人</at> " + sendDetail.getRemark() + " 存在未发送记录，请检查");
-                    }
+                LarkRobotUtil.sendTipMessage(sendDetail.getRemark() + "存在未发送记录，请检查");
+                //8点前报警
+                if (DateUtil.getHourOfDay() < 8) {
+                    LarkRobotUtil.sendNotPushMessage("<at user_id=\"all\">所有人</at> " + sendDetail.getRemark() + " 存在未发送记录，请检查");
                 }
             }
             stringBuilder.append("总发送数量：").append(count).append("   ");