From 08393165b187081789a67be793810543ad1aa773 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 21 Feb 2022 18:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86-=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/entity/SysCategory.java | 10 ++++++++- .../jero/modules/system/entity/SysDict.java | 12 +++++----- .../modules/system/entity/SysDictItem.java | 12 +++++----- .../system/service/ISysDictService.java | 4 +++- .../controller/OnlCgformTagController.java | 8 +++++-- .../modules/tag/entity/OnlCgformArea.java | 4 +++- .../jero/modules/tag/entity/OnlCgformTag.java | 6 +++++ .../tag/service/IOnlCgformTagService.java | 11 +++++++++- .../service/impl/OnlCgformTagServiceImpl.java | 22 +++++++++++++++++-- 9 files changed, 69 insertions(+), 20 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java index 9ad6c8a6e..d4f3eb12c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -55,7 +57,13 @@ public class SysCategory implements Serializable,Comparable{ /**描述*/ @Excel(name = "描述", width = 15) private java.lang.String description; - + /** + * 是否为标签内容-数据字典（1是 0否） + */ + @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) + @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") + @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") + private java.lang.Integer isTagDict; @Override public int compareTo(SysCategory o) { //比较条件我们定的是按照code的长度升序 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java index 379114206..75fb02939 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java @@ -91,24 +91,22 @@ public class SysDict implements Serializable { /** * 是否为标签内容-数据字典（1是 0否） */ - @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) - @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") + @Excel(name = "展示区域", width = 15, dictTable = "sys_dict", dicText = "is_tag_dict", dicCode = "is_tag_dict") private java.lang.Integer isTagDict; /** * 是否是只读（2字段固定，内部可配1固定字段 0非固定字段） */ - @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15) + @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15, dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only") + @Dict(dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only") @ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）") private java.lang.Integer isReadOnly; /** - * 标签类型 1下拉选择 2树形结构 + * 表单控件类型 */ @Excel(name = "标签类型 1下拉选择 2树形结构", width = 15) @ApiModelProperty(value = "标签类型 1下拉选择 2树形结构") @Dict(dicCode = "attribute_type") private java.lang.String attributeType; -} - - +} \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index 53df89da5..d445cb1df 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -83,17 +83,19 @@ public class SysDictItem implements Serializable { private Date updateTime; /**是否为标签内容-数据字典（1是 0否）*/ - @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) - @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") + @Excel(name = "展示区域", width = 15, dictTable = "sys_dict", dicText = "is_tag_dict", dicCode = "is_tag_dict") + @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict") private java.lang.Integer isTagDict; /**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/ - @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15) + @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15, dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only") + @Dict(dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only") @ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）") private java.lang.Integer isReadOnly; /**表单控件类型*/ - @Excel(name = "表单控件类型", width = 15) - @ApiModelProperty(value = "表单控件类型") + @Excel(name = "标签类型 1下拉选择 2树形结构", width = 15) + @ApiModelProperty(value = "标签类型 1下拉选择 2树形结构") + @Dict(dicCode = "attribute_type") private java.lang.String attributeType; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java index c8d386ac3..aaa3b902e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java @@ -39,7 +39,7 @@ public interface ISysDictService extends IService { List queryTableDictByKeys(String table, String text, String code, String keys); /** - * 查询展示区域 + * 查询选项内容--数据字典名称 * * @return */ @@ -149,4 +149,6 @@ public interface ISysDictService extends IService { */ void refreshCache(); + + SysDict queryById(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 e4640f0d3..bafe7bff1 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 @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; import com.jero.modules.tag.service.IOnlCgformTagService; import io.swagger.annotations.Api; @@ -55,6 +56,9 @@ public class OnlCgformTagController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(onlCgformTag, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = onlCgformTagService.page(page, queryWrapper); @@ -69,8 +73,8 @@ public class OnlCgformTagController extends JeroController> queryList() { - List list = onlCgformTagService.queryList(); + public Result> queryList(@Validated @RequestBody OnlCgformArea onlCgformArea) { + List list = onlCgformTagService.queryList(onlCgformArea); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java index 6c010719a..ecf2b108b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -69,7 +70,8 @@ public class OnlCgformArea implements Serializable { private java.lang.String enName; /**所属模块(1文档库,0文档拆分)*/ - @Excel(name = "所属模块(1文档库,0文档拆分)", width = 15) + @Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dicCode = "module") + @Dict(dicCode = "module") @ApiModelProperty(value = "所属模块(1文档库,0文档拆分)") private java.lang.String isModel; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index e67130640..562174417 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -127,6 +127,12 @@ public class OnlCgformTag implements Serializable { @ApiModelProperty(value = "展示区域") private java.lang.String showArea; + /**展示区域*/ + @Excel(name = "展示区域", width = 15, dictTable = "onl_cgform_area", dicText = "id", dicCode = "id") + @Dict(dictTable = "onl_cgform_area", dicText = "id", dicCode = "id") + @ApiModelProperty(value = "展示区域") + private java.lang.String area_id; + /**是否查询条件0否 1是*/ @Excel(name = "是否查询条件0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "is_query", dicCode = "is_query") @Dict(dictTable = "onl_cgform_field", dicText = "is_query", dicCode = "is_query") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java index 7a9a31773..53cdaafde 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -2,6 +2,7 @@ package com.jero.modules.tag.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; +import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; import java.util.List; @@ -54,12 +55,20 @@ public interface IOnlCgformTagService extends IService { */ OnlCgformTag queryById(String id); + /** + * 通过area_id查询展示区域 + * + * @param area_id + * @return + */ + List selectShowAreaById(String area_id); + /** * 列表查询 * * @return */ - List queryList(); + List queryList(OnlCgformArea onlCgformArea); /** * 同一“所属模块”下的“属性名称”不能重复 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 ade83ea48..68cedd385 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 @@ -1,8 +1,11 @@ package com.jero.modules.tag.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; +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; @@ -85,14 +88,29 @@ public class OnlCgformTagServiceImpl extends ServiceImpl selectShowAreaById(String area_id) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.select("show_area").eq("id",area_id); + return list(queryWrapper); + } /** * 列表查询 * * @return */ @Override - public List queryList() { - return list(); + public List queryList(OnlCgformArea onlCgformArea) { + UpdateWrapper updateWrapper=new UpdateWrapper<>(); + updateWrapper.set("area_id",onlCgformArea.getId()); + updateWrapper.set("is_model",onlCgformArea.getIsModel()); + return list(updateWrapper); } /**