Merge branch 'wyp/0102-exportRollDel' of Server/long-article-recommend into master

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

@@ -872,7 +872,7 @@ public class DataDashboardService {
                                 "        \"startIndex\": %s,\n" +
                                 "        \"endIndex\": %s\n" +
                                 "    }\n" +
-                                "}", sheetId, deleteStartRow, Math.min(startRowIndex + 4000, count - delNum + startRowIndex) - 1),
+                                "}", sheetId, deleteStartRow, deleteStartRow + Math.min(4000, delCount - delNum + startRowIndex) - 1),
                         httpHeaders);
                 ResponseEntity<String> response = restTemplate.exchange(String.format("https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/%s/dimension_range", sheetToken),
                         HttpMethod.DELETE, deleteEntity, String.class);

long-article-recommend-service/src/test/java/com/tzld/longarticle/recommend/server/DataDashboardTest.java

@@ -5,9 +5,12 @@ import com.tzld.longarticle.recommend.server.model.vo.IntermediateIndicatorsExpo
 import com.tzld.longarticle.recommend.server.model.vo.NewSortStrategyExport;
 import com.tzld.longarticle.recommend.server.service.recommend.DataDashboardService;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
+import com.tzld.longarticle.recommend.server.util.feishu.FeiShu;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.util.Pair;
+import org.springframework.http.HttpHeaders;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -38,4 +41,14 @@ public class DataDashboardTest {
         dataDashboardService.producePlanAuditExport(dateStrList);
     }
 
+    @Test
+    public void delFeishuSheet() {
+        List<String> delDateStrList = DateUtils.getBeforeDays(null, null, 14);
+        Pair<String, Integer> token = FeiShu.requestAccessToken();
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.add("Authorization", "Bearer " + token.getFirst());
+
+        dataDashboardService.delFeishuSheet(httpHeaders, "7d4e12", 2, delDateStrList);
+    }
+
 }