画布合成图片

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/combined/CombinedQDTO.java

@@ -6,6 +6,10 @@ public class CombinedQDTO implements Serializable {
     private static final long serialVersionUID = -28454620622119889L;
 
     /**
+     * 企业id
+     */
+    private String enterpriseId;
+    /**
      * 主图url
      */
     private String imageUrl;
@@ -27,11 +31,16 @@ public class CombinedQDTO implements Serializable {
     private String lineTwo;
 
     /**
-     * 1群发 2朋友圈
+     * 1群发 2朋友圈 3合成图片
      */
     private Integer mediaType;
 
     /**
+     * 额外参数
+     */
+    private String extend = "";
+
+    /**
      * 导购id（作标识）
      */
     private String clerkId;
@@ -41,6 +50,14 @@ public class CombinedQDTO implements Serializable {
      */
     private String businessId;
 
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
     public String getImageUrl() {
         return imageUrl;
     }
@@ -89,8 +106,16 @@ public class CombinedQDTO implements Serializable {
         this.mediaType = mediaType;
     }
 
+    public String getExtend() {
+        return extend;
+    }
+
+    public void setExtend(String extend) {
+        this.extend = extend;
+    }
+
     public String getUnionString() {
-        return this.getImageUrl() + this.getQrCodeUrl() + this.getShowStyle() + this.getLineOne() + this.getLineTwo() + this.getMediaType();
+        return this.getImageUrl() + this.getQrCodeUrl() + this.getShowStyle() + this.getLineOne() + this.getLineTwo() + this.getMediaType() + this.getExtend();
     }
 
     public String getClerkId() {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java

@@ -8,10 +8,16 @@ import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.HttpClient;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.manage.service.util.ApolloUtils;
 import com.gic.haoban.manage.api.qdto.combined.CombinedQDTO;
 import com.gic.haoban.manage.service.context.combined.ImageCombined;
 import com.gic.redis.data.util.RedisUtil;
+import com.gic.thirdparty.cloudfile.CloudFileUtil;
+import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
+import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
+import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
@@ -48,6 +54,8 @@ public class MaterialServiceImpl implements MaterialService {
     @Autowired
     private WxEnterpriseService wxEnterpriseService ;
     @Autowired
+    private EnterpriseService enterpriseService;
+    @Autowired
     private QywxSuiteApiService qywxSuiteApiService ;
     @Autowired
     private Config config;
@@ -375,11 +383,26 @@ public class MaterialServiceImpl implements MaterialService {
                 arr = imageUrl.split("/");
             }
             JSONResponse json = null;
+
             Integer mediaType = combinedQDTO.getMediaType();
             if (Objects.equals(1,mediaType)) {
                 json = qywxSuiteApiService.uploadMedia(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), combinedImageData, arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode(), qwDTO.isSelf(), qwDTO.getUrlHost());
             }else if (Objects.equals(2,mediaType)) {
                 json = qywxSuiteApiService.uploadAttachment(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), combinedImageData, arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode(), qwDTO.isSelf(), qwDTO.getUrlHost());
+            } else if (Objects.equals(3, mediaType)) {
+                EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(combinedQDTO.getEnterpriseId());
+                if (enterprise == null) {
+                    return jsonResponse;
+                }
+                CloudFileInfo uploadInfo = CloudFileUtil.uploadFile(combinedImageData, "jpg",  CloudFileTypeEnum.IMAGE,  enterprise.getFactoryCode(), CloudFileBusinessOptEnum.COMMON) ;
+                String orgFileUrl = uploadInfo.getOrgFileUrl();
+                if (StringUtils.isBlank(orgFileUrl)) {
+                    return jsonResponse;
+                }
+                json = new JSONResponse();
+                json.setErrorCode(0);
+                json.setSuccess(true);
+                json.setResult(orgFileUrl);
             }
             return json;
         } catch (Exception e) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/combined/CombinedQO.java

@@ -5,6 +5,8 @@ import java.io.Serializable;
 public class CombinedQO implements Serializable {
     private static final long serialVersionUID = -28454620622119889L;
 
+    private String enterpriseId;
+
     private String wxEnterpriseId;
     /**
      * 主图url
@@ -40,6 +42,14 @@ public class CombinedQO implements Serializable {
      */
     private String businessId;
 
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
     public String getWxEnterpriseId() {
         return wxEnterpriseId;
     }