标签中英切换优化+查询速度修改

This commit is contained in:
xiejunyu
2022-03-25 17:20:26 +08:00
parent 82685b129f
commit 1ebea886cb
7 changed files with 60 additions and 139 deletions
@@ -406,15 +406,14 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
IPage page = new Page(pageNo, pageSize);
IPage<SysDict> result = sysDictMapper.queryPageList(page, params);
/*List<SysDict> records = result.getRecords();
List<SysDict> records = result.getRecords();
String cut = (String) params.get("cut");
//中英切换-字典名称+属性类型列
if(CutEnum.EN.getValue().equals(cut)){
for(SysDict data:records){
data.setDictName(data.getDictEnName());
data.setAttributeTypeName(data.getAttributeTypeEnName());
}
}*/
}
return result;
}
}
@@ -7,7 +7,6 @@ import com.jero.common.constant.CommonConstant;
import com.jero.common.system.base.controller.JeroController;
import com.jero.generater.modules.online.cgform.controller.OnlCgformApiController;
import com.jero.modules.enums.FixedFieldEnum;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import com.jero.modules.tag.entity.OnlCgformArea;
import com.jero.modules.tag.entity.OnlCgformTag;
@@ -115,7 +114,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
return Result.error("固定字段,不可修改");
}else {
onlCgformTagService.editById(onlCgformTag);
onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
//onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");
return Result.OK("编辑成功!");
}
}
@@ -6,12 +6,9 @@ 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;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -27,64 +24,54 @@ import java.io.Serializable;
@TableName("onl_cgform_area")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="onl_cgform_area对象", description="区域管理表")
//@ApiModel(value="onl_cgform_area对象", description="区域管理表")
public class OnlCgformArea implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
/**创建人*/
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
/**更新人*/
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
/**所属部门*/
private java.lang.String sysOrgCode;
/**展示区域(1基本信息,2文本信息,3关联关系)*/
@Excel(name = "展示区域(1基本信息,2文本信息,3关联关系)", width = 15)
@ApiModelProperty(value = "展示区域(1基本信息,2文本信息,3关联关系)")
private java.lang.String showArea;
/**英文名称*/
@Excel(name = "英文名称", width = 15)
@ApiModelProperty(value = "英文名称")
/**英文名称*/
private java.lang.String enName;
/**所属模块(1文档库,0文档拆分)*/
@Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dicCode = "module")
/**所属模块(1文档库,0文档拆分)*/
@Dict(dicCode = "module")
@ApiModelProperty(value = "所属模块(1文档库,0文档拆分)")
private java.lang.String isModel;
/**所属模块名称*/
@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")
@ApiModelProperty(value = "所属模块名称")
private java.lang.String isModelName;
/**排序号*/
@Excel(name = "排序号", width = 15)
@ApiModelProperty(value = "排序号")
/**所属模块英文名称*/
@TableField(exist = false)
@Dict(dictTable = "sys_dict_item", dicText = "en_name", dicCode ="en_name")
private java.lang.String isModelEnName;
/**排序号*/
private java.lang.Integer sort;
}
@@ -1,14 +1,14 @@
package com.jero.modules.tag.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -24,219 +24,155 @@ import java.io.Serializable;
@TableName("onl_cgform_field")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="onl_cgform_tag对象", description="标签项管理")
//@ApiModel(value="onl_cgform_tag对象", description="标签项管理")
public class OnlCgformTag implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@TableField(exist = false)
@ApiModelProperty(value = "创建人")
@Dict(dictTable = "onl_cgform_field", dicText = "create_by", dicCode = "create_by")
private java.lang.String createBy;
/**创建日期*/
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
//@Dict(dictTable = "onl_cgform_field", dicText = "create_time", dicCode = "create_time")
private java.util.Date createTime;
/**更新人*/
@TableField(exist = false)
@ApiModelProperty(value = "更新人")
@Dict(dictTable = "onl_cgform_field", dicText = "update_by", dicCode = "update_by")
private java.lang.String updateBy;
/**更新日期*/
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
//@Dict(dictTable = "onl_cgform_field", dicText = "update_time", dicCode = "update_time")
private java.util.Date updateTime;
/**所属部门*/
@TableField(exist = false)
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**文档库-表id*/
@Excel(name = "文档库-表id", width = 15,dictTable = "onl_cgform_field", dicText = "cgform_head_id", dicCode = "cgform_head_id")
@Dict(dictTable = "onl_cgform_field", dicText = "cgform_head_id", dicCode = "cgform_head_id")
@ApiModelProperty(value = "文档库-表id")
// @Dict(dictTable = "onl_cgform_field", dicText = "cgform_head_id", dicCode = "cgform_head_id")
private java.lang.String cgformHeadId;
/**所属模块(1文档库,0文档拆分)*/
@Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dicCode = "module")
@Dict(dicCode = "module")
@ApiModelProperty(value = "所属模块(1文档库,0文档拆分")
private java.lang.String isModel;
/**属性名称*/
@Excel(name = "属性名称", width = 15,dictTable = "onl_cgform_field", dicText = "db_field_txt", dicCode = "db_field_txt")
@Dict(dictTable = "onl_cgform_field", dicText = "db_field_txt", dicCode = "db_field_txt")
@ApiModelProperty(value = "属性名称")
//@Dict(dictTable = "onl_cgform_field", dicText = "db_field_txt", dicCode = "db_field_txt")
private java.lang.String dbFieldTxt;
/**字段英文名称描述*/
@Excel(name = "字段英文名称描述", width = 15,dictTable = "onl_cgform_field", dicText = "db_field_en_name", dicCode = "db_field_en_name")
@Dict(dictTable = "onl_cgform_field", dicText = "db_field_en_name", dicCode = "db_field_en_name")
@ApiModelProperty(value = "字段英文名称描述")
// @Dict(dictTable = "onl_cgform_field", dicText = "db_field_en_name", dicCode = "db_field_en_name")
private java.lang.String dbFieldEnName;
/**属性类型*/
@Excel(name = "属性类型", width = 15,dicCode ="field_show_type")
@Dict(dicCode ="field_show_type")
@ApiModelProperty(value = "属性类型")
private java.lang.String fieldShowType;
@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")
@ApiModelProperty(value = "属性类型名称")
private java.lang.String fieldShowTypeName;
/**数据字典英文名-属性类型英文名*/
@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")
@ApiModelProperty(value = "属性类型英文名")
private java.lang.String fieldShowTypeEnName;
/**字典id*/
@Excel(name = "字典id", width = 15, dictTable = "onl_cgform_field", dicText = "dict_id", dicCode = "dict_id")
@Dict(dictTable = "onl_cgform_field", dicText = "dict_id", dicCode = "dict_id")
@ApiModelProperty(value = "字典名称")
//@Dict(dictTable = "onl_cgform_field", dicText = "dict_id", dicCode = "dict_id")
private java.lang.String dictId;
/**字典Code*/
@Excel(name = "字典Code", width = 15, dictTable = "onl_cgform_field", dicText = "dict_field", dicCode = "dict_field")
@Dict(dictTable = "onl_cgform_field", dicText = "dict_field", dicCode = "dict_field")
@ApiModelProperty(value = "字典Code")
//@Dict(dictTable = "onl_cgform_field", dicText = "dict_field", dicCode = "dict_field")
private java.lang.String dictField;
/**字典表*/
@Excel(name = "字典表", width = 15, dictTable = "onl_cgform_field", dicText = "dict_table", dicCode = "dict_table")
@Dict(dictTable = "onl_cgform_field", dicText = "dict_table", dicCode = "dict_table")
@ApiModelProperty(value = "字典表")
//@Dict(dictTable = "onl_cgform_field", dicText = "dict_table", dicCode = "dict_table")
private java.lang.String dictTable;
/**字典Text*/
@Excel(name = "字典Text", width = 15, dictTable = "onl_cgform_field", dicText = "dict_text", dicCode = "dict_text")
@Dict(dictTable = "onl_cgform_field", dicText = "dict_text", dicCode = "dict_text")
@ApiModelProperty(value = "字典Text")
// @Dict(dictTable = "onl_cgform_field", dicText = "dict_text", dicCode = "dict_text")
private java.lang.String dictText;
/**数据库字段长度*/
@Excel(name = "数据库字段长度", width = 15,dictTable = "onl_cgform_field", dicText = "db_length", dicCode = "db_length")
@Dict(dictTable = "onl_cgform_field", dicText = "db_length", dicCode = "db_length")
@ApiModelProperty(value = "数据库字段长度")
// @Dict(dictTable = "onl_cgform_field", dicText = "db_length", dicCode = "db_length")
private java.lang.Integer dbLength;
/**排序*/
@Excel(name = "排序", width = 15,dictTable = "onl_cgform_field", dicText = "order_num", dicCode = "order_num")
@Dict(dictTable = "onl_cgform_field", dicText = "order_num", dicCode = "order_num")
@ApiModelProperty(value = "排序")
// @Dict(dictTable = "onl_cgform_field", dicText = "order_num", dicCode = "order_num")
private java.lang.Integer orderNum;
/**字段是否必填0否 1是*/
@Excel(name = "字段是否必填0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "field_must_input", dicCode = "field_must_input")
@Dict(dictTable = "onl_cgform_field", dicText = "field_must_input", dicCode = "field_must_input")
@ApiModelProperty(value = "字段是否必填0否 1是")
// @Dict(dictTable = "onl_cgform_field", dicText = "field_must_input", dicCode = "field_must_input")
private java.lang.String fieldMustInput;
/**表单是否显示0否 1是*/
@Excel(name = "表单是否显示0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "is_show_form", dicCode = "is_show_form")
@Dict(dictTable = "onl_cgform_field", dicText = "is_show_form", dicCode = "is_show_form")
@ApiModelProperty(value = "表单是否显示0否 1是")
// @Dict(dictTable = "onl_cgform_field", dicText = "is_show_form", dicCode = "is_show_form")
private java.lang.Integer isShowForm;
/**列表是否显示0否 1是*/
@Excel(name = "列表是否显示0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "is_show_list", dicCode = "is_show_list")
@Dict(dictTable = "onl_cgform_field", dicText = "is_show_list", dicCode = "is_show_list")
@ApiModelProperty(value = "列表是否显示0否 1是")
// @Dict(dictTable = "onl_cgform_field", dicText = "is_show_list", dicCode = "is_show_list")
private java.lang.Integer isShowList;
/**是否是只读(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非固定字段)")
// @Dict(dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only")
private java.lang.Integer isReadOnly;
/**展示区域id*/
@Excel(name = "展示区域id", width = 15, dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id")
@Dict(dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id")
@ApiModelProperty(value = "展示区域id")
private java.lang.String showArea;
/**展示区域名称*/
@TableField(exist = false)
@Excel(name = "展示区域名称", width = 15, dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "show_area")
@Dict(dictTable = "onl_cgform_area", dicText = "show_area", dicCode ="show_area")
@ApiModelProperty(value = "展示区域名称")
private java.lang.String showAreaName;
/**展示区域-英文名称*/
@TableField(exist = false)
@Excel(name = "展示区域英文名", width = 15, dictTable = "onl_cgform_area", dicText = "en_name", dicCode = "en_name")
@Dict(dictTable = "onl_cgform_area", dicText = "en_name", dicCode = "en_name")
@ApiModelProperty(value = "展示区域英文名")
private java.lang.String showAreaEnName;
/**是否查询条件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")
@ApiModelProperty(value = "是否查询条件0否 1是")
// @Dict(dictTable = "onl_cgform_field", dicText = "is_query", dicCode = "is_query")
private java.lang.Integer isQuery;
/**法规清单是否展示0否 1是*/
@Excel(name = "法规清单是否展示0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "is_show_laws_list", dicCode = "is_show_laws_list")
@Dict(dictTable = "onl_cgform_field", dicText = "is_show_laws_list", dicCode = "is_show_laws_list")
@ApiModelProperty(value = "法规清单是否展示0否 1是")
// @Dict(dictTable = "onl_cgform_field", dicText = "is_show_laws_list", dicCode = "is_show_laws_list")
private java.lang.Integer isShowLawsList;
/**搜索中心是否展示0否 1是*/
@Excel(name = "搜索中心是否展示0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "is_show_search", dicCode = "is_show_search")
@Dict(dictTable = "onl_cgform_field", dicText = "is_show_search", dicCode = "is_show_search")
@ApiModelProperty(value = "搜索中心是否展示0否 1是")
//@Dict(dictTable = "onl_cgform_field", dicText = "is_show_search", dicCode = "is_show_search")
private java.lang.Integer isShowSearch;
/**逻辑删除标识 0未删 1已删*/
@Excel(name = "逻辑删除标识 0未删 1已删", width = 15,dictTable = "onl_cgform_field", dicText = "is_delete", dicCode = "is_delete")
@Dict(dictTable = "onl_cgform_field", dicText = "is_delete", dicCode = "is_delete")
@ApiModelProperty(value = "逻辑删除标识 0未删 1已删")
// @Dict(dictTable = "onl_cgform_field", dicText = "is_delete", dicCode = "is_delete")
private Integer isDelete;
/**字段名字*/
@Excel(name = "字段名字", width = 15,dictTable = "onl_cgform_field", dicText = "db_field_name", dicCode = "db_field_name")
@Dict(dictTable = "onl_cgform_field", dicText = "db_field_name", dicCode = "db_field_name")
@ApiModelProperty(value = "字段名字")
//@Dict(dictTable = "onl_cgform_field", dicText = "db_field_name", dicCode = "db_field_name")
private String dbFieldName;
/**是否主键 0否 1是*/
@Excel(name = "是否主键 0否 1是", width = 15,dictTable = "onl_cgform_field", dicText = "db_is_key", dicCode = "db_is_key")
@Dict(dictTable = "onl_cgform_field", dicText = "db_is_key", dicCode = "db_is_key")
@ApiModelProperty(value = "是否主键 0否 1是")
// @Dict(dictTable = "onl_cgform_field", dicText = "db_is_key", dicCode = "db_is_key")
private Integer dbIsKey;
/**是否允许为空 0否 1是*/
@Excel(name = "是否允许为空0否 1是", width = 15,dictTable = "onl_cgform_field", dicText = "db_is_null", dicCode = "db_is_null")
@Dict(dictTable = "onl_cgform_field", dicText = "db_is_null", dicCode = "db_is_null")
@ApiModelProperty(value = "是否允许为空 0否 1是")
//@Dict(dictTable = "onl_cgform_field", dicText = "db_is_null", dicCode = "db_is_null")
private Integer dbIsNull;
/**小数点*/
@Excel(name = "小数点", width = 15,dictTable = "onl_cgform_field", dicText = "db_point_length", dicCode = "db_point_length")
@Dict(dictTable = "onl_cgform_field", dicText = "db_point_length", dicCode = "db_point_length")
@ApiModelProperty(value = "小数点")
// @Dict(dictTable = "onl_cgform_field", dicText = "db_point_length", dicCode = "db_point_length")
private Integer dbPointLength;
/**数据库字段类型*/
@Excel(name = "数据库字段类型", width = 15,dictTable = "onl_cgform_field", dicText = "db_type", dicCode = "db_type")
@Dict(dictTable = "onl_cgform_field", dicText = "db_type", dicCode = "db_type")
@ApiModelProperty(value = "数据库字段类型")
//@Dict(dictTable = "onl_cgform_field", dicText = "db_type", dicCode = "db_type")
private String dbType;
public OnlCgformTag() {
@@ -22,7 +22,7 @@ public interface OnlCgformAreaMapper extends BaseMapper<OnlCgformArea> {
* @return
*/
@Select("select a.id,a.create_by,a.create_time,a.update_by,a.update_time,\n" +
"a.is_model,i.item_text as is_model_name,a.show_area,a.sort,a.en_name,i.en_name as model_en_name\n" +
"a.is_model,i.item_text as is_model_name,i.en_name as is_model_en_name,a.show_area,a.sort,a.en_name\n" +
"from onl_cgform_area as a left join sys_dict_item as i \n" +
"on a.is_model=i.item_value \n" +
"where i.dict_id=1493096744092102657 order by a.create_time desc")
@@ -145,14 +145,14 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
IPage page = new Page(pageNo, pageSize);
IPage<OnlCgformArea> result = onlCgformAreaMapper.queryPageList(page, params);
/*List<OnlCgformArea> records = result.getRecords();
List<OnlCgformArea> records = result.getRecords();
String cut = (String) params.get("cut");
//中英切换-所属模块
if(CutEnum.EN.getValue().equals(cut)){
for(OnlCgformArea data:records){
data.setIsModelName(data.getEnName());
data.setIsModelName(data.getIsModelEnName());
}
}*/
}
return result;
}
}
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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;
@@ -193,8 +194,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
IPage page = new Page(pageNo, pageSize);
IPage<OnlCgformTag> result = onlCgformTagMapper.queryPageList(page, params);
//params.get("dbFieldTxt").toString().contains("%");
/*List<OnlCgformTag> records = result.getRecords();
List<OnlCgformTag> records = result.getRecords();
String cut = (String) params.get("cut");
//中英切换-属性类型+展示区域列
if(CutEnum.EN.getValue().equals(cut)){
@@ -202,7 +202,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
data.setFieldShowTypeName(data.getFieldShowTypeEnName());
data.setShowAreaName(data.getShowAreaEnName());
}
}*/
}
return result;
}