'commit'

WebRoot/html/formDesign/ayq/modules/formDesigner.js

@@ -2066,7 +2066,7 @@ layui.config({base: './ayq/modules/'}).define(["layer", 'flow', "laytpl", "eleme
                     _html += '<colgroup><col><col width="150"><col width="260"><col width="150"></colgroup>';
                     _html += '<thead><tr><th>文件名</th><th>大小</th><th>上传进度</th><th>操作</th></tr></thead>';
                     _html += '<tbody id="list-{0}"></tbody></table></div>'.format(json.id);
-                    _html += '<button type="button" class="layui-btn" id="listAction-{0}">开始上传</button>'.format(json.id);
+                    //_html += '<button type="button" class="layui-btn" id="listAction-{0}">开始上传</button>'.format(json.id);
                     _html += '</div>';
                     _html += '</blockquote>';
                     _html += '</div>';
@@ -2131,7 +2131,7 @@ layui.config({base: './ayq/modules/'}).define(["layer", 'flow', "laytpl", "eleme
                     _html += '<colgroup><col><col width="150"><col width="260"><col width="150"></colgroup>';
                     _html += '<thead><tr><th>文件名</th><th>大小</th><th>上传进度</th><th>操作</th></tr></thead>';
                     _html += '<tbody id="list-{0}"></tbody></table></div>'.format(json.id);
-                    _html += '<button type="button" class="layui-btn" id="listAction-{0}">开始上传</button>'.format(json.id);
+                    //_html += '<button type="button" class="layui-btn" id="listAction-{0}">开始上传</button>'.format(json.id);
                     _html += '</div>';
                     _html += '</blockquote>';
                     _html += '</div>';

WebRoot/html/formDesign/fill.html

@@ -80,8 +80,7 @@
                     var id = item.substr(5);//去掉image前缀
                     upload.render({
                         elem: '#' + images[i].select
-                        //, url: '' + images[i].uploadUrl + ''
-                        , url: 'https://httpbin.org/post' //此处用的是第三方的 http 请求演示，实际使用时改成您自己的上传接口即可。
+                        , url: '/FengHuang/zjb/upload?upload_id='+id+"&task_id="+task_id+"&page="+page
                         , multiple: true
                         , before: function (obj) {
                             var preview_id = '#uploader-list-' + item.substr(5);
@@ -112,16 +111,14 @@
                 for (var i = 0; i < filesData.length; i++) {
                     var id = '#' + filesData[i].select;
                     //检查对象是否存在
-                    //console.log($(id).length);
                     var uploadListIns = upload.render({
                         elem: id
                         , elemList: $('#list-' + filesData[i].select.substr(4)) //列表元素对象
-                        //, url: '' + filesData[i].uploadUrl + ''
-                        , url: 'https://httpbin.org/post' //此处用的是第三方的 http 请求演示，实际使用时改成您自己的上传接口即可。
+                        , url: '/FengHuang/zjb/upload?upload_id='+filesData[i].select.substr(4)+"&task_id="+task_id+"&page="+page
                         , accept: 'file'
                         , multiple: true
                         , number: 4
-                        , auto: false
+                        , auto: true
                         , bindAction: '#listAction-' + filesData[i].select.substr(4)
                         , choose: function (obj) {
                             var that = this;

WebRoot/html/formDesign/layui/upload_file.html

@@ -29,7 +29,7 @@
         <tbody id="demoList"></tbody>
       </table>
     </div>
-    <button type="button" class="layui-btn" id="testListAction">开始上传</button>
+<!--    <button type="button" class="layui-btn" id="testListAction">开始上传</button>-->
   </div> 
  
 <script src="layui.js" charset="utf-8"></script>

src/main/java/com/dsideal/FengHuang/Interceptor/EmptyInterceptor.java

@@ -28,8 +28,6 @@ public class EmptyInterceptor implements Interceptor
         Controller con = inv.getController();
         String header = con.getHeader("Content-Type"); //取出head头
         if (header != null && header.indexOf("multipart/form-data") != -1) { //判断是否是form-data
-            //String folderName = "loss/" + StampToDate.getMonthDay();
-            //con.getFile("photo",folderName);
             inv.invoke();
         }
         String[] value = annotation.value();

src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java

@@ -1,5 +1,7 @@
 package com.dsideal.FengHuang.Zjb.Controller;
 
+import Backup.BackupAll;
+import com.dsideal.FengHuang.Interceptor.EmptyInterface;
 import com.dsideal.FengHuang.Interceptor.IsNumericInterface;
 import com.dsideal.FengHuang.Util.CommonUtil;
 import com.dsideal.FengHuang.Zjb.Model.ZjbModel;
@@ -7,12 +9,20 @@ import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
+import com.jfinal.kit.PathKit;
+import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.upload.UploadFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.util.List;
+import java.util.UUID;
 
 public class ZjbController extends Controller {
     ZjbModel zm = new ZjbModel();
+    private static Logger log = LoggerFactory.getLogger(ZjbController.class);
 
     @Before({POST.class})
     @IsNumericInterface({"module_id", "page"})
@@ -23,7 +33,7 @@ public class ZjbController extends Controller {
 
     @Before({POST.class})
     @IsNumericInterface({"task_id", "page"})
-    public void saveFillPage(int task_id,int page,String json){
+    public void saveFillPage(int task_id, int page, String json) {
         zm.saveFillPage(task_id, page, json);
         renderJson(CommonUtil.returnMessageJson(true, "保存成功!"));
     }
@@ -55,4 +65,23 @@ public class ZjbController extends Controller {
         List<Record> list = zm.getTaskPageFillInfo(task_id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
+
+    @Before({POST.class})
+    @IsNumericInterface({"task_id", "page"})
+    public void upload(int task_id, int page, String upload_id) {
+        if (StrKit.isBlank(upload_id)) {
+            renderJson(CommonUtil.returnMessageJson(false, "传入的参数upload_id为空！"));
+            log.error("传入的参数upload_id为空！");
+            return;
+        }
+        UploadFile uploadFile = getFile();//得到 文件对象
+        String fileName = uploadFile.getFileName();
+        //获取上传文件的文件流
+        File file = uploadFile.getFile();
+        String suffix = fileName.substring(fileName.lastIndexOf(".") + 1).trim();
+        File target = new File(PathKit.getWebRootPath() + "/upload/" + UUID.randomUUID() + "." + suffix);
+        file.renameTo(target);
+        zm.saveUploadFile(task_id, page, upload_id, target.getName());
+        renderJson(CommonUtil.returnMessageJson(true, "上传成功！"));
+    }
 }

src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java

@@ -43,8 +43,8 @@ public class ZjbModel {
         Db.save("t_zjb_module_page", "module_id,page", record);
     }
 
-    public void saveFillPage(int task_id,int page,String json){
-        delFillPage(task_id,page);
+    public void saveFillPage(int task_id, int page, String json) {
+        delFillPage(task_id, page);
         Record record = new Record();
         record.set("task_id", task_id);
         Record rTask = getTaskInfo(task_id);
@@ -135,7 +135,7 @@ public class ZjbModel {
         for (int i = 1; i <= page_count; i++) {
             Record r = new Record();
             r.set("page", i);
-            r.set("module_id",module_id);
+            r.set("module_id", module_id);
             if (_map.containsKey(i)) {
                 r.set("json", _map.get(i));
                 r.set("page_finish", true);
@@ -152,4 +152,13 @@ public class ZjbModel {
         }
         return res;
     }
+
+    public void saveUploadFile(int task_id, int page, String upload_id, String file_name) {
+        Record record = new Record();
+        record.set("task_id", task_id);
+        record.set("page", page);
+        record.set("upload_id", upload_id);
+        record.set("file_name", file_name);
+        Db.save("t_zjb_task_fill_upload", "task_id,page,upload_id,file_name", record);
+    }
 }