From 319887944579804e29ce3e4aa80183eb2aa7ca50 Mon Sep 17 00:00:00 2001 From: zhengzheng <18918765049@163.com> Date: Thu, 5 May 2022 10:10:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/ActiveInfoController.java | 2 +- .../controller/common/CommonController.java | 28 ++++++++++ .../resources/templates/active/info/add.html | 40 +++++++++++++- .../resources/templates/active/info/edit.html | 54 ++++++++++++++++++- .../templates/active/info/first.html | 11 ++-- .../com/wuzhen/common/config/RuoYiConfig.java | 9 ++++ .../com/wuzhen/system/domain/ActiveInfo.java | 22 +++++++- .../mapper/system/ActiveInfoMapper.xml | 6 ++- 8 files changed, 162 insertions(+), 10 deletions(-) diff --git a/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java b/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java index 71c187161..26895d4e2 100644 --- a/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java +++ b/zt-admin/src/main/java/com/wuzhen/web/controller/busi/ActiveInfoController.java @@ -134,9 +134,9 @@ public class ActiveInfoController extends BaseController list.add(map); } } - String json = JSONObject.toJSONString(list); activeInfo.setListLpNames(json); + activeInfo.setListLsNames("http://localhost:18000/profile/upload/ls/"+activeInfo.getLsFilesName()); mmap.put("active", activeInfo); return prefix + "/edit"; } diff --git a/zt-admin/src/main/java/com/wuzhen/web/controller/common/CommonController.java b/zt-admin/src/main/java/com/wuzhen/web/controller/common/CommonController.java index 4b0c99c0c..fe8f9c059 100644 --- a/zt-admin/src/main/java/com/wuzhen/web/controller/common/CommonController.java +++ b/zt-admin/src/main/java/com/wuzhen/web/controller/common/CommonController.java @@ -163,6 +163,34 @@ public class CommonController } } + + /** + * 通用上传列表图 + */ + @PostMapping("/uploadsLs") + @ResponseBody + public AjaxResult uploadFilesLs(MultipartFile file) throws Exception + { + try + { + // 上传文件路径 + String filePath = RuoYiConfig.getLSUploadPath(); + // 上传并返回新文件名称 + String fileName = FileUploadUtils.upload(filePath, file); + String url = serverConfig.getUrl() + fileName; + AjaxResult ajax = AjaxResult.success(); + ajax.put("url", url); + ajax.put("fileName", fileName); + ajax.put("newFileName", FileUtils.getName(fileName)); + ajax.put("originalFilename", file.getOriginalFilename()); + return ajax; + } + catch (Exception e) + { + return AjaxResult.error(e.getMessage()); + } + } + /** * 本地资源通用下载 */ diff --git a/zt-admin/src/main/resources/templates/active/info/add.html b/zt-admin/src/main/resources/templates/active/info/add.html index 3476a309c..e196270fc 100644 --- a/zt-admin/src/main/resources/templates/active/info/add.html +++ b/zt-admin/src/main/resources/templates/active/info/add.html @@ -11,6 +11,7 @@
+
@@ -32,6 +33,18 @@
+ + +
+ +
+
+ +
+
+ +
+
@@ -43,7 +56,7 @@
- +
@@ -109,7 +122,6 @@ $(document).ready(function(){setup_draggable();$("#n-columns").on("change",function(){var v=$(this).val();if(v==="1"){var $col=$(".form-body .col-md-12").toggle(true);$(".form-body .col-md-6 .draggable").each(function(i,el){$(this).remove().appendTo($col)});$(".form-body .col-md-6").toggle(false)}else{var $col=$(".form-body .col-md-6").toggle(true);$(".form-body .col-md-12 .draggable").each(function(i,el){$(this).remove().appendTo(i%2?$col[1]:$col[0])});$(".form-body .col-md-12").toggle(false)}});$("#copy-to-clipboard").on("click",function(){var $copy=$(".form-body").clone().appendTo(document.body);$copy.find(".tools, :hidden").remove();$.each(["draggable","droppable","sortable","dropped","ui-sortable","ui-draggable","ui-droppable","form-body"],function(i,c){$copy.find("."+c).removeClass(c).removeAttr("style")});var html=html_beautify($copy.html());$copy.remove();$modal=get_modal(html).modal("show");$modal.find(".btn").remove();$modal.find(".modal-title").html("复制HTML代码");$modal.find(":input:first").select().focus();return false})});var setup_draggable=function(){$(".draggable").draggable({appendTo:"body",helper:"clone"});$(".droppable").droppable({accept:".draggable",helper:"clone",hoverClass:"droppable-active",drop:function(event,ui){$(".empty-form").remove();var $orig=$(ui.draggable);if(!$(ui.draggable).hasClass("dropped")){var $el=$orig.clone().addClass("dropped").css({"position":"static","left":null,"right":null}).appendTo(this);if($el.find("label").hasClass("radio-box")){$el=$el.html(''+'
'+''+''+"
")}else{if($el.find("label").hasClass("check-box")){$el=$el.html(''+'
'+''+''+''+"
")}}var id=$orig.find(":input").attr("id");if(id){id=id.split("-").slice(0,-1).join("-")+"-"+(parseInt(id.split("-").slice(-1)[0])+1);$orig.find(":input").attr("id",id);$orig.find("label").attr("for",id)}$('

编辑HTML | 移除

').appendTo($el)}else{if($(this)[0]!=$orig.parent()[0]){var $el=$orig.clone().css({"position":"static","left":null,"right":null}).appendTo(this);$orig.remove()}}}}).sortable()};var get_modal=function(content){var modal=$('

编辑HTML

').appendTo(document.body);var doms=document.getElementsByClassName("textarea-show-src");for(var i=0;i