From a555918bb56235b4438d5d55de244273b33a31ac Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 10 Mar 2022 15:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=A1=B5=E6=8E=92=E5=BA=8F+=E6=A0=87=E7=AD=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/enums/ModuleEnum.java | 2 -- .../mapper/xml/OnlCgformFieldMapper.xml | 5 ++-- .../impl/OnlCgformFieldServiceImpl.java | 4 --- .../controller/SysDictItemController.java | 2 +- .../controller/OnlCgformTagController.java | 14 ++++----- .../modules/tag/enums/FileTableIdEnum.java | 30 +++++++++++++++++++ .../impl/OnlCgformAreaServiceImpl.java | 1 - .../service/impl/OnlCgformTagServiceImpl.java | 23 +++++++++----- 8 files changed, 56 insertions(+), 25 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/enums/FileTableIdEnum.java diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java index 5067695ea..68acaa736 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java @@ -8,8 +8,6 @@ package com.jero.common.constant.enums; public enum ModuleEnum { DOCUMENT_LIBRARY("文档管理","1"), OCR_RECORD("OCR识别转换记录表","2"), - ONL_CGFORM_TAG("标签项管理","3"), - ONL_CGFORM_AREA("展示区域管理","4"), ONL_CGFORM_COLLECTION("我的收藏","5"), ONL_CGFORM_SUBSCRIBE("我的订阅","6"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml index 3a47af5c3..203cd3de6 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/mapper/xml/OnlCgformFieldMapper.xml @@ -119,12 +119,13 @@ - + diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index 9a978c0c8..eb404ef40 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -818,10 +818,6 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl logicDelete(@RequestParam(name="id",required=true) String id) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index 412a72973..6a8fe50d8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -9,6 +9,7 @@ import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; +import com.jero.modules.tag.enums.FileTableIdEnum; import com.jero.modules.tag.service.IOnlCgformTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -84,7 +85,7 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { onlCgformTagService.add(onlCgformTag); - onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal"); + onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal"); return Result.OK("添加成功！"); } @@ -103,8 +104,7 @@ public class OnlCgformTagController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { OnlCgformTag onlCgformTag = onlCgformTagService.queryById(ids); if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { - return Result.error("固定字段,不可删除"); + return Result.error("包含固定字段,不可删除"); }else { this.onlCgformTagService.deleteByIds(Arrays.asList(ids.split(","))); - //TODO 统一定义枚举或者统一常量形式并且加注释说明，不然ID写的太乱后期不好修改 - onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal"); + onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal"); return Result.OK("批量删除成功！"); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/enums/FileTableIdEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/enums/FileTableIdEnum.java new file mode 100644 index 000000000..ac72688d4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/enums/FileTableIdEnum.java @@ -0,0 +1,30 @@ +package com.jero.modules.tag.enums; + +public enum FileTableIdEnum { + FILE_TABLE_ID("文档库表id","48308196e7b04761b533dc31bc899707"), + ; + + String name; + String value; + + FileTableIdEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 0f72c375f..8004f3d89 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -119,7 +119,6 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (CutEnum.CN.getValue().equals(cut)) { queryWrapper.select("id","show_area").orderByAsc("sort"); - System.out.println("QueryWrapper数据:"+queryWrapper); return list(queryWrapper); }else{ queryWrapper.select("id","en_name").orderByAsc("sort"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 0d26416f1..277def50b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -8,13 +8,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; import com.jero.modules.tag.mapper.OnlCgformTagMapper; import com.jero.modules.tag.service.IOnlCgformTagService; import com.jero.modules.utils.HanYuPinYinUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,21 +58,24 @@ public class OnlCgformTagServiceImpl extends ServiceImpl