yumeng 2 年之前
父节点
当前提交
5e1c57be16

+ 5 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/KuaiShouUploadServiceImpl.java

@@ -80,9 +80,10 @@ public class KuaiShouUploadServiceImpl implements IKuaiShouUploadService {
             if (!Check.isNull(materialParameter)) {
                 String width = materialParameter.getWidth();
                 String height = materialParameter.getHeight();
-                type = MaterialEnum.getTypeBySize(Integer.valueOf(width), Integer.valueOf(height));
-                if (!Check.isNull(type)) {
-                    requestJson.put("type", type);
+                Map<String, Integer> typeBySize = MaterialEnum.getTypeBySize(Integer.valueOf(width), Integer.valueOf(height));
+                if (!Check.isNullMap(typeBySize)) {
+                    requestJson.put("type", typeBySize.get("type"));
+                    type = typeBySize.get("type");
                 }
             }
 
@@ -162,6 +163,7 @@ public class KuaiShouUploadServiceImpl implements IKuaiShouUploadService {
             e.printStackTrace();
         }
     }
+
     private String exceptInfoForRestTemplate(String url, Map<String, Object> paramMap, Map<String, String> headerMap) throws ParseException {
         try {
             MultiValueMap<String, Object> param = new LinkedMultiValueMap<>();

+ 70 - 47
module-common/src/main/java/cn/com/ctop/common/module/enums/MaterialEnum.java

@@ -1,78 +1,92 @@
 package cn.com.ctop.common.module.enums;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 素材类型
  */
 public enum MaterialEnum {
 
 
-    VerticalVideoSmall(1, 720, 1280),
-    VerticalVideo787Small(1, 787, 1280),
-    VerticalVideo846Small(1, 846, 1536),
-    VerticalVideo1080mall(1, 1080, 2200),
-    VerticalVideoBig(1, 1080, 1920),
-    VerticalVideo360(1, 360, 640),
-    VerticalVideo362(1, 362, 640),
-    VerticalVideo368(1, 368, 490),
-    VerticalVideo363(1, 363, 640),
-    VerticalVideo438(1, 438, 640),
-    VerticalVideo480(1, 480, 640),
-    VerticalVideo525(1, 525, 640),
-    VerticalVideo540(1, 540, 960),
-    VerticalVideo544(1, 544, 726),
-    VerticalVideo590(1, 590, 1280),
-    VerticalVideo694(1, 694, 1236),
-    VerticalVideo704(1, 704, 1252),
-    VerticalVideo710(1, 710, 1264),
-    VerticalVideo714(1, 714, 1270),
-    VerticalVideo716(1, 716, 1276),
-    VerticalVideo718(1, 718, 1278),
-    VerticalVideo719(1, 719, 1170),
-    VerticalVideo720(1, 720, 960),
-    VerticalVideo750(1, 750, 1334),
-    VerticalVideo787(1, 787, 1280),
-    VerticalVideo864(1, 864, 1536),
-    VerticalVideo1088(1, 1088, 1920),
-    VerticalVideo1181(1, 1181, 1920),
-    VerticalVideo1216(1, 1216, 2160),
-    VerticalVideo1296(1, 1296, 2304),
-    VerticalVideo1440(1, 1440, 2560),
-    VerticalVideo2160(1, 2160, 3840),
-    HorizontalVideoSmall(2, 1280, 720),
-    HorizontalVideoBig(2, 1920, 1080),
-    HorizontalVideo640(2, 640, 368),
-    HorizontalVideo1281(2, 1281, 720),
-    HorizontalVideo1400(2, 1400, 720),
-    HorizontalVideo1700(2, 1700, 1080),
-    HorizontalVideo1902(2, 1902, 1080),
-    HorizontalVideo1920(2, 1920, 1080),
-    BianlitieImageBig(4, 540, 540),
-    BianLitieImageSmall(4, 450, 450);
+    VerticalVideoSmall(1, 720, 1280, 1),
+    VerticalVideo787Small(1, 787, 1280, 1),
+    VerticalVideo846Small(1, 846, 1536, 1),
+    VerticalVideo1080mall(1, 1080, 2200,1),
+    VerticalVideoBig(1, 1080, 1920, 1),
+    VerticalVideo360(1, 360, 640, 1),
+    VerticalVideo362(1, 362, 640, 1),
+    VerticalVideo368(1, 368, 490, 1),
+    VerticalVideo363(1, 363, 640, 1),
+    VerticalVideo438(1, 438, 640, 1),
+    VerticalVideo480(1, 480, 640, 1),
+    VerticalVideo525(1, 525, 640, 1),
+    VerticalVideo540(1, 540, 960, 1),
+    VerticalVideo544(1, 544, 726, 1),
+    VerticalVideo590(1, 590, 1280, 1),
+    VerticalVideo694(1, 694, 1236, 1),
+    VerticalVideo704(1, 704, 1252, 1),
+    VerticalVideo710(1, 710, 1264, 1),
+    VerticalVideo714(1, 714, 1270, 1),
+    VerticalVideo716(1, 716, 1276, 1),
+    VerticalVideo718(1, 718, 1278, 1),
+    VerticalVideo719(1, 719, 1170, 1),
+    VerticalVideo720(1, 720, 960, 1),
+    VerticalVideo750(1, 750, 1334, 1),
+    VerticalVideo787(1, 787, 1280, 1),
+    VerticalVideo864(1, 864, 1536, 1),
+    VerticalVideo1088(1, 1088, 1920, 1),
+    VerticalVideo1181(1, 1181, 1920, 1),
+    VerticalVideo1216(1, 1216, 2160, 1),
+    VerticalVideo1296(1, 1296, 2304, 1),
+    VerticalVideo1440(1, 1440, 2560, 1),
+    VerticalVideo2160(1, 2160, 3840, 1),
+    HorizontalVideoSmall(2, 1280, 720, 1),
+    HorizontalVideoBig(2, 1920, 1080, 1),
+    HorizontalVideo640(2, 640, 368, 1),
+    HorizontalVideo1281(2, 1281, 720, 1),
+    HorizontalVideo1400(2, 1400, 720, 1),
+    HorizontalVideo1700(2, 1700, 1080, 1),
+    HorizontalVideo1902(2, 1902, 1080, 1),
+    HorizontalVideo1920(2, 1920, 1080, 1),
+    BianlitieImageBig(4, 540, 540, 1),
+    BianLitieImageSmall(4, 450, 450, 1),
+    kaipingVideo1280(1, 720, 1280, 0),
+    kaipingVideo1440(1, 720, 1440, 0),
+    kaipingVideo1520(1, 720, 1520, 0),
+    kaipingVideo1560(1, 720, 1560, 0);
 
     private Integer type;
     private Integer width;
     private Integer height;
+    private Integer isKaiPing;
 
 
-    private MaterialEnum(Integer type, Integer width, Integer height) {
+    private MaterialEnum(Integer type, Integer width, Integer height, Integer isKaiPing) {
         this.type = type;
         this.width = width;
         this.height = height;
+        this.isKaiPing = isKaiPing;
     }
 
-    public static Integer getTypeBySize(Integer widthStr, Integer heightStr) {
+    public static Map<String, Integer> getTypeBySize(Integer widthStr, Integer heightStr) {
+        Map<String, Integer> map = new HashMap<>();
         for (MaterialEnum material : MaterialEnum.values()) {
             Integer width = material.getWidth();
             Integer height = material.getHeight();
             if (widthStr.equals(width) && heightStr.equals(height)) {
-                return material.getType();
+                map.put("type", material.getType());
+                map.put("isKaiPing", material.getIsKaiPing());
+
+                return map;
             }
         }
 
-        return 1;
+        map.put("type", 1);
+        map.put("isKaiPing", 1);
+        return map;
     }
 
-
     public Integer getType() {
         return type;
     }
@@ -97,12 +111,21 @@ public enum MaterialEnum {
         this.height = height;
     }
 
+    public Integer getIsKaiPing() {
+        return isKaiPing;
+    }
+
+    public void setIsKaiPing(Integer isKaiPing) {
+        this.isKaiPing = isKaiPing;
+    }
+
     @Override
     public String toString() {
         return "MaterialEnum{" +
                 "type=" + type +
                 ", width=" + width +
                 ", height=" + height +
+                ", isKaiPing=" + isKaiPing +
                 '}';
     }
 }

+ 3 - 3
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadImageServiceImpl.java

@@ -109,9 +109,9 @@ public class MaterialUploadImageServiceImpl implements IMaterialUploadImageServi
                                                     imageGet.setHeight(dataJson.getInteger("height"));
                                                     imageGet.setSize(dataJson.getInteger("size"));
                                                     imageGet.setFormat(dataJson.getString("format"));
-                                                    Integer type = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
-                                                    if (!Check.isNull(type)) {
-                                                        imageGet.setMaterialType(type);
+                                                    Map<String, Integer> typeBySize = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
+                                                    if (!Check.isNullMap(typeBySize)) {
+                                                        imageGet.setMaterialType(typeBySize.get("type"));
                                                     }
                                                     String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
                                                     imageGet.setStatDate(DateUtils.parseDate(nowDate, "yyyy-MM-dd"));

+ 3 - 3
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -164,9 +164,9 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
                 parameterQueryWrapper.orderByDesc("create_time").last("limit 1");
                 MaterialParameter materialParameter = materialParameterService.getOne(parameterQueryWrapper);
                 if (!Check.isNull(materialParameter)) {
-                    Integer type = MaterialEnum.getTypeBySize(Integer.valueOf(materialParameter.getWidth()), Integer.valueOf(materialParameter.getHeight()));
-                    if (!Check.isNull(type) && type != 0) {
-                        requestJson.put("type", type);
+                    Map<String, Integer> typeBySize = MaterialEnum.getTypeBySize(Integer.valueOf(materialParameter.getWidth()), Integer.valueOf(materialParameter.getHeight()));
+                    if (!Check.isNullMap(typeBySize)) {
+                        requestJson.put("type", typeBySize.get("type"));
                     }
                 }
                 String materialName = materialInfo.getMaterialName();

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouVideoGet.java

@@ -62,6 +62,7 @@ public class KuaiShouVideoGet {
     private String putStartTime;
     @TableField(exist = false)
     private String putEndTime;
+    private Integer isKaiPing;
 
     /**
      * 创建时间

+ 4 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouVideoGetMapper.xml

@@ -15,7 +15,8 @@
         channel_type,
         stat_date,
         signature,
-        photo_name
+        photo_name,
+        is_kai_ping
         )
         values
         <foreach collection="videos" item="video" separator=",">
@@ -32,7 +33,8 @@
             #{video.channelType},
             #{video.statDate},
             #{video.signature},
-            #{video.photoName}
+            #{video.photoName},
+            #{video.isKaiPing}
             )
         </foreach>
     </insert>

+ 4 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouMaterialUploadServiceImpl.java

@@ -141,9 +141,10 @@ public class KuaiShouMaterialUploadServiceImpl implements IKuaiShouMaterialUploa
                         imageGet.setHeight(dataJson.getInteger("height"));
                         imageGet.setSize(dataJson.getInteger("size"));
                         imageGet.setFormat(dataJson.getString("format"));
-                        Integer type = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
-                        if (!Check.isNull(type)) {
-                            imageGet.setMaterialType(type);
+                        Map<String, Integer> typeBySize = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
+
+                        if (!Check.isNullMap(typeBySize)) {
+                            imageGet.setMaterialType(typeBySize.get("type"));
                         }
                         imageGet.setSignature(signature);
                         imageGet.setImageToken(image_token);

+ 18 - 15
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -321,9 +321,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                 videoGet.setWidth(width);
                 Integer height = detailJson.getInteger("height");
                 videoGet.setHeight(height);
-                Integer type = MaterialEnum.getTypeBySize(width, height);
-                if (!Check.isNull(type)) {
-                    videoGet.setMaterialType(type);
+                Map<String, Integer> typeBySize = MaterialEnum.getTypeBySize(width, height);
+                if (!Check.isNullMap(typeBySize)) {
+                    videoGet.setMaterialType(typeBySize.get("type"));
+                    videoGet.setIsKaiPing(typeBySize.get("isKaiPing"));
                 }
                 videoGetList.add(videoGet);
                 getCut(token.getAccessToken(), token.getAccountId(), signature, photo_id);
@@ -1743,9 +1744,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         videoGet.setWidth(width);
                         Integer height = detailJson.getInteger("height");
                         videoGet.setHeight(height);
-                        Integer type = MaterialEnum.getTypeBySize(width, height);
-                        if (!Check.isNull(type)) {
-                            videoGet.setMaterialType(type);
+                        Map<String, Integer> typeBySize = MaterialEnum.getTypeBySize(width, height);
+                        if (!Check.isNullMap(typeBySize)) {
+                            videoGet.setMaterialType(typeBySize.get("type"));
+                            videoGet.setIsKaiPing(typeBySize.get("isKaiPing"));
                         }
                         videoGetList.add(videoGet);
                         Thread thread = new Thread() {
@@ -2356,9 +2358,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                                 videoGet.setPhotoId(dataJson.getString("photo_id"));
                                 videoGet.setCoverUrl(dataJson.getString("cover_url"));
                                 videoGet.setStatus(dataJson.getInteger("new_status"));
-                                Integer type = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
-                                if (!Check.isNull(type)) {
-                                    videoGet.setMaterialType(type);
+                                Map<String, Integer> typeBySize = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
+                                if (!Check.isNullMap(typeBySize)) {
+                                    videoGet.setMaterialType(typeBySize.get("type"));
+                                    videoGet.setIsKaiPing(typeBySize.get("isKaiPing"));
                                 }
                                 videoGet.setSignature(signature);
                                 kuaiShouVideoGetService.saveOrUpdate(videoGet);
@@ -2414,9 +2417,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         imageGet.setHeight(dataJson.getInteger("height"));
                         imageGet.setSize(dataJson.getInteger("size"));
                         imageGet.setFormat(dataJson.getString("format"));
-                        Integer type = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
-                        if (!Check.isNull(type)) {
-                            imageGet.setMaterialType(type);
+                        Map<String, Integer> typeBySize = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
+                        if (!Check.isNullMap(typeBySize)) {
+                            imageGet.setMaterialType(typeBySize.get("type"));
                         }
                         imageGet.setSignature(signature);
                         imageGet.setImageToken(dataJson.getString("image_token"));
@@ -2713,9 +2716,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                 kuaiShouImageGet.setId(token.getAccountId() + kuaiShouImageGet.getImageToken());
                 kuaiShouImageGet.setAccountId(token.getAccountId());
 
-                Integer type = MaterialEnum.getTypeBySize(kuaiShouImageGet.getWidth(), kuaiShouImageGet.getHeight());
-                if (!Check.isNull(type)) {
-                    kuaiShouImageGet.setMaterialType(type);
+                Map<String, Integer> typeBySize =  MaterialEnum.getTypeBySize(kuaiShouImageGet.getWidth(), kuaiShouImageGet.getHeight());
+                if (!Check.isNullMap(typeBySize)) {
+                    kuaiShouImageGet.setMaterialType(typeBySize.get("type"));
                 }
                 kuaiShouImageGet.setStatDate(DateUtils.parseDate(statDate, "yyyy-MM-dd"));