add 数据字典和标签管理swagger
This commit is contained in:
lijiarao
+7
-5
@@ -30,6 +30,8 @@ import com.jero.modules.system.model.SysDictTree;
|
||||
import com.jero.modules.system.model.TreeSelectModel;
|
||||
import com.jero.modules.system.service.ISysDictItemService;
|
||||
import com.jero.modules.system.service.ISysDictService;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
import com.jero.modules.system.vo.SysDictPage;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -412,7 +414,7 @@ public class SysDictController {
|
||||
|
||||
/**
|
||||
* @功能：删除
|
||||
* @param map
|
||||
* @param body
|
||||
* @return
|
||||
*/
|
||||
@ApiOperationSupport(order = 7)
|
||||
@@ -420,8 +422,8 @@ public class SysDictController {
|
||||
@PostMapping(value = "/delete")
|
||||
@RequiresPermissions("sys:dict:operation")
|
||||
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||
public Result<Object> delete(@RequestBody Map<String,String> map) {
|
||||
String id = map.get("id");
|
||||
public Result<Object> delete(@RequestBody IdMapBody map) {
|
||||
String id = map.getId();
|
||||
if(StringUtils.isBlank(id)){
|
||||
return Result.error(ResultCommon.PARAMETER_NOT_RECOGNIZED);
|
||||
}
|
||||
@@ -446,8 +448,8 @@ public class SysDictController {
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
@RequiresPermissions("sys:dict:operation")
|
||||
@CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||
public Result<Object> deleteBatch(@RequestBody Map<String,String> map) {
|
||||
String ids = map.get("ids");
|
||||
public Result<Object> deleteBatch(@RequestBody IdsMapBody map) {
|
||||
String ids = map.getIds();
|
||||
if(oConvertUtils.isEmpty(ids)) {
|
||||
return Result.error(ResultCommon.PARAMETER_NOT_RECOGNIZED);
|
||||
}
|
||||
|
||||
+6
-6
@@ -31,6 +31,8 @@ import com.jero.modules.enums.FixedFieldEnum;
|
||||
import com.jero.modules.system.entity.SysDict;
|
||||
import com.jero.modules.system.service.ISysDictService;
|
||||
import com.jero.modules.system.util.TreeUtils;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
@@ -287,7 +289,6 @@ public class SysDictItemController {
|
||||
|
||||
/**
|
||||
* @功能：删除字典数据
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@ApiOperationSupport(order = 7)
|
||||
@@ -295,8 +296,8 @@ public class SysDictItemController {
|
||||
@PostMapping("/delete")
|
||||
@RequiresPermissions("sys:dict:operation")
|
||||
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||
public Result<T> delete(@RequestBody Map<String, String> map) {
|
||||
String id = map.get("id");
|
||||
public Result<T> delete(@RequestBody IdMapBody map) {
|
||||
String id = map.getId();
|
||||
if(StringUtils.isBlank(id)){
|
||||
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}
|
||||
@@ -318,7 +319,6 @@ public class SysDictItemController {
|
||||
|
||||
/**
|
||||
* @功能：批量删除字典数据
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@ApiOperationSupport(order = 8)
|
||||
@@ -326,8 +326,8 @@ public class SysDictItemController {
|
||||
@PostMapping("/deleteBatch")
|
||||
@RequiresPermissions("sys:dict:operation")
|
||||
@CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
|
||||
public Result<Object> deleteBatch(@RequestBody Map<String, String> map) {
|
||||
String ids = map.get("ids");
|
||||
public Result<Object> deleteBatch(@RequestBody IdsMapBody map) {
|
||||
String ids = map.getIds();
|
||||
if(ids==null || "".equals(ids.trim())) {
|
||||
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}else {
|
||||
|
||||
@@ -1,132 +1,151 @@
|
||||
package com.jero.modules.system.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.jero.common.aspect.annotation.Dict;import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 字典表
|
||||
* </p>
|
||||
*
|
||||
* @Author zhangweijian
|
||||
* @since 2018-12-28
|
||||
* @author liJiaRao
|
||||
* @date 2023-11-20 15:39
|
||||
*/
|
||||
@ApiModel(description = "sys_dict")
|
||||
@Data
|
||||
@TableName(value = "sys_dict")
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
public class SysDict implements Serializable {
|
||||
|
||||
public class SysDict {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@TableId(value = "id", type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* [预留字段，暂时无用]
|
||||
* 字典类型,0 string,1 number类型,2 boolean
|
||||
* 前端js对stirng类型和number类型 boolean 类型敏感，需要区分。在select 标签匹配的时候会用到
|
||||
* 默认为string类型
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
|
||||
/**
|
||||
* 字典名称
|
||||
*/
|
||||
@TableField(value = "dict_name")
|
||||
@ApiModelProperty(value = "字典名称")
|
||||
private String dictName;
|
||||
|
||||
/**
|
||||
* 字典英文名称
|
||||
*/
|
||||
@TableField(value = "dict_en_name")
|
||||
@ApiModelProperty(value = "字典英文名称")
|
||||
private String dictEnName;
|
||||
|
||||
/**
|
||||
* 字典编码
|
||||
*/
|
||||
@TableField(value = "dict_code")
|
||||
@ApiModelProperty(value = "字典编码")
|
||||
private String dictCode;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
@TableField(value = "description")
|
||||
@ApiModelProperty(value = "描述")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 删除状态
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(value = "del_flag")
|
||||
@ApiModelProperty(value = "删除状态")
|
||||
private Integer delFlag;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "create_time")
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "update_time")
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 字典类型0为string,1为number
|
||||
*/
|
||||
@TableField(value = "`type`")
|
||||
@ApiModelProperty(value = "字典类型0为string,1为number")
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 是否为标签内容-数据字典（1是 0否）
|
||||
*/
|
||||
@TableField(value = "is_tag_dict")
|
||||
@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)
|
||||
@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
|
||||
private java.lang.Integer isTagDict;
|
||||
private Integer isTagDict;
|
||||
|
||||
/**
|
||||
* 是否是只读（2字段固定，内部可配1固定字段 0非固定字段）
|
||||
*/
|
||||
@TableField(value = "is_read_only")
|
||||
@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;
|
||||
private Integer isReadOnly;
|
||||
|
||||
/**
|
||||
* 表单控件类型
|
||||
* 标签类型 1下拉选择 2树形结构
|
||||
*/
|
||||
@TableField(value = "attribute_type")
|
||||
@Excel(name = "标签类型 1下拉选择 2树形结构", width = 15,dicCode = "attribute_type")
|
||||
@ApiModelProperty(value = "标签类型 1下拉选择 2树形结构")
|
||||
@Dict(dicCode = "attribute_type")
|
||||
private java.lang.String attributeType;
|
||||
private String attributeType;
|
||||
|
||||
/**属性类型名称*/
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@TableField(value = "order_num")
|
||||
@ApiModelProperty(value = "排序")
|
||||
private Integer orderNum;
|
||||
/**
|
||||
* 属性类型名称
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "属性类型名称", width = 15,dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text")
|
||||
@Dict(dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text")
|
||||
@Excel(name = "属性类型名称", width = 15, dictTable = "sys_dict_item", dicText = "item_text", dicCode = "item_text")
|
||||
@Dict(dictTable = "sys_dict_item", dicText = "item_text", dicCode = "item_text")
|
||||
@ApiModelProperty(value = "属性类型名称")
|
||||
private java.lang.String attributeTypeName;
|
||||
|
||||
/**数据字典英文名-属性类型英文名*/
|
||||
private String attributeTypeName;
|
||||
/**
|
||||
* 数据字典英文名-属性类型英文名
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
@Excel(name = "属性类型英文名", width = 15,dictTable = "sys_dict_item", dicText = "en_name", dicCode ="en_name")
|
||||
@Dict(dictTable = "sys_dict_item", dicText = "en_name", dicCode ="en_name")
|
||||
@Excel(name = "属性类型英文名", width = 15, dictTable = "sys_dict_item", dicText = "en_name", dicCode = "en_name")
|
||||
@Dict(dictTable = "sys_dict_item", dicText = "en_name", dicCode = "en_name")
|
||||
@ApiModelProperty(value = "属性类型英文名")
|
||||
private java.lang.String attributeTypeEnName;
|
||||
|
||||
/**排序*/
|
||||
private java.lang.Integer orderNum;
|
||||
}
|
||||
private String attributeTypeEnName;
|
||||
}
|
||||
@@ -1,133 +1,165 @@
|
||||
package com.jero.modules.system.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* </p>
|
||||
*
|
||||
* @Author zhangweijian
|
||||
* @since 2018-12-28
|
||||
* @author liJiaRao
|
||||
* @date 2023-11-20 15:46
|
||||
*/
|
||||
@ApiModel(description = "sys_dict_item")
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
public class SysDictItem implements Serializable {
|
||||
|
||||
@TableName(value = "sys_dict_item")
|
||||
public class SysDictItem {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@TableId(value = "id", type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 字典id
|
||||
*/
|
||||
@TableField(value = "dict_id")
|
||||
@ApiModelProperty(value = "字典id")
|
||||
private String dictId;
|
||||
|
||||
/**
|
||||
* 父级id
|
||||
*/
|
||||
@TableField(value = "parent_id")
|
||||
@ApiModelProperty(value = "父级id")
|
||||
private String parentId;
|
||||
/**
|
||||
* 父级id(树形结构使用)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String pId;
|
||||
|
||||
/**
|
||||
* 字典项文本
|
||||
*/
|
||||
@TableField(value = "item_text")
|
||||
@Excel(name = "字典项文本", width = 20)
|
||||
@ApiModelProperty(value = "字典项文本")
|
||||
private String itemText;
|
||||
|
||||
/**
|
||||
* 字典项值
|
||||
*/
|
||||
@Excel(name = "字典项值", width = 30)
|
||||
private String itemValue;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
@Excel(name = "描述", width = 40)
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@Excel(name = "排序", width = 15,type=4)
|
||||
private Integer sortOrder;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String dictCode;
|
||||
|
||||
|
||||
/**
|
||||
* 状态（1启用 0不启用）
|
||||
*/
|
||||
@Dict(dicCode = "dict_item_status")
|
||||
private Integer status;
|
||||
|
||||
private String createBy;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
private String updateBy;
|
||||
|
||||
private Date updateTime;
|
||||
|
||||
/**是否为标签内容-数据字典（1是 0否）*/
|
||||
@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)/*, dicText = "is_tag_dict", dicCode = "is_tag_dict")
|
||||
@Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")*/
|
||||
@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
|
||||
private java.lang.Integer isTagDict;
|
||||
|
||||
/**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/
|
||||
@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 = "标签类型 1下拉选择 2树形结构", width = 15)
|
||||
@ApiModelProperty(value = "标签类型 1下拉选择 2树形结构")
|
||||
@Dict(dicCode = "attribute_type")
|
||||
private java.lang.String attributeType;
|
||||
|
||||
/**逻辑删除标识*/
|
||||
/**value：0可用，1逻辑删除**/
|
||||
@TableLogic
|
||||
public Integer delFlag;
|
||||
|
||||
/**
|
||||
* 字典英文名称
|
||||
*/
|
||||
@TableField(value = "en_name")
|
||||
@Excel(name = "字典英文名称", width = 15)
|
||||
@ApiModelProperty(value = "字典英文名称")
|
||||
private String enName;
|
||||
|
||||
/**
|
||||
* 字典项值
|
||||
*/
|
||||
@TableField(value = "item_value")
|
||||
@Excel(name = "字典项值", width = 30)
|
||||
@ApiModelProperty(value = "字典项值")
|
||||
private String itemValue;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
@TableField(value = "description")
|
||||
@Excel(name = "描述", width = 40)
|
||||
@ApiModelProperty(value = "描述")
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@TableField(value = "sort_order")
|
||||
@Excel(name = "排序", width = 15,type=4)
|
||||
@ApiModelProperty(value = "排序")
|
||||
private Integer sortOrder;
|
||||
|
||||
/**
|
||||
* 状态（1启用 0不启用）
|
||||
*/
|
||||
@TableField(value = "`status`")
|
||||
@Dict(dicCode = "dict_item_status")
|
||||
@ApiModelProperty(value = "状态（1启用 0不启用）")
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* createBy
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
@ApiModelProperty(value = "createBy")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* createTime
|
||||
*/
|
||||
@TableField(value = "create_time")
|
||||
@ApiModelProperty(value = "createTime")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* updateBy
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
@ApiModelProperty(value = "updateBy")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* updateTime
|
||||
*/
|
||||
@TableField(value = "update_time")
|
||||
@ApiModelProperty(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 是否为标签内容-数据字典（1是 0否）
|
||||
*/
|
||||
@TableField(value = "is_tag_dict")
|
||||
@Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)
|
||||
@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
|
||||
private Integer isTagDict;
|
||||
|
||||
/**
|
||||
* 是否是只读（2字段固定，内部可配1固定字段 0非固定字段）
|
||||
*/
|
||||
@TableField(value = "is_read_only")
|
||||
@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 Integer isReadOnly;
|
||||
|
||||
/**
|
||||
* 表单控件类型
|
||||
*/
|
||||
@TableField(value = "attribute_type")
|
||||
@Excel(name = "标签类型 1下拉选择 2树形结构", width = 15)
|
||||
@ApiModelProperty(value = "标签类型 1下拉选择 2树形结构")
|
||||
@Dict(dicCode = "attribute_type")
|
||||
private String attributeType;
|
||||
|
||||
/**
|
||||
* 逻辑删除标识
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(value = "del_flag")
|
||||
@ApiModelProperty(value = "逻辑删除标识")
|
||||
private Integer delFlag;
|
||||
|
||||
/**
|
||||
* 统计节点(主要为责任领域)
|
||||
*/
|
||||
@TableField(value = "stat_node")
|
||||
@Excel(name = "统计节点", width = 15)
|
||||
@ApiModelProperty(value = "统计节点")
|
||||
@ApiModelProperty(value = "统计节点(主要为责任领域)")
|
||||
private String statNode;
|
||||
|
||||
/**
|
||||
* 父级id(树形结构使用)
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
}
|
||||
private String pId;
|
||||
@TableField(exist = false)
|
||||
private String dictCode;
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package com.jero.modules.system.entity;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
@@ -30,35 +31,41 @@ public class SysRole implements Serializable {
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@ApiModelProperty(value = "id")
|
||||
@TableId(type = IdType.ASSIGN_UUID)
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 角色名称
|
||||
*/
|
||||
@ApiModelProperty(value = "角色名称")
|
||||
@Excel(name="角色名",width=15)
|
||||
private String roleName;
|
||||
|
||||
/**
|
||||
* 角色编码
|
||||
*/
|
||||
@ApiModelProperty(value = "角色编码")
|
||||
@Excel(name="角色编码",width=15)
|
||||
private String roleCode;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
@ApiModelProperty(value = "描述")
|
||||
@Excel(name="描述",width=60)
|
||||
private String description;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
@@ -66,11 +73,13 @@ public class SysRole implements Serializable {
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
+4
-4
@@ -126,8 +126,8 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
|
||||
@AutoLog(value = "项目库-通过id删除")
|
||||
@ApiOperation(value = "项目库-通过id删除", notes = "项目库-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<T> delete(@RequestBody IdMapBody body) {
|
||||
String id = body.getId();
|
||||
public Result<T> delete(@RequestBody IdMapBody map) {
|
||||
String id = map.getId();
|
||||
if (StringUtils.isEmpty(id)) {
|
||||
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}
|
||||
@@ -142,8 +142,8 @@ public class LawsProjectLibraryController extends JeroController<LawsProjectLibr
|
||||
@AutoLog(value = "项目库-批量删除")
|
||||
@ApiOperation(value = "项目库-批量删除", notes = "项目库-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
public Result<T> deleteBatch(@RequestBody IdsMapBody body) {
|
||||
String ids = body.getIds();
|
||||
public Result<T> deleteBatch(@RequestBody IdsMapBody map) {
|
||||
String ids = map.getIds();
|
||||
if (StringUtils.isEmpty(ids)) {
|
||||
throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}
|
||||
|
||||
@@ -8,7 +8,10 @@ import com.jero.common.constant.CacheConstant;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.api.vo.ResultCommon;
|
||||
import com.jero.common.util.RedisUtil;
|
||||
import com.jero.common.util.oConvertUtils;
|
||||
import com.jero.modules.system.service.ISysDictItemService;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
import com.jero.modules.tag.entity.LawsArea;
|
||||
import com.jero.modules.tag.service.ILawsAreaService;
|
||||
import com.jero.modules.tag.service.ILawsTagService;
|
||||
@@ -149,11 +152,11 @@ public class LawsAreaController extends JeroController<LawsArea, ILawsAreaServic
|
||||
@ApiOperation(value="区域管理表-通过id删除", notes="区域管理表-通过id删除")
|
||||
@PostMapping(value = "/delete")
|
||||
@RequiresPermissions("area:delete")
|
||||
public Result<?> delete(@RequestBody Map<String, String> map) {
|
||||
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
|
||||
public Result<?> delete(@RequestBody IdMapBody map) {
|
||||
String id = map.getId();
|
||||
if(StringUtils.isBlank(id)){
|
||||
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}
|
||||
String id = map.get("id");
|
||||
LawsArea lawsArea = lawsAreaService.queryById(id);
|
||||
int count= lawsTagService.queryExitArea(lawsArea);
|
||||
if (count > 0) {
|
||||
@@ -172,11 +175,12 @@ public class LawsAreaController extends JeroController<LawsArea, ILawsAreaServic
|
||||
@ApiOperation(value="区域管理表-批量删除", notes="区域管理表-批量删除")
|
||||
@PostMapping(value = "/deleteBatch")
|
||||
@RequiresPermissions("area:delete")
|
||||
public Result<?> deleteBatch(@RequestBody Map<String, String> map) {
|
||||
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
|
||||
public Result<?> deleteBatch(@RequestBody IdsMapBody map) {
|
||||
String ids = map.getIds();
|
||||
if(oConvertUtils.isEmpty(ids)) {
|
||||
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}
|
||||
List<String> idList = Arrays.asList(map.get("ids").split(","));
|
||||
List<String> idList = Arrays.asList(ids.split(","));
|
||||
List<LawsArea> lawsAreas = lawsAreaService.listByIds(idList);
|
||||
for (LawsArea lawsArea : lawsAreas) {
|
||||
int count= lawsTagService.queryExitArea(lawsArea);
|
||||
|
||||
@@ -10,9 +10,12 @@ import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.constant.CommonConstant;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.util.oConvertUtils;
|
||||
import com.jero.modules.enums.FixedFieldEnum;
|
||||
import com.jero.modules.system.entity.SysDict;
|
||||
import com.jero.modules.system.mapper.SysDictMapper;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
import com.jero.modules.tag.entity.LawsTag;
|
||||
import com.jero.modules.tag.enums.TableNameEnum;
|
||||
import com.jero.modules.tag.service.ILawsTagService;
|
||||
@@ -214,11 +217,11 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
|
||||
@ApiOperation(value="标签管理-通过id删除", notes="标签管理-通过id删除")
|
||||
@PostMapping(value = "/logicDelete")
|
||||
@RequiresPermissions("tag:logicDelete")
|
||||
public Result<String> logicDelete(@RequestBody Map<String, String> map) {
|
||||
if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
|
||||
public Result<String> logicDelete(@RequestBody IdMapBody map) {
|
||||
String id = map.getId();
|
||||
if(StringUtils.isBlank(id)){
|
||||
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}
|
||||
String id = map.get("id");
|
||||
Result<String> result = new Result<>();
|
||||
LawsTag lawsTag = lawsTagService.queryById(id);
|
||||
if(StringUtils.isNotBlank(String.valueOf(lawsTag.getIsReadOnly()))) {
|
||||
@@ -242,11 +245,11 @@ public class LawsTagController extends JeroController<LawsTag, ILawsTagService>
|
||||
@ApiOperation(value="标签管理-批量删除", notes="标签管理-批量删除")
|
||||
@PostMapping(value = "/logicDeleteBatch")
|
||||
@RequiresPermissions("tag:logicDeleteBatch")
|
||||
public Result<?> logicDeleteBatch(@RequestBody Map<String, String> map) {
|
||||
if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
|
||||
public Result<?> logicDeleteBatch(@RequestBody IdsMapBody map) {
|
||||
String ids = map.getIds();
|
||||
if(oConvertUtils.isEmpty(ids)) {
|
||||
return Result.error(ResultCommon.PLEASE_SELECT_DATA);
|
||||
}
|
||||
String ids = map.get("ids");
|
||||
Result<LawsTag> result = new Result<>();
|
||||
List<String> idList = Arrays.asList(ids.split(","));
|
||||
for(String list:idList){
|
||||
|
||||
@@ -5,75 +5,112 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
||||
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 com.jero.common.aspect.annotation.Dict;import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 区域管理表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2022-01-24
|
||||
* @Version: V1.0
|
||||
*/
|
||||
*展示区域
|
||||
*@author liJiaRao
|
||||
*@date 2023-11-20 15:58
|
||||
*/
|
||||
@ApiModel(description = "展示区域")
|
||||
@Data
|
||||
@TableName("laws_area")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class LawsArea implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(value = "id", type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键")
|
||||
private String id;
|
||||
|
||||
/**创建人*/
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
/**
|
||||
* 创建日期
|
||||
*/
|
||||
@TableField(value = "create_time")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date createTime;
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
/**
|
||||
* 更新日期
|
||||
*/
|
||||
@TableField(value = "update_time")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date updateTime;
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField(value = "sys_org_code")
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private String sysOrgCode;
|
||||
|
||||
/**展示区域(1基本信息,2文本信息,3关联关系)*/
|
||||
|
||||
/**
|
||||
* 展示区域(1基本信息,2文本信息,3关联关系)
|
||||
*/
|
||||
@TableField(value = "show_area")
|
||||
@ApiModelProperty(value = "展示区域(1基本信息,2文本信息,3关联关系)")
|
||||
private String showArea;
|
||||
|
||||
/**英文名称*/
|
||||
/**
|
||||
* 英文名称
|
||||
*/
|
||||
@TableField(value = "en_name")
|
||||
@ApiModelProperty(value = "英文名称")
|
||||
private String enName;
|
||||
|
||||
/**所属模块(1文档库,0文档拆分)*/
|
||||
/**
|
||||
* 所属模块(1文档库,0文档拆分)
|
||||
*/
|
||||
@TableField(value = "is_model")
|
||||
@Dict(dicCode = "module")
|
||||
@ApiModelProperty(value = "所属模块(1文档库,0文档拆分)")
|
||||
private String isModel;
|
||||
|
||||
/**所属模块名称*/
|
||||
@TableField(exist = false)
|
||||
@Dict(dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text")
|
||||
private String isModelName;
|
||||
|
||||
/**所属模块英文名称*/
|
||||
@TableField(exist = false)
|
||||
@Dict(dictTable = "sys_dict_item", dicText = "en_name", dicCode ="en_name")
|
||||
private String isModelEnName;
|
||||
|
||||
/**排序号*/
|
||||
/**
|
||||
* 排序号
|
||||
*/
|
||||
@TableField(value = "sort")
|
||||
@ApiModelProperty(value = "排序号")
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
* 所属模块名称
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
}
|
||||
@Dict(dictTable = "sys_dict_item", dicText = "item_text", dicCode = "item_text")
|
||||
private String isModelName;
|
||||
/**
|
||||
* 所属模块英文名称
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
@Dict(dictTable = "sys_dict_item", dicText = "en_name", dicCode = "en_name")
|
||||
private String isModelEnName;
|
||||
}
|
||||
@@ -3,157 +3,419 @@ package com.jero.modules.tag.entity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: 标签项管理
|
||||
* @Author: jero-boot
|
||||
* @Date: 2022-02-14
|
||||
* @Version: V1.0
|
||||
*/
|
||||
*标签库
|
||||
*@author liJiaRao
|
||||
*@date 2023-11-20 15:30
|
||||
*/
|
||||
@ApiModel(description = "标签库")
|
||||
@Data
|
||||
@TableName("laws_tag")
|
||||
@TableName(value = "laws_tag")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class LawsTag implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@TableId(value = "id", type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "主键ID")
|
||||
private String id;
|
||||
|
||||
/**创建人*/
|
||||
private String createBy;
|
||||
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date createTime;
|
||||
|
||||
/**更新人*/
|
||||
private String updateBy;
|
||||
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date updateTime;
|
||||
|
||||
/**所属部门*/
|
||||
@TableField(exist = false)
|
||||
private String sysOrgCode;
|
||||
|
||||
/**表名*/
|
||||
/**
|
||||
* 表名
|
||||
*/
|
||||
@TableField(value = "`table_name`")
|
||||
@ApiModelProperty(value = "表名")
|
||||
private String tableName;
|
||||
|
||||
/**字段名字*/
|
||||
/**
|
||||
* 字段名字
|
||||
*/
|
||||
@TableField(value = "db_field_name")
|
||||
@ApiModelProperty(value = "字段名字")
|
||||
private String dbFieldName;
|
||||
|
||||
/**旧字段名字*/
|
||||
private String dbFieldNameOld;
|
||||
|
||||
/**所属模块(1文档库,0文档拆分)*/
|
||||
@Dict(dicCode = "module")
|
||||
private String isModel;
|
||||
|
||||
/**属性名称*/
|
||||
private String dbFieldTxt;
|
||||
|
||||
/**字段英文名称描述*/
|
||||
/**
|
||||
* 字段英文名
|
||||
*/
|
||||
@TableField(value = "db_field_en_name")
|
||||
@ApiModelProperty(value = "字段英文名")
|
||||
private String dbFieldEnName;
|
||||
|
||||
/**属性类型*/
|
||||
/**
|
||||
* 字段备注
|
||||
*/
|
||||
@TableField(value = "db_field_txt")
|
||||
@ApiModelProperty(value = "字段备注")
|
||||
private String dbFieldTxt;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
@TableField(value = "order_num")
|
||||
@ApiModelProperty(value = "排序")
|
||||
private Integer orderNum;
|
||||
|
||||
/**
|
||||
* 原字段名
|
||||
*/
|
||||
@TableField(value = "db_field_name_old")
|
||||
@ApiModelProperty(value = "原字段名")
|
||||
private String dbFieldNameOld;
|
||||
|
||||
/**
|
||||
* 是否主键 0否 1是
|
||||
*/
|
||||
@TableField(value = "db_is_key")
|
||||
@ApiModelProperty(value = "是否主键 0否 1是")
|
||||
private Integer dbIsKey;
|
||||
|
||||
/**
|
||||
* 是否允许为空 0否 1是
|
||||
*/
|
||||
@TableField(value = "db_is_null")
|
||||
@ApiModelProperty(value = "是否允许为空 0否 1是")
|
||||
private Integer dbIsNull;
|
||||
|
||||
/**
|
||||
* 数据库字段类型
|
||||
*/
|
||||
@TableField(value = "db_type")
|
||||
@ApiModelProperty(value = "数据库字段类型")
|
||||
private String dbType;
|
||||
|
||||
/**
|
||||
* 数据库字段长度
|
||||
*/
|
||||
@TableField(value = "db_length")
|
||||
@ApiModelProperty(value = "数据库字段长度")
|
||||
private Integer dbLength;
|
||||
|
||||
/**
|
||||
* 小数点
|
||||
*/
|
||||
@TableField(value = "db_point_length")
|
||||
@ApiModelProperty(value = "小数点")
|
||||
private Integer dbPointLength;
|
||||
|
||||
/**
|
||||
* 表字段默认值
|
||||
*/
|
||||
@TableField(value = "db_default_val")
|
||||
@ApiModelProperty(value = "表字段默认值")
|
||||
private String dbDefaultVal;
|
||||
|
||||
/**
|
||||
* 字典code
|
||||
*/
|
||||
@TableField(value = "dict_field")
|
||||
@ApiModelProperty(value = "字典code")
|
||||
private String dictField;
|
||||
|
||||
/**
|
||||
* 字典表
|
||||
*/
|
||||
@TableField(value = "dict_table")
|
||||
@ApiModelProperty(value = "字典表")
|
||||
private String dictTable;
|
||||
|
||||
/**
|
||||
* 字典Text
|
||||
*/
|
||||
@TableField(value = "dict_text")
|
||||
@ApiModelProperty(value = "字典Text")
|
||||
private String dictText;
|
||||
|
||||
/**
|
||||
* 表单控件类型
|
||||
*/
|
||||
@TableField(value = "field_show_type")
|
||||
@ApiModelProperty(value = "表单控件类型")
|
||||
@Dict(dicCode ="field_show_type")
|
||||
private String fieldShowType;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String fieldShowTypeName;
|
||||
|
||||
/**数据字典英文名-属性类型英文名*/
|
||||
@TableField(exist = false)
|
||||
private String fieldShowTypeEnName;
|
||||
|
||||
/**字典id*/
|
||||
private String dictId;
|
||||
|
||||
/**字典Code*/
|
||||
private String dictField;
|
||||
|
||||
/**字典表*/
|
||||
private String dictTable;
|
||||
|
||||
/**字典Text*/
|
||||
private String dictText;
|
||||
|
||||
/**数据库字段长度*/
|
||||
private Integer dbLength;
|
||||
|
||||
/**排序*/
|
||||
private Integer orderNum;
|
||||
|
||||
/**是否支持排序1是0否*/
|
||||
private Integer sortFlag;
|
||||
|
||||
/**字段是否必填0否 1是*/
|
||||
private String fieldMustInput;
|
||||
|
||||
/**表单是否显示0否 1是*/
|
||||
private Integer isShowForm;
|
||||
|
||||
/**表单新增时是否显示*/
|
||||
private Integer isShowFormCreate;
|
||||
|
||||
/**列表是否显示0否 1是*/
|
||||
private Integer isShowList;
|
||||
|
||||
/**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/
|
||||
private Integer isReadOnly;
|
||||
|
||||
/**展示区域id*/
|
||||
@Dict(dictTable = "laws_area", dicText = "show_area", dicCode = "id")
|
||||
private String showArea;
|
||||
|
||||
/**展示区域名称*/
|
||||
@TableField(exist = false)
|
||||
private String showAreaName;
|
||||
|
||||
/**展示区域-英文名称*/
|
||||
@TableField(exist = false)
|
||||
private String showAreaEnName;
|
||||
|
||||
/**是否查询条件0否 1是*/
|
||||
private Integer isQuery;
|
||||
|
||||
/**法规清单是否展示0否 1是*/
|
||||
private Integer isShowLawsList;
|
||||
|
||||
/**搜索中心是否展示0否 1是*/
|
||||
private Integer isShowSearch;
|
||||
|
||||
/**逻辑删除标识 0未删 1已删*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
/**是否主键 0否 1是*/
|
||||
private Integer dbIsKey;
|
||||
|
||||
/**是否允许为空 0否 1是*/
|
||||
private Integer dbIsNull;
|
||||
|
||||
/**小数点*/
|
||||
private Integer dbPointLength;
|
||||
|
||||
/**数据库字段类型*/
|
||||
private String dbType;
|
||||
|
||||
/*接口URL链接*/
|
||||
/**
|
||||
* 跳转URL
|
||||
*/
|
||||
@TableField(value = "field_href")
|
||||
@ApiModelProperty(value = "跳转URL")
|
||||
private String fieldHref;
|
||||
|
||||
/**
|
||||
* 表单控件长度
|
||||
*/
|
||||
@TableField(value = "field_length")
|
||||
@ApiModelProperty(value = "表单控件长度")
|
||||
private Integer fieldLength;
|
||||
|
||||
/**
|
||||
* 表单字段校验规则
|
||||
*/
|
||||
@TableField(value = "field_valid_type")
|
||||
@ApiModelProperty(value = "表单字段校验规则")
|
||||
private String fieldValidType;
|
||||
|
||||
/**
|
||||
* 字段是否必填
|
||||
*/
|
||||
@TableField(value = "field_must_input")
|
||||
@ApiModelProperty(value = "字段是否必填")
|
||||
private String fieldMustInput;
|
||||
|
||||
/**
|
||||
* 扩展参数JSON
|
||||
*/
|
||||
@TableField(value = "field_extend_json")
|
||||
@ApiModelProperty(value = "扩展参数JSON")
|
||||
private String fieldExtendJson;
|
||||
|
||||
/**
|
||||
* 控件默认值，不同的表达式展示不同的结果。
|
||||
* 1. 纯字符串直接赋给默认值；
|
||||
* 2. #{普通变量}；
|
||||
* 3. {{ 动态JS表达式 }}；
|
||||
* 4. ${填值规则编码}；
|
||||
* 填值规则表达式只允许存在一个，且不能和其他规则混用。
|
||||
*/
|
||||
@TableField(value = "field_default_value")
|
||||
@ApiModelProperty(value = "控件默认值，不同的表达式展示不同的结果。,1. 纯字符串直接赋给默认值；,2. #{普通变量}；,3. {{ 动态JS表达式 }}；,4. ${填值规则编码}；,填值规则表达式只允许存在一个，且不能和其他规则混用。")
|
||||
private String fieldDefaultValue;
|
||||
|
||||
/**
|
||||
* 表单新增时是否显示
|
||||
*/
|
||||
@TableField(value = "is_show_form_create")
|
||||
@ApiModelProperty(value = "表单新增时是否显示")
|
||||
private Integer isShowFormCreate;
|
||||
|
||||
/**
|
||||
* 是否查询条件0否 1是
|
||||
*/
|
||||
@TableField(value = "is_query")
|
||||
@ApiModelProperty(value = "是否查询条件0否 1是")
|
||||
private Integer isQuery;
|
||||
|
||||
/**
|
||||
* 表单是否显示0否 1是
|
||||
*/
|
||||
@TableField(value = "is_show_form")
|
||||
@ApiModelProperty(value = "表单是否显示0否 1是")
|
||||
private Integer isShowForm;
|
||||
|
||||
/**
|
||||
* 列表是否显示0否 1是
|
||||
*/
|
||||
@TableField(value = "is_show_list")
|
||||
@ApiModelProperty(value = "列表是否显示0否 1是")
|
||||
private Integer isShowList;
|
||||
|
||||
/**
|
||||
* 是否是只读（2字段固定，内部可配 1固定字段 0非固定字段
|
||||
* ）
|
||||
*/
|
||||
@TableField(value = "is_read_only")
|
||||
@ApiModelProperty(value = "是否是只读（2字段固定，内部可配 1固定字段 0非固定字段,）")
|
||||
private Integer isReadOnly;
|
||||
|
||||
/**
|
||||
* 查询模式
|
||||
*/
|
||||
@TableField(value = "query_mode")
|
||||
@ApiModelProperty(value = "查询模式")
|
||||
private String queryMode;
|
||||
|
||||
/**
|
||||
* 外键主表名
|
||||
*/
|
||||
@TableField(value = "main_table")
|
||||
@ApiModelProperty(value = "外键主表名")
|
||||
private String mainTable;
|
||||
|
||||
/**
|
||||
* 外键主键字段
|
||||
*/
|
||||
@TableField(value = "main_field")
|
||||
@ApiModelProperty(value = "外键主键字段")
|
||||
private String mainField;
|
||||
|
||||
/**
|
||||
* 修改人
|
||||
*/
|
||||
@TableField(value = "update_by")
|
||||
@ApiModelProperty(value = "修改人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@TableField(value = "update_time")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "修改时间")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "create_time")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(value = "create_by")
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 自定义值转换器
|
||||
*/
|
||||
@TableField(value = "converter")
|
||||
@ApiModelProperty(value = "自定义值转换器")
|
||||
private String converter;
|
||||
|
||||
/**
|
||||
* 查询默认值
|
||||
*/
|
||||
@TableField(value = "query_def_val")
|
||||
@ApiModelProperty(value = "查询默认值")
|
||||
private String queryDefVal;
|
||||
|
||||
/**
|
||||
* 查询配置字典text
|
||||
*/
|
||||
@TableField(value = "query_dict_text")
|
||||
@ApiModelProperty(value = "查询配置字典text")
|
||||
private String queryDictText;
|
||||
|
||||
/**
|
||||
* 查询配置字典code
|
||||
*/
|
||||
@TableField(value = "query_dict_field")
|
||||
@ApiModelProperty(value = "查询配置字典code")
|
||||
private String queryDictField;
|
||||
|
||||
/**
|
||||
* 查询配置字典table
|
||||
*/
|
||||
@TableField(value = "query_dict_table")
|
||||
@ApiModelProperty(value = "查询配置字典table")
|
||||
private String queryDictTable;
|
||||
|
||||
/**
|
||||
* 查询显示控件
|
||||
*/
|
||||
@TableField(value = "query_show_type")
|
||||
@ApiModelProperty(value = "查询显示控件")
|
||||
private String queryShowType;
|
||||
|
||||
/**
|
||||
* 是否启用查询配置1是0否
|
||||
*/
|
||||
@TableField(value = "query_config_flag")
|
||||
@ApiModelProperty(value = "是否启用查询配置1是0否")
|
||||
private String queryConfigFlag;
|
||||
|
||||
/**
|
||||
* 查询字段校验类型
|
||||
*/
|
||||
@TableField(value = "query_valid_type")
|
||||
@ApiModelProperty(value = "查询字段校验类型")
|
||||
private String queryValidType;
|
||||
|
||||
/**
|
||||
* 查询字段是否必填1是0否
|
||||
*/
|
||||
@TableField(value = "query_must_input")
|
||||
@ApiModelProperty(value = "查询字段是否必填1是0否")
|
||||
private String queryMustInput;
|
||||
|
||||
/**
|
||||
* 是否支持排序1是0否
|
||||
*/
|
||||
@TableField(value = "sort_flag")
|
||||
@ApiModelProperty(value = "是否支持排序1是0否")
|
||||
private String sortFlag;
|
||||
|
||||
/**
|
||||
* 展示区域
|
||||
*/
|
||||
@TableField(value = "show_area")
|
||||
@Dict(dictTable = "laws_area", dicText = "show_area", dicCode = "id")
|
||||
@ApiModelProperty(value = "展示区域")
|
||||
private String showArea;
|
||||
|
||||
/**
|
||||
* 法规清单是否展示0否 1是
|
||||
*/
|
||||
@TableField(value = "is_show_laws_list")
|
||||
@ApiModelProperty(value = "法规清单是否展示0否 1是,")
|
||||
private Integer isShowLawsList;
|
||||
|
||||
/**
|
||||
* 搜索中心是否展示0否 1是
|
||||
*/
|
||||
@TableField(value = "is_show_search")
|
||||
@ApiModelProperty(value = "搜索中心是否展示0否 1是")
|
||||
private Integer isShowSearch;
|
||||
|
||||
/**
|
||||
* 逻辑删除标识 0未删 1已删
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(value = "del_flag")
|
||||
@ApiModelProperty(value = "逻辑删除标识 0未删 1已删")
|
||||
private Integer delFlag;
|
||||
|
||||
/**
|
||||
* 所属模块
|
||||
*/
|
||||
@TableField(value = "is_model")
|
||||
@Dict(dicCode = "module")
|
||||
@ApiModelProperty(value = "所属模块")
|
||||
private String isModel;
|
||||
|
||||
/**
|
||||
* 字典id
|
||||
*/
|
||||
@TableField(value = "dict_id")
|
||||
@ApiModelProperty(value = "字典id")
|
||||
private String dictId;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String sysOrgCode;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String fieldShowTypeName;
|
||||
/**
|
||||
* 数据字典英文名-属性类型英文名
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String fieldShowTypeEnName;
|
||||
/**
|
||||
* 展示区域名称
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private String showAreaName;
|
||||
/**
|
||||
* 展示区域-英文名称
|
||||
*/
|
||||
/**首页检索正文拼接排序*/
|
||||
private String homeSearchContextOrder;
|
||||
|
||||
@@ -161,8 +423,5 @@ public class LawsTag implements Serializable {
|
||||
private String homeSearchFileOrder;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String cut;
|
||||
|
||||
public LawsTag() {
|
||||
}
|
||||
}
|
||||
private String showAreaEnName;
|
||||
}
|
||||
Reference in New Issue
Block a user