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-03-06 22:20:37 +08:00
parent eb8febe825
commit 72b97a9126
17 changed files with 167 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
+2 -2
View File
@@ -85,14 +85,14 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
*
* @return
*/
@AutoLog(value = "区域管理表-表头中英文切换")
/*@AutoLog(value = "区域管理表-表头中英文切换")
@ApiOperation(value="区域管理表-表头中英文切换", notes="区域管理表-表头中英文切换")
@GetMapping(value = "/getHeader")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list =onlCgformAreaService.getHeader(flag, cut);
return Result.OK(list);
}
}*/
/**
* 列表查询
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+28 -6
View File
@@ -84,37 +84,59 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
List<OnlCgformTag> list = jsonArray.toJavaList(OnlCgformTag.class);
list.stream().forEach(f -> f.setFieldShowType(f.getFieldShowTypeEnName()));
list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName()));
/* String mid = String.valueOf(pageSize);
JSONArray json = JSONArray.parseArray(mid);
List<OnlCgformTag> aList = json.toJavaList(OnlCgformTag.class);*/
//IPage p= (IPage) list;//list.addAll(aList)
return Result.OK(list);
}
}
/*
* //中英切换-属性类型列+展示区域列
List<Map<String, Object>> pageList = onlCgformTagService.selectPageInfo(page, queryWrapper);
if (CutEnum.CN.getValue().equals(cut)) {
return Result.OK(pageList);
} else {
JSONArray jsonArray = new JSONArray();
jsonArray.addAll(pageList);
String reset=LineHumpUtil.humpToLine2(jsonArray.toString());
JSONArray jsonArray2= JSONArray.parseArray(reset);
List<OnlCgformTag> list = jsonArray2.toJavaList(OnlCgformTag.class);
list.stream().forEach(f -> f.setFieldShowType(f.getFieldShowTypeEnName()));
list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName()));
return Result.OK(list);
}*/
/**
* 表头中英文切换
*
* @return
*/
@AutoLog(value = "标签管理-表头中英文切换")
/*@AutoLog(value = "标签管理-表头中英文切换")
@ApiOperation(value="标签管理-表头中英文切换", notes="标签管理-表头中英文切换")
@GetMapping(value = "/getHeader")
public Result<List<Map<String,Object>>> getHeader(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String,Object>> list =onlCgformTagService.getHeader(flag,cut);
return Result.OK(list);
}
}*/
/**
* 查询条件中英文切换
*
* @return
*/
@AutoLog(value = "标签管理-查询条件中英文切换")
/*@AutoLog(value = "标签管理-查询条件中英文切换")
@ApiOperation(value="标签管理-查询条件中英文切换", notes="标签管理-查询条件中英文切换")
@GetMapping(value = "/queryCondition")
public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String,Object>> list = onlCgformTagService.queryCondition(flag,cut);
return Result.OK(list);
}
}*/
/**
* 列表查询
@@ -150,8 +172,8 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
onlCgformTag.setDbIsNull(1);
onlCgformTag.setDbPointLength(0);
String pinYin = HanYuPinYinUtil.changeToNumberPinYin(onlCgformTag.getDbFieldTxt());
pinYin.replace(" ","_");
onlCgformTag.setDbFieldName(pinYin);
onlCgformTag.setDbFieldName(pinYin.replace(" ","_"));
onlCgformTag.setDbFieldEnName(onlCgformTag.getDbFieldEnName().replace(" ","_"));
if(onlCgformTag.getFieldShowType()=="2"){
onlCgformTag.setDbType("int");
}else if(onlCgformTag.getFieldShowType()=="5" && onlCgformTag.getFieldShowType()=="6"){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java
+21 -4
View File
@@ -92,6 +92,12 @@ public class OnlCgformTag implements Serializable {
@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")
@@ -141,12 +147,20 @@ public class OnlCgformTag implements Serializable {
@ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）")
private java.lang.Integer isReadOnly;
/**展示区域*/
@Excel(name = "展示区域", width = 15, dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id")
@Dict(dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id")
@ApiModelProperty(value = "展示区域")
/**展示区域id*/
@TableField(exist = false)
@Excel(name = "展示区域id", width = 15, dictTable = "onl_cgform_area", dicText = "area_id", dicCode = "id")
@Dict(dictTable = "onl_cgform_area", dicText = "area_id", 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")
@@ -207,4 +221,7 @@ public class OnlCgformTag implements Serializable {
@Dict(dictTable = "onl_cgform_field", dicText = "db_type", dicCode = "db_type")
@ApiModelProperty(value = "数据库字段类型")
private String dbType;
public OnlCgformTag() {
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformAreaMapper.java
+2 -2
View File
@@ -17,8 +17,8 @@ import java.util.Map;
* @Version: V1.0
*/
public interface OnlCgformAreaMapper extends BaseMapper<OnlCgformArea> {
@Select("select a.id,a.create_by,a.create_time,a.update_by,\n" +
"a.update_time,a.en_name,i.en_name as model_en_name\n" +
@Select("select a.id,a.create_by,a.create_time,a.update_by,a.update_time,\n" +
"a.is_model,i.item_text,a.show_area,a.sort,a.en_name,i.en_name as model_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")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java
+5 -6
View File
@@ -16,18 +16,17 @@ import java.util.Map;
* @Version: V1.0
*/
public interface OnlCgformTagMapper extends BaseMapper<OnlCgformTag> {
@Select("select f.id,f.create_by,f.create_time,f.update_by,f.update_time,f.cgform_head_id,\n" +
"f.is_model,f.db_field_txt,f.db_field_en_name,f.field_show_type,f.dict_id,f.db_length,\n" +
"f.is_model,f.db_field_txt,f.db_field_en_name,\n" +
"f.field_show_type,i.item_text,f.dict_id,f.db_length,\n" +
"f.order_num,f.field_must_input,f.is_show_form,f.is_show_list,\n" +
"f.is_read_only,f.show_area,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" +
"f.is_read_only,f.show_area as area_id,a.show_area,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" +
"f.db_field_name,f.db_is_key,f.db_is_null,f.db_point_length,f.db_type,\n" +
"i.en_name as field_show_type_en_name,a.en_name as show_area_en_name\n" +
"from onl_cgform_field as f \n" +
"left join sys_dict_item as i on f.field_show_type=i.item_value\n" +
"left join onl_cgform_area as a on f.show_area=a.id\n" +
"where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" +
"and i.dict_id=1493098515761917954 order by f.create_time desc")
"where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\" \n" +
"and i.dict_id=1493098515761917954 order by f.create_time desc\n")
IPage<Map<String,Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java
+1 -3
View File
@@ -80,11 +80,9 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
/**
* 列表表头中英文切换
* @param flag
* @param cut
* @return
*/
public List<Map<String, Object>> getHeader(String flag, String cut);
//public List<Map<String, Object>> getHeader(String flag, String cut);
List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformArea> queryWrapper);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java
+3 -3
View File
@@ -79,14 +79,14 @@ public interface IOnlCgformTagService extends IService<OnlCgformTag> {
* @param cut
* @return
*/
List<Map<String,Object>> getHeader(String flag, String cut);
//List<Map<String,Object>> getHeader(String flag, String cut);
/**
* 查询条件中英文切换
* @param cut
* @param
* @return
*/
List<Map<String,Object>> queryCondition(String flag,String cut);
//List<Map<String,Object>> queryCondition(String flag,String cut);
List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java
+10 -9
View File
@@ -7,10 +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.enums.CutEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.tag.entity.OnlCgformArea;
import com.jero.modules.tag.mapper.OnlCgformAreaMapper;
import com.jero.modules.tag.service.IOnlCgformAreaService;
@@ -18,7 +15,9 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -33,7 +32,10 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
private OnlCgformFieldServiceImpl onlCgformFieldService;
@Autowired
private OnlCgformAreaServiceImpl onlCgformAreaMapper;
private OnlCgformAreaServiceImpl onlCgformAreaService;
@Autowired
private OnlCgformAreaMapper onlCgformAreaMapper;
/**
* 保存
*
@@ -144,7 +146,7 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
*
* @return
*/
@Override
/*@Override
public List<Map<String, Object>> getHeader(String flag, String cut) {
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
if (fieldList.size() != 0) {
@@ -169,13 +171,12 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
list.add(map);
}
return list;
}
}*/
@Override
public List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformArea> queryWrapper) {
IPage<Map<String, Object>> info= (IPage<Map<String, Object>>) onlCgformAreaMapper.selectPageInfo(page, queryWrapper);
IPage<Map<String, Object>> info=onlCgformAreaMapper.selectPageInfo(page, queryWrapper);
List<Map<String, Object>> list = info.getRecords().stream().collect(Collectors.toList());
System.out.println("这里这里"+list);
return list;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java
+8 -11
View File
@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.enums.CutEnum;
import com.jero.common.constant.enums.ModuleEnum;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.tag.entity.OnlCgformArea;
import com.jero.modules.tag.entity.OnlCgformTag;
@@ -17,7 +15,9 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -134,7 +134,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
public Integer queryExitArea(OnlCgformArea onlCgformArea) {
LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) {
queryWrapper.eq(OnlCgformTag::getShowArea,onlCgformArea.getShowArea());
queryWrapper.eq(OnlCgformTag::getShowArea,onlCgformArea.getId());
}
Integer count = onlCgformTagMapper.selectCount(queryWrapper);
return count;
@@ -144,7 +144,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
*
* @return
*/
@Override
/*@Override
public List<Map<String,Object>> getHeader(String flag, String cut) {
List<Map<String,Object>> list = new ArrayList<>();
Map<String,Object> map1 = new HashMap<>();
@@ -211,13 +211,13 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
}
return list;
}
*/
/**
* 查询条件中英文切换
*
* @return
*/
@Override
/*@Override
public List<Map<String,Object>> queryCondition(String flag, String cut) {
List<Map<String,Object>> list = new ArrayList<>();
Map<String,Object> map1 = new HashMap<>();
@@ -239,15 +239,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
list.add(map1);
}
return list;
}
}*/
@Override
public List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper) {
IPage<Map<String, Object>> info= onlCgformTagMapper.selectPageInfo(page, queryWrapper);
List<Map<String, Object>> list = info.getRecords().stream().collect(Collectors.toList());
System.out.println("这里这里"+list);
return list;
}
}