Ver código fonte

文件上传下载代码预览初始化

fyz 1 mês atrás
pai
commit
b3caaeb0df

+ 3 - 0
mjava-mankalong/src/main/java/com/malk/mankalong/entity/dto/SubFormImageRequest.java

@@ -25,6 +25,9 @@ public class SubFormImageRequest implements Serializable {
     /** 宜搭应用编码(可选) */
     private String appType;
 
+    /** 文件合成模式 */
+    private String type;
+
     /**
      * 子表数据与图片组件ID的映射列表
      * <p>每个元素描述一组"子表数据 → 图片组件"的映射关系</p>

+ 6 - 51
mjava-mankalong/src/main/java/com/malk/mankalong/entity/dto/TaskCreateRequest.java

@@ -1,69 +1,24 @@
 package com.malk.mankalong.entity.dto;
 
 
+import lombok.Data;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * 创建模板文件合成任务 — 请求体
  */
+@Data
 public class TaskCreateRequest {
 
     /** 表单 ID(必填) */
-    private Long formId;
+    private String formId;
 
     /** 工作模式:preview / generate(必填) */
     private String mode;
 
     /** 填写数据列表(合成模式必填) */
-    private List<StructValueItem> fillData;
-
-    public TaskCreateRequest() {
-    }
-
-    /**
-     * 预览模式构造
-     */
-    public static TaskCreateRequest preview(Long formId) {
-        TaskCreateRequest req = new TaskCreateRequest();
-        req.formId = formId;
-        req.mode = "preview";
-        return req;
-    }
-
-    /**
-     * 合成模式构造
-     */
-    public static TaskCreateRequest generate(Long formId, List<StructValueItem> fillData) {
-        TaskCreateRequest req = new TaskCreateRequest();
-        req.formId = formId;
-        req.mode = "generate";
-        req.fillData = fillData;
-        return req;
-    }
-
-    // ---------- getter / setter ----------
-
-    public Long getFormId() {
-        return formId;
-    }
-
-    public void setFormId(Long formId) {
-        this.formId = formId;
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
-    public void setMode(String mode) {
-        this.mode = mode;
-    }
-
-    public List<StructValueItem> getFillData() {
-        return fillData;
-    }
+    private List<Map> fillData;
 
-    public void setFillData(List<StructValueItem> fillData) {
-        this.fillData = fillData;
-    }
 }

+ 11 - 0
mjava-mankalong/src/main/java/com/malk/mankalong/service/Impl/SubFormImageServiceImpl.java

@@ -1,4 +1,5 @@
 package com.malk.mankalong.service.Impl;
+import com.google.common.collect.Lists;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -9,10 +10,13 @@ import com.malk.mankalong.config.ImageConfig;
 import com.malk.mankalong.entity.dto.ImageResultDTO;
 import com.malk.mankalong.entity.dto.SubFormImageMappingDTO;
 import com.malk.mankalong.entity.dto.SubFormImageRequest;
+import com.malk.mankalong.entity.dto.TaskCreateRequest;
+import com.malk.mankalong.entity.vo.TaskCreateResult;
 import com.malk.mankalong.service.SubFormImageService;
 import com.malk.mankalong.util.TableImageGenerator;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
+import com.malk.server.common.McR;
 import com.malk.service.aliwork.YDClient;
 import com.malk.service.dingtalk.DDClient;
 import com.malk.service.dingtalk.DDService;
@@ -57,6 +61,8 @@ public class SubFormImageServiceImpl implements SubFormImageService {
     private DDService ddImplService;
     @Autowired
     private DDClient ddClient;
+    @Autowired
+    private ContractTemplateService contractTemplateService;
     @PostConstruct
     public void init() {
         this.imageGenerator = new TableImageGenerator(imageConfig);
@@ -157,7 +163,12 @@ public class SubFormImageServiceImpl implements SubFormImageService {
             results.add(builder.build());
         }
 
+        TaskCreateRequest taskCreateRequest = new TaskCreateRequest();
+        taskCreateRequest.setFormId(request.getFormUuid());
+        taskCreateRequest.setMode(request.getType());
+        taskCreateRequest.setFillData(formData);
 
+        McR<TaskCreateResult> task = contractTemplateService.createTask(taskCreateRequest);
 
         return results;
     }