WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标签管理-标签内容

Browse Source
This commit is contained in:
xiejunyu
2022-02-21 18:05:32 +08:00
parent 46ba21800f
commit 08393165b1
9 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java
+9 -1
View File
@@ -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<SysCategory>{
/**描述*/
@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的长度升序
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
+5 -7
View File
@@ -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;
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java
+7 -5
View File
@@ -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;
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
+3 -1
View File
@@ -39,7 +39,7 @@ public interface ISysDictService extends IService<SysDict> {
List<String> queryTableDictByKeys(String table, String text, String code, String keys);
/**
* 查询展示区域
* 查询选项内容--数据字典名称
*
* @return
*/
@@ -149,4 +149,6 @@ public interface ISysDictService extends IService<SysDict> {
*/
void refreshCache();
SysDict queryById(String id);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+6 -2
View File
@@ -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<OnlCgformTag, IOnlCgf
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
onlCgformTagService.selectShowAreaById(onlCgformTag.getArea_id());
QueryWrapper<OnlCgformTag> queryWrapper = QueryGenerator.initQueryWrapper(onlCgformTag, req.getParameterMap());
Page<OnlCgformTag> page = new Page<OnlCgformTag>(pageNo, pageSize);
IPage<OnlCgformTag> pageList = onlCgformTagService.page(page, queryWrapper);
@@ -69,8 +73,8 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
@AutoLog(value = "标签管理-列表查询")
@ApiOperation(value="标签管理-列表查询", notes="标签管理-列表查询")
@GetMapping(value = "/list")
public Result<List<OnlCgformTag>> queryList() {
List<OnlCgformTag> list = onlCgformTagService.queryList();
public Result<List<OnlCgformTag>> queryList(@Validated @RequestBody OnlCgformArea onlCgformArea) {
List<OnlCgformTag> list = onlCgformTagService.queryList(onlCgformArea);
return Result.OK(list);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java
+3 -1
View File
@@ -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;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java
+6
View File
@@ -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")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java
+10 -1
View File
@@ -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> {
*/
OnlCgformTag queryById(String id);
/**
* 通过area_id查询展示区域
*
* @param area_id
* @return
*/
List<OnlCgformTag> selectShowAreaById(String area_id);
/**
* 列表查询
*
* @return
*/
List<OnlCgformTag> queryList();
List<OnlCgformTag> queryList(OnlCgformArea onlCgformArea);
/**
* 同一“所属模块”下的“属性名称”不能重复
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+20 -2
View File
@@ -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<OnlCgformTagMapper, Onl
return getById(id);
}
/**
* 通过area_id查询展示区域
*
* @param area_id
* @return
*/
@Override
public List<OnlCgformTag> selectShowAreaById(String area_id) {
QueryWrapper<OnlCgformTag> queryWrapper=new QueryWrapper<>();
queryWrapper.select("show_area").eq("id",area_id);
return list(queryWrapper);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<OnlCgformTag> queryList() {
return list();
public List<OnlCgformTag> queryList(OnlCgformArea onlCgformArea) {
UpdateWrapper<OnlCgformTag> updateWrapper=new UpdateWrapper<>();
updateWrapper.set("area_id",onlCgformArea.getId());
updateWrapper.set("is_model",onlCgformArea.getIsModel());
return list(updateWrapper);
}
/**