wangyunpeng преди 3 седмици
родител
ревизия
158055748a

+ 11 - 2
core/src/main/java/com/tzld/supply/job/SpiderContentFeishuJob.java

@@ -11,6 +11,7 @@ import com.tzld.supply.model.entity.PrecisionScreenEntity;
 import com.tzld.supply.model.entity.feishu.SpiderContentEntity;
 import com.tzld.supply.model.po.supply.spider.SpiderContent;
 import com.tzld.supply.util.DateUtils;
+import com.tzld.supply.util.MapBuilder;
 import com.tzld.supply.util.feishu.FeiShu;
 import com.tzld.supply.util.feishu.FeishuExcelUtil;
 import com.xxl.job.core.biz.model.ReturnT;
@@ -25,7 +26,9 @@ import org.springframework.web.client.RestTemplate;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -98,13 +101,19 @@ public class SpiderContentFeishuJob {
             }
         }
 
+        List<Pair<String, Map<Object, Object>>> styles = Arrays
+                .asList(
+                        Pair.of("H", MapBuilder.builder().put("vAlign", 0).build()),
+                        Pair.of("J", MapBuilder.builder().put("vAlign", 0).build()),
+                        Pair.of("K", MapBuilder.builder().put("vAlign", 0).build())
+                );
         doSendFeishuSheet(dateStrList, "RKgdwQsUbix4lfkOtwKcJ8DonDh", "a337ce", rowNum, rows,
-                2, null, null);
+                2, styles, null);
     }
 
     public void doSendFeishuSheet(List<String> dateStrList, String sheetToken, String sheetId,
                                   int rowNum, List<List<Object>> rows, Integer startRowIndex,
-                                  List<Pair<String, String>> styles,
+                                  List<Pair<String, Map<Object, Object>>> styles,
                                   List<Pair<String, List<Pair<String, String>>>> thanks) {
         Pair<String, Integer> token = FeiShu.requestAccessToken();
         RestTemplate restTemplate = new RestTemplate();

+ 3 - 8
core/src/main/java/com/tzld/supply/util/feishu/FeishuExcelUtil.java

@@ -122,10 +122,10 @@ public class FeishuExcelUtil {
                                   Integer startRowIndex,
                                   HttpHeaders httpHeaders,
                                   RestTemplate restTemplate,
-                                  List<Pair<String, String>> styles) {
+                                  List<Pair<String, Map<Object, Object>>> styles) {
         Integer startRow = startRowIndex;
         do {
-            for (Pair<String, String> style : styles) {
+            for (Pair<String, Map<Object, Object>> style : styles) {
                 HttpEntity<Map<Object, Object>> styleEntity = new HttpEntity<>(MapBuilder
                         .builder()
                         .put("appendStyle",
@@ -134,12 +134,7 @@ public class FeishuExcelUtil {
                                         .put("range", String.format("%s!%s" + startRow + ":%s", sheetId,
                                                 style.getFirst(), style.getFirst())
                                                 + (Math.min(startRow + 4000, rowNum + startRowIndex) - 1))
-                                        .put("style",
-                                                MapBuilder
-                                                        .builder()
-                                                        .put("formatter", style.getSecond())
-                                                        .build()
-                                        )
+                                        .put("style", style.getSecond())
                                         .build()
                         )
                         .build(), httpHeaders);