更改表头

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/NewSortStrategyExport.java

@@ -6,6 +6,10 @@ import lombok.Data;
 public class NewSortStrategyExport {
 
     private String dateStr;
+    private String accountMode;
+    private String accountSource;
+    private String accountType;
+    private String accountStatus;
     private String accountName;
     private String strategy;
     private long fans;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/crawler/AccountAvgInfo.java

@@ -23,6 +23,8 @@ public class AccountAvgInfo implements Serializable {
     private String position;
     @Column(name = "account_name")
     private String accountName;
+    @Column(name = "update_time")
+    private String updateTime;
     @Column(name = "fans")
     private long fans;
     @Column(name = "read_avg")
@@ -31,6 +33,14 @@ public class AccountAvgInfo implements Serializable {
     private Double likeAvg;
     @Column(name = "status")
     private Integer status;
+    @Column(name = "account_type")
+    private String accountType;
+    @Column(name = "account_mode")
+    private String accountMode;
+    @Column(name = "account_source")
+    private String accountSource;
+    @Column(name = "account_status")
+    private String accountStatus;
 
     @Data
     public static class PK implements Serializable {

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/DataDashboardService.java

@@ -113,11 +113,11 @@ public class DataDashboardService {
 
         List<Pair<String, String>> styles = Arrays
                 .asList(
-                        Pair.of("K", "0.00%"),
-                        Pair.of("L", "0.00%"),
-                        Pair.of("M", "0.00%"),
-                        Pair.of("N", "0.00%"),
-                        Pair.of("O", "0.00%")
+                        Pair.of("O", "0.00%"),
+                        Pair.of("P", "0.00%"),
+                        Pair.of("Q", "0.00%"),
+                        Pair.of("R", "0.00%"),
+                        Pair.of("S", "0.00%")
                 );
 
         doSendFeishuSheet(dateStrList, sheetToken, sheetId, rowNum, rows, 2, styles);
@@ -174,6 +174,10 @@ public class DataDashboardService {
             obj.setDateStr(date);
             obj.setStrategy(dateStrategy.get(date));
             if (Objects.nonNull(avgInfo)) {
+                obj.setAccountMode(avgInfo.getAccountMode());
+                obj.setAccountSource(avgInfo.getAccountSource());
+                obj.setAccountType(avgInfo.getAccountType());
+                obj.setAccountStatus(avgInfo.getAccountStatus());
                 obj.setFans(avgInfo.getFans());
                 obj.setAvgViewCount(avgInfo.getReadAvg());
                 if (avgInfo.getReadAvg() > 0) {
@@ -256,7 +260,7 @@ public class DataDashboardService {
                 .builder()
                 .put("valueRange", MapBuilder
                         .builder()
-                        .put("range", String.format("%s!A" + startRowIndex + ":S", sheetId) + (rowNum + startRowIndex - 1))
+                        .put("range", String.format("%s!A" + startRowIndex + ":W", sheetId) + (rowNum + startRowIndex - 1))
                         .put("values", rows)
                         .build())
                 .build(), httpHeaders);