From 4f202749771d8d51f73fd1ce5cf1a465e49c8dec Mon Sep 17 00:00:00 2001 From: Guo XIn <371864209@qq.com> Date: Sat, 26 Aug 2023 17:41:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A1=A8=E5=8D=95=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bianmu/controller/MetadataController.java | 5 +- .../view/business/metadata/metadataEdit.html | 43 ----- .../resources/static/css/common/common.css | 13 ++ .../controller/MetadataCommonController.java | 5 +- .../mark/controller/MarkViewController.java | 2 +- .../shandan/mark/services/MarkService.java | 2 +- .../constants}/FormTypeEnum.java | 12 +- .../system/controller/SysFileController.java | 6 + .../system/service/SysFormConfigService.java | 5 + .../impl/SysFormConfigServiceImpl.java | 10 ++ .../resources/static/js/sys/file/dirUpload.js | 2 +- .../view/sys/file/dirUploadLayer.html | 149 ++++++------------ 12 files changed, 96 insertions(+), 158 deletions(-) rename shandan-system/src/main/java/com/keyware/shandan/{mark/constant => system/constants}/FormTypeEnum.java (72%) diff --git a/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/MetadataController.java b/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/MetadataController.java index 3c4aae5..6d5edf1 100644 --- a/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/MetadataController.java +++ b/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/MetadataController.java @@ -13,6 +13,7 @@ import com.keyware.shandan.common.entity.Result; import com.keyware.shandan.common.enums.SecretLevel; import com.keyware.shandan.common.util.StreamUtil; import com.keyware.shandan.common.util.StringUtils; +import com.keyware.shandan.system.constants.FormTypeEnum; import com.keyware.shandan.system.entity.SysFile; import com.keyware.shandan.system.entity.SysFormConfig; import com.keyware.shandan.system.service.SysFileService; @@ -98,9 +99,7 @@ public class MetadataController extends BaseController query = new QueryWrapper<>(); - query.eq("FORM_TYPE", 1); - mav.addObject("metadataFormConfig", formConfigService.list(query)); + mav.addObject("metadataFormConfig", formConfigService.listByFormType(FormTypeEnum.metadataEditForm)); return mav; } diff --git a/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html b/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html index 4170d31..56c57cb 100644 --- a/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html +++ b/shandan-bianmu/src/main/resources/view/business/metadata/metadataEdit.html @@ -54,49 +54,6 @@ th:id="${'dict-'+field.fieldName}"> -
query = new QueryWrapper<>(); - query.eq("FORM_TYPE", 1); - mav.addObject("metadataFormConfig", formConfigService.list(query)); + mav.addObject("metadataFormConfig", formConfigService.listByFormType(FormTypeEnum.metadataEditForm)); return mav; } diff --git a/shandan-system/src/main/java/com/keyware/shandan/mark/controller/MarkViewController.java b/shandan-system/src/main/java/com/keyware/shandan/mark/controller/MarkViewController.java index 19cba39..0f1d607 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/mark/controller/MarkViewController.java +++ b/shandan-system/src/main/java/com/keyware/shandan/mark/controller/MarkViewController.java @@ -1,6 +1,6 @@ package com.keyware.shandan.mark.controller; -import com.keyware.shandan.mark.constant.FormTypeEnum; +import com.keyware.shandan.system.constants.FormTypeEnum; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/shandan-system/src/main/java/com/keyware/shandan/mark/services/MarkService.java b/shandan-system/src/main/java/com/keyware/shandan/mark/services/MarkService.java index b99b51a..b8fa53f 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/mark/services/MarkService.java +++ b/shandan-system/src/main/java/com/keyware/shandan/mark/services/MarkService.java @@ -1,7 +1,7 @@ package com.keyware.shandan.mark.services; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.keyware.shandan.mark.constant.FormTypeEnum; +import com.keyware.shandan.system.constants.FormTypeEnum; import com.keyware.shandan.mark.pojo.FormMark; import com.keyware.shandan.mark.pojo.MarkRecord; import com.keyware.shandan.mark.pojo.MarkType; diff --git a/shandan-system/src/main/java/com/keyware/shandan/mark/constant/FormTypeEnum.java b/shandan-system/src/main/java/com/keyware/shandan/system/constants/FormTypeEnum.java similarity index 72% rename from shandan-system/src/main/java/com/keyware/shandan/mark/constant/FormTypeEnum.java rename to shandan-system/src/main/java/com/keyware/shandan/system/constants/FormTypeEnum.java index 66e1b51..bb0cf37 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/mark/constant/FormTypeEnum.java +++ b/shandan-system/src/main/java/com/keyware/shandan/system/constants/FormTypeEnum.java @@ -1,5 +1,6 @@ -package com.keyware.shandan.mark.constant; +package com.keyware.shandan.system.constants; +import com.baomidou.mybatisplus.annotation.EnumValue; import lombok.AllArgsConstructor; import lombok.Getter; @@ -16,16 +17,19 @@ public enum FormTypeEnum { /** * 数据资源注册表单 */ - metadataEditForm("数据资源注册表单"), + metadataEditForm(1,"数据资源注册表单"), /** * 文件上传表单 */ - fileUploadForm("文件上传表单"), + fileUploadForm(2, "文件上传表单"), /** * 文件夹上传表单 */ @Deprecated - dirUploadForm("文件夹上传表单"); + dirUploadForm(3, "文件夹上传表单"); + + @EnumValue + private final Integer value; /** * 描述 diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java index f60521e..547b942 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java +++ b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java @@ -8,10 +8,12 @@ import com.keyware.shandan.common.controller.BaseController; import com.keyware.shandan.common.entity.Result; import com.keyware.shandan.common.util.FileDownload; import com.keyware.shandan.frame.properties.CustomProperties; +import com.keyware.shandan.system.constants.FormTypeEnum; import com.keyware.shandan.system.entity.SysFile; import com.keyware.shandan.system.entity.SysFileChunk; import com.keyware.shandan.system.entity.SysSetting; import com.keyware.shandan.system.service.SysFileService; +import com.keyware.shandan.system.service.SysFormConfigService; import com.keyware.shandan.system.service.SysSettingService; import com.keyware.shandan.system.utils.FileChunkUploadUtil; import org.apache.tomcat.util.http.ResponseUtil; @@ -57,12 +59,16 @@ public class SysFileController extends BaseController { + + List listByFormType(FormTypeEnum formTypeEnum); } diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFormConfigServiceImpl.java b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFormConfigServiceImpl.java index e5a851f..a1bef17 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFormConfigServiceImpl.java +++ b/shandan-system/src/main/java/com/keyware/shandan/system/service/impl/SysFormConfigServiceImpl.java @@ -1,11 +1,15 @@ package com.keyware.shandan.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.keyware.shandan.system.constants.FormTypeEnum; import com.keyware.shandan.system.entity.SysFormConfig; import com.keyware.shandan.system.mapper.SysFormConfigMapper; import com.keyware.shandan.system.service.SysFormConfigService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 系统表单配置服务实现类 * @@ -14,4 +18,10 @@ import org.springframework.stereotype.Service; */ @Service public class SysFormConfigServiceImpl extends ServiceImpl implements SysFormConfigService { + @Override + public List listByFormType(FormTypeEnum formTypeEnum) { + QueryWrapper query = new QueryWrapper<>(); + query.eq("FORM_TYPE", formTypeEnum.getValue()); + return list(query); + } } diff --git a/shandan-system/src/main/resources/static/js/sys/file/dirUpload.js b/shandan-system/src/main/resources/static/js/sys/file/dirUpload.js index 35db2bf..dfc5396 100644 --- a/shandan-system/src/main/resources/static/js/sys/file/dirUpload.js +++ b/shandan-system/src/main/resources/static/js/sys/file/dirUpload.js @@ -129,7 +129,7 @@ layui.use(['layer', 'uploader', 'element', 'form', 'laydate', 'dict', 'datalabel function bindDatetimePlugins() { //日期选择器 laydate.render({ - elem: '#input-data', + elem: 'input[name="inputDate"]', format: "yyyy-MM-dd HH:mm:ss", type: 'datetime', value: new Date(), diff --git a/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html b/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html index e83768e..ea35db8 100644 --- a/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html +++ b/shandan-system/src/main/resources/view/sys/file/dirUploadLayer.html @@ -49,7 +49,11 @@ background-color: #FFF; border-top: 1px solid #eee; } - .star-mark{color: red; display: none} + + .star-mark { + color: red; + display: none + } @@ -60,109 +64,50 @@
-
-
-
- -
-
-
-
-
- -
- - -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
- -
- -
-
-
-
- -
- +
+
+ +
+ + + + + + + + +
-
+