标签项-中英切换

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java

@@ -7,11 +7,13 @@ 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.system.service.ISysDictItemService;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.service.IOnlCgformAreaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -37,8 +39,8 @@ import java.util.Map;
 public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlCgformAreaService> {
 	@Autowired
 	private IOnlCgformAreaService onlCgformAreaService;
-	//TODO 这里不允许定义变量
+	@Autowired
-
+	private ISysDictItemService sysDictItemService;
 	/**
 	 * 分页列表查询
 	 *
@@ -57,6 +59,9 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 								   HttpServletRequest req) {
 		QueryWrapper<OnlCgformArea> queryWrapper = QueryGenerator.initQueryWrapper(onlCgformArea, req.getParameterMap());
 		Page<OnlCgformArea> page = new Page<OnlCgformArea>(pageNo, pageSize);
+		if(StringUtils.isNotBlank("create_time")) {
+			queryWrapper.orderByDesc("create_time");
+		}
 		IPage<OnlCgformArea> pageList = onlCgformAreaService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
@@ -66,8 +71,8 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	 *
 	 * @return
 	 */
-	@AutoLog(value = "标签管理-表头中英文切换")
+	@AutoLog(value = "区域管理表-表头中英文切换")
-	@ApiOperation(value="标签管理-表头中英文切换", notes="标签管理-表头中英文切换")
+	@ApiOperation(value="区域管理表-表头中英文切换", notes="区域管理表-表头中英文切换")
 	@GetMapping(value = "/getHeader")
 	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
 													   @RequestParam(name = "cut") String cut) {
@@ -75,20 +80,6 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 		return Result.OK(list);
 	}
 
-	/**
-	 * 查询条件中英文切换
-	 *
-	 * @return
-	 */
-	@AutoLog(value = "OCR识别转换记录表-查询条件中英文切换")
-	@ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换")
-	@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 = onlCgformAreaService.queryCondition(flag, cut);
-		return Result.OK(list);
-	}
-
 	/**
 	 * 列表查询
 	 *
@@ -107,8 +98,8 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	 *
 	 * @return
 	 */
-	@AutoLog(value = "查询展示区域")
+	@AutoLog(value = "区域管理表-查询展示区域")
-	@ApiOperation(value="查询展示区域", notes="查询展示区域")
+	@ApiOperation(value="区域管理表-查询展示区域", notes="区域管理表-查询展示区域")
 	@GetMapping(value = "/queryShowArea")
 	public Result<List<OnlCgformArea>> queryShowArea(OnlCgformArea onlCgformArea){
 		List<OnlCgformArea> list = onlCgformAreaService.queryShowArea(onlCgformArea);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java

@@ -78,9 +78,8 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	@AutoLog(value = "标签管理-表头中英文切换")
 	@ApiOperation(value="标签管理-表头中英文切换", notes="标签管理-表头中英文切换")
 	@GetMapping(value = "/getHeader")
-	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
+	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "cut") String cut) {
-													   @RequestParam(name = "cut") String cut) {
+		List<Map<String, Object>> list =onlCgformTagService.getHeader(cut);
-		List<Map<String, Object>> list =onlCgformTagService.getHeader(flag, cut);
 		return Result.OK(list);
 	}
 
@@ -90,11 +89,10 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	 * @return
 	 */
 	@AutoLog(value = "标签管理-查询条件中英文切换")
-	@ApiOperation(value="标签管理-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换")
+	@ApiOperation(value="标签管理-查询条件中英文切换", notes="标签管理-查询条件中英文切换")
 	@GetMapping(value = "/queryCondition")
-	public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "flag") String flag,
+	public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "cut") String cut) {
-															@RequestParam(name = "cut") String cut) {
+		List<Map<String, Object>> list = onlCgformTagService.queryCondition(cut);
-		List<Map<String, Object>> list = onlCgformTagService.queryCondition(flag, cut);
 		return Result.OK(list);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java

@@ -68,7 +68,9 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
 	 */
 	List<OnlCgformArea> queryShowArea(OnlCgformArea onlCgformArea);
 
-	/**
+    List<OnlCgformArea> queryShowAreaEnName(OnlCgformArea onlCgformArea);
+
+    /**
 	 * 展示区域查询
 	 *
 	 * @param id
@@ -84,11 +86,4 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
 	 */
 	public List<Map<String, Object>> getHeader(String flag, String cut);
 
-	/**
-	 * 查询条件中英文切换
-	 * @param flag
-	 * @param cut
-	 * @return
-	 */
-	public List<Map<String, Object>> queryCondition(String flag, String cut);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java

@@ -72,25 +72,17 @@ public interface IOnlCgformTagService extends IService<OnlCgformTag> {
 
 	/**
 	 * 列表表头中英文切换
-	 * @param flag
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> getHeader(String flag, String cut);
+	List<Map<String, Object>> getHeader(String cut);
 
 	/**
 	 * 查询条件中英文切换
-	 * @param flag
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> queryCondition(String flag, String cut);
+	List<Map<String, Object>> queryCondition(String cut);
+
 
-	/**
-	 * 表单中英文切换
-	 * @param flag
-	 * @param cut
-	 * @return
-	 */
-	List<Map<String, Object>> getForm(String flag, String cut);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java

@@ -116,7 +116,14 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 		}
 		return list(QueryWrapper);
 	}
-
+	@Override
+	public List<OnlCgformArea> queryShowAreaEnName(OnlCgformArea onlCgformArea) {
+		QueryWrapper<OnlCgformArea> QueryWrapper = new QueryWrapper<>();
+		if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){
+			QueryWrapper.select("id","en_name").orderByAsc("sort");
+		}
+		return list(QueryWrapper);
+	}
 	/**
 	 * 展示区域查询
 	 *
@@ -136,20 +143,18 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 	public List<Map<String, Object>> getHeader(String flag, String cut) {
 		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
 		if (fieldList.size() != 0) {
-			//过滤列表字段(is_show_list-->列表是否显示0否 1是)
+			fieldList = fieldList.stream().filter(
-			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
+					e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))
+							&& (
+							e.getDbFieldEnName().equals("display area")||e.getDbFieldEnName().equals("belonging module")
+									||e.getDbFieldEnName().equals("sort number")||e.getDbFieldEnName().equals("state")
+					)
+			).collect(Collectors.toList());
 		}
 		List<Map<String, Object>> list = new ArrayList<>();
 		for (OnlCgformField onlCgformField : fieldList) {
 			Map<String, Object> map = new HashMap<>();
-			if ("file_name".equals(onlCgformField.getDbFieldName())) {
+
-				//跳转详情的标识
-				map.put("click", "true");
-			}
-			//单独处理发布日期和标准实施日期
-			if ("update_time".equals(onlCgformField.getDbFieldName())) {
-				map.put("sort", "true");//列表排序标识
-			}
 			map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段
 			if (CutEnum.CN.getValue().equals(cut)) {
 				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -161,31 +166,4 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 		return list;
 	}
 
-	/**
-	 * 查询条件中英文切换
-	 *
-	 * @return
-	 */
-	@Override
-	public List<Map<String, Object>> queryCondition(String flag, String cut) {
-		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
-		if (fieldList.size() != 0) {
-			//过滤出搜索条件()
-			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList());
-		}
-		List<Map<String, Object>> list = new ArrayList<>();
-		for (OnlCgformField onlCgformField : fieldList) {
-			Map<String, Object> map = new HashMap<>();
-			map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等)
-			map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码
-			map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段
-			if (CutEnum.CN.getValue().equals(cut)) {
-				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
-			} else {
-				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
-			}
-			list.add(map);
-		}
-		return list;
-	}
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.entity.OnlCgformTag;
 import com.jero.modules.tag.mapper.OnlCgformTagMapper;
@@ -17,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 标签管理
@@ -31,6 +27,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	private OnlCgformTagMapper onlCgformTagMapper;
 	@Autowired
 	private OnlCgformFieldServiceImpl onlCgformFieldService;
+	private OnlCgformArea onlCgformArea;
+
 	/**
 	 * 保存
 	 *
@@ -114,8 +112,9 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	@Override
 	public Integer queryExitData(OnlCgformTag onlCgformTag) {
 		LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
-		if (StringUtils.isNotBlank(onlCgformTag.getIsModel())) {// && StringUtils.isNotBlank(onlCgformTag.getDbFieldName())) {
+		if (StringUtils.isNotBlank(onlCgformTag.getIsModel())) {
-			queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel()).and(wq -> wq.eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt()));
+			queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel()).eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt())
+					.eq(OnlCgformTag::getDbFieldEnName, onlCgformTag.getDbFieldEnName());
 		}
 		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
 		return count;
@@ -127,95 +126,94 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getHeader(String flag, String cut) {
+	public List<Map<String, Object>> getHeader(String cut) {
-		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
-		if (fieldList.size() != 0) {
-			//过滤列表字段(is_show_list-->列表是否显示0否 1是)
-			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
-		}
 		List<Map<String, Object>> list = new ArrayList<>();
-		for (OnlCgformField onlCgformField : fieldList) {
+		Map<String, Object> map1 = new HashMap<>();
-			Map<String, Object> map = new HashMap<>();
+		Map<String, Object> map2 = new HashMap<>();
-			if("file_name".equals(onlCgformField.getDbFieldName())){
+		Map<String, Object> map3 = new HashMap<>();
-				//跳转详情的标识
+		Map<String, Object> map4 = new HashMap<>();
-				map.put("click","true");
+		Map<String, Object> map5 = new HashMap<>();
+		Map<String, Object> map6 = new HashMap<>();
+			if (CutEnum.CN.getValue().equals(cut)) {
+				//中文名称
+				map1.put("db_field_name", "db_field_txt");//字段
+				map1.put("db_field_txt", "中文名称");//字段中文名
+				list.add(map1);
+				//英文名称
+				map2.put("db_field_name", "db_field_en_name");//字段
+				map2.put("db_field_txt", "英文名称");//字段中文名
+				list.add(map2);
+				//属性类型
+				map3.put("db_field_name", "field_show_type");//字段
+				map3.put("db_field_txt", "属性类型");//字段中文名
+				list.add(map3);
+				//字段长度
+				map4.put("db_field_name", "db_length");//字段
+				map4.put("db_field_txt", "字段长度");//字段中文名
+				list.add(map4);
+				//展示顺序
+				map5.put("db_field_name", "order_num");//字段
+				map5.put("db_field_txt", "展示顺序");//字段中文名
+				list.add(map5);
+				//展示区域
+				map6.put("db_field_name", "show_area");//字段
+				map6.put("db_field_txt", "展示区域");//字段中文名
+				list.add(map6);
+			} else {
+				//中文名称
+				map1.put("db_field_name", "db_field_txt");//字段
+				map1.put("db_field_txt", "chinese name");//字段英文名
+				list.add(map1);
+				//英文名称
+				map2.put("db_field_name", "db_field_en_name");//字段
+				map2.put("db_field_txt", "english name");//字段英文名
+				list.add(map2);
+				//属性类型
+				map3.put("db_field_name", "field_show_type");//字段
+				map3.put("db_field_txt", "attribute type");//字段英文名
+				list.add(map3);
+				//字段长度
+				map4.put("db_field_name", "db_length");//字段
+				map4.put("db_field_txt", "field length");//字段英文名
+				list.add(map4);
+				//展示顺序
+				map5.put("db_field_name", "order_num");//字段
+				map5.put("db_field_txt", "display order");//字段英文名
+				list.add(map5);
+				//展示区域
+				map6.put("db_field_name", "show_area");//字段
+				map6.put("db_field_txt", "display area");//字段英文名
+				list.add(map6);
 			}
-			//单独处理发布日期和标准实施日期
+			return list;
-			if ("update_time".equals(onlCgformField.getDbFieldName())) {
-				map.put("sort", "true");//列表排序标识
-			}
-
-			String dbFieldName = onlCgformField.getDbFieldName();
-			if (org.apache.commons.lang.StringUtils.isNotBlank(onlCgformField.getDictField())) {
-				map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)+ "_dictText");//配置了数据字典的字段，需要特殊处理
-			}else{
-				map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));//字段
-			}
-
-			if(CutEnum.CN.getValue().equals(cut)){
-				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
-			}else{
-				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
-			}
-			list.add(map);
-		}
-		return list;
 	}
 
 	/**
 	 * 查询条件中英文切换
 	 *
 	 * @return
-	 */
+	 */@Autowired
+	OnlCgformAreaServiceImpl onlCgformAreaService;
 	@Override
-	public List<Map<String, Object>> queryCondition(String flag, String cut) {
+	public List<Map<String, Object>> queryCondition(String cut) {
-		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
-		if (fieldList.size() != 0) {
-			//过滤出搜索条件()
-			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList());
-		}
 		List<Map<String, Object>> list = new ArrayList<>();
-		for (OnlCgformField onlCgformField : fieldList) {
+		Map<String, Object> map1 = new HashMap<>();
-			Map<String, Object> map = new HashMap<>();
+		Map<String, Object> map2 = new HashMap<>();
-			map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等)
+		if (CutEnum.CN.getValue().equals(cut)) {
-			map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码
+			map2= (Map<String, Object>) onlCgformAreaService.queryShowArea(onlCgformArea);
-			map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段
+			map1.put("db_field_name", "show_area");//字段
-			if (CutEnum.CN.getValue().equals(cut)) {
+			map1.put("db_field_txt", "展示区域");//字段中文名
-				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
+			map1.put("value", map2);
-			} else {
+			map1.put("field_show_type", "1");
-				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
+			list.add(map1);
-			}
-			list.add(map);
-		}
-		return list;
-	}
 
-	/**
+		} else {
-	 * 表单中英文切换
+			map2= (Map<String, Object>) onlCgformAreaService.queryShowAreaEnName(onlCgformArea);
-	 *
+			map1.put("db_field_name", "show_area");//字段
-	 * @return
+			map1.put("db_field_txt", "display area");//字段英文名
-	 */
+			map1.put("value", map2);
-	@Override
+			map1.put("field_show_type", "1");
-	public List<Map<String, Object>> getForm(String flag, String cut) {
+			list.add(map1);
-		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
-		if (fieldList.size() != 0) {
-			//过滤出搜索条件()
-			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList());
-		}
-		List<Map<String, Object>> list = new ArrayList<>();
-		for (OnlCgformField onlCgformField : fieldList) {
-			Map<String, Object> map = new HashMap<>();
-			map.put("area", null);//展示区域。没用到
-			map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等)
-			map.put("field_must_input", onlCgformField.getFieldMustInput());//是否必填
-			map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码
-			map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段
-			if (CutEnum.CN.getValue().equals(cut)) {
-				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
-			} else {
-				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
-			}
-			list.add(map);
 		}
 		return list;
 	}