标签-修改

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -608,8 +608,8 @@ public class SysDictController {
 	 *
 	 */
 	@GetMapping(value = "/queryDictName")
-	public Result<List<SysDict>> queryDictName(SysDict sysDict) {
+	public Result<List<SysDict>> queryDictName(@RequestParam(name = "cut") String cut,SysDict sysDict) {
-		List<SysDict> list =sysDictService.queryDictName(sysDict);
+		List<SysDict> list =sysDictService.queryDictName(cut,sysDict);
 		return Result.OK(list);
 	}
 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java

@@ -44,7 +44,7 @@ public interface ISysDictService extends IService<SysDict> {
      *
      * @return
      */
-    List<SysDict> queryDictName(SysDict sysDict);
+    List<SysDict> queryDictName(String cut,SysDict sysDict);
 
     /**
      * 根据字典类型删除关联表中其对应的数据

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java

@@ -196,9 +196,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
      * @return
      */
     @Override
-    public List<SysDict> queryDictName(SysDict sysDict) {
+    public List<SysDict> queryDictName(String cut,SysDict sysDict) {
         QueryWrapper<SysDict> QueryWrapper = new QueryWrapper<>();
-        QueryWrapper.select("id", "dict_name","attribute_type").eq("is_tag_dict",1);
+		if (CutEnum.CN.getValue().equals(cut)) {
+			QueryWrapper.select("id", "dict_name", "attribute_type").eq("is_tag_dict", 1);
+		}else{
+			QueryWrapper.select("id", "dict_en_name", "attribute_type").eq("is_tag_dict", 1);
+		}
         return list(QueryWrapper);
     }
 

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

@@ -10,6 +10,7 @@ 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 com.jero.modules.tag.service.IOnlCgformTagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +42,8 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	private IOnlCgformAreaService onlCgformAreaService;
 	@Autowired
 	private ISysDictItemService sysDictItemService;
+	@Autowired
+	private IOnlCgformTagService onlCgformTagService;
 	/**
 	 * 分页列表查询
 	 *
@@ -101,8 +104,8 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	@AutoLog(value = "区域管理表-查询展示区域")
 	@ApiOperation(value="区域管理表-查询展示区域", notes="区域管理表-查询展示区域")
 	@GetMapping(value = "/queryShowArea")
-	public Result<List<OnlCgformArea>> queryShowArea(OnlCgformArea onlCgformArea){
+	public Result<List<OnlCgformArea>> queryShowArea(@RequestParam(name = "cut") String cut,OnlCgformArea onlCgformArea){
-		List<OnlCgformArea> list = onlCgformAreaService.queryShowArea(onlCgformArea);
+		List<OnlCgformArea> list = onlCgformAreaService.queryShowArea(cut,onlCgformArea);
 		return Result.OK(list);
 	}
 	/**
@@ -143,10 +146,17 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	@ApiOperation(value="区域管理表-通过id删除", notes="区域管理表-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		onlCgformAreaService.deleteById(id);
+		OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id);
+		int count=onlCgformTagService.queryExitArea(onlCgformArea);
+		if (count > 0) {
+			return Result.error("该“展示区域”有关联数据，无法删除！");
+		}else {
+			onlCgformAreaService.deleteById(id);
+		}
 		return Result.OK("删除成功!");
 	}
 
+
 	/**
 	 *  批量删除
 	 *

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

@@ -8,9 +8,9 @@ import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.modules.enums.FixedFieldEnum;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.entity.OnlCgformTag;
-import com.jero.modules.enums.FixedFieldEnum;
 import com.jero.modules.tag.service.IOnlCgformTagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,6 +45,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 
 	@Autowired
 	private OnlCgformTagController onlCgformAreaService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -79,8 +80,9 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	@AutoLog(value = "标签管理-表头中英文切换")
 	@ApiOperation(value="标签管理-表头中英文切换", notes="标签管理-表头中英文切换")
 	@GetMapping(value = "/getHeader")
-	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "cut") String cut) {
+	public Result<List<Map<String,String>>> getHeader(@RequestParam(name = "flag") String flag,
-		List<Map<String, Object>> list =onlCgformTagService.getHeader(cut);
+													   @RequestParam(name = "cut") String cut) {
+		List<Map<String,String>> list =onlCgformTagService.getHeader(flag,cut);
 		return Result.OK(list);
 	}
 
@@ -92,8 +94,9 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	@AutoLog(value = "标签管理-查询条件中英文切换")
 	@ApiOperation(value="标签管理-查询条件中英文切换", notes="标签管理-查询条件中英文切换")
 	@GetMapping(value = "/queryCondition")
-	public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "cut") String cut) {
+	public Result<List<Map<String, String>>> queryCondition(@RequestParam(name = "flag") String flag,
-		List<Map<String, Object>> list = onlCgformTagService.queryCondition(cut);
+															@RequestParam(name = "cut") String cut) {
+		List<Map<String,String>> list = onlCgformTagService.queryCondition(flag,cut);
 		return Result.OK(list);
 	}
 
@@ -127,6 +130,13 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			onlCgformTag.setCreateTime(new Date());
 			onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
 			onlCgformTag.setCgformHeadId("48308196e7b04761b533dc31bc899707");//设置文档库-表id
+			if(onlCgformTag.getFieldShowType()=="2"){
+				onlCgformTag.setDbType("int");
+			}else if(onlCgformTag.getFieldShowType()=="5" && onlCgformTag.getFieldShowType()=="6"){
+				onlCgformTag.setDbType("Date");
+			}else{
+				onlCgformTag.setDbType("String");
+			}
 			onlCgformTagService.add(onlCgformTag);
 		}
 		return Result.OK("添加成功！");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java

@@ -165,4 +165,34 @@ public class OnlCgformTag implements Serializable {
     @Dict(dictTable = "onl_cgform_field", dicText = "is_delete", dicCode = "is_delete")
     @ApiModelProperty(value = "逻辑删除标识 0未删 1已删")
     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 = "字段名字")
+    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是")
+    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是")
+    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 = "小数点")
+    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 = "数据库字段类型")
+    private String dbType;
 }

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

@@ -66,9 +66,7 @@ public interface IOnlCgformAreaService extends IService<OnlCgformArea> {
 	 *
 	 * @return
 	 */
-	List<OnlCgformArea> queryShowArea(OnlCgformArea onlCgformArea);
+	List<OnlCgformArea> queryShowArea(String cut,OnlCgformArea onlCgformArea);
-
-    List<OnlCgformArea> queryShowAreaEnName(OnlCgformArea onlCgformArea);
 
     /**
 	 * 展示区域查询

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

@@ -70,19 +70,19 @@ public interface IOnlCgformTagService extends IService<OnlCgformTag> {
 	 */
 	Integer queryExitData(OnlCgformTag onlCgformTag) ;
 
+	Integer queryExitArea(OnlCgformArea onlCgformArea);
+
 	/**
 	 * 列表表头中英文切换
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> getHeader(String cut);
+	List<Map<String,String>> getHeader(String flag,String cut);
 
 	/**
 	 * 查询条件中英文切换
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> queryCondition(String cut);
+	List<Map<String,String>> queryCondition(String flag,String cut);
-
-
 }

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

@@ -109,21 +109,18 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 	 * @return
 	 */
 	@Override
-	public List<OnlCgformArea> queryShowArea(OnlCgformArea onlCgformArea) {
+	public List<OnlCgformArea> queryShowArea(String cut,OnlCgformArea onlCgformArea) {
 		QueryWrapper<OnlCgformArea> QueryWrapper = new QueryWrapper<>();
 		if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){
-		QueryWrapper.select("id","show_area").orderByAsc("sort");
+			if (CutEnum.CN.getValue().equals(cut)) {
-		}
+				QueryWrapper.select("id","show_area").orderByAsc("sort");
-		return list(QueryWrapper);
+			}else{
-	}
+				QueryWrapper.select("id","en_name").orderByAsc("sort");
-	@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);
 	}
+
 	/**
 	 * 展示区域查询
 	 *
@@ -165,5 +162,4 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl<OnlCgformAreaMapper, O
 		}
 		return list;
 	}
-
 }

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

@@ -4,6 +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.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;
@@ -28,7 +29,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	@Autowired
 	private OnlCgformFieldServiceImpl onlCgformFieldService;
 	private OnlCgformArea onlCgformArea;
-
+	@Autowired
+	OnlCgformAreaServiceImpl onlCgformAreaService;
 	/**
 	 * 保存
 	 *
@@ -119,22 +121,38 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
 		return count;
 	}
-
+	/**
+	 * 若区域下有标签字段 则无法删除
+	 *
+	 * @return
+	 */
+	@Override
+	public Integer queryExitArea(OnlCgformArea onlCgformArea) {
+		LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
+		if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) {
+			queryWrapper.eq(OnlCgformTag::getShowArea,onlCgformArea.getShowArea());
+		}
+		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
+		return count;
+	}
 	/**
 	 * 列表表头中英文切换
 	 *
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getHeader(String cut) {
+	public List<Map<String, String>> getHeader(String flag,String cut) {
-		List<Map<String, Object>> list = new ArrayList<>();
+		List<Map<String, String>> list = new ArrayList<>();
-		Map<String, Object> map1 = new HashMap<>();
+		Map<String, String> map1 = new HashMap<>();
-		Map<String, Object> map2 = new HashMap<>();
+		Map<String, String> map2 = new HashMap<>();
-		Map<String, Object> map3 = new HashMap<>();
+		Map<String, String> map3 = new HashMap<>();
-		Map<String, Object> map4 = new HashMap<>();
+		Map<String, String> map4 = new HashMap<>();
-		Map<String, Object> map5 = new HashMap<>();
+		Map<String, String> map5 = new HashMap<>();
-		Map<String, Object> map6 = new HashMap<>();
+		Map<String, String> map6 = new HashMap<>();
+		if (ModuleEnum.ONL_CGFORM_TAG.getValue().equals(flag)) {
+			System.out.println("走的flag=3");
 			if (CutEnum.CN.getValue().equals(cut)) {
+				System.out.println("走的cut=cn");
 				//中文名称
 				map1.put("db_field_name", "db_field_txt");//字段
 				map1.put("db_field_txt", "中文名称");//字段中文名
@@ -160,6 +178,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 				map6.put("db_field_txt", "展示区域");//字段中文名
 				list.add(map6);
 			} else {
+				System.out.println("走的cut=en");
 				//中文名称
 				map1.put("db_field_name", "db_field_txt");//字段
 				map1.put("db_field_txt", "chinese name");//字段英文名
@@ -185,33 +204,33 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 				map6.put("db_field_txt", "display area");//字段英文名
 				list.add(map6);
 			}
-			return list;
+		}
+		return list;
 	}
 
 	/**
 	 * 查询条件中英文切换
 	 *
 	 * @return
-	 */@Autowired
+	 */
-	OnlCgformAreaServiceImpl onlCgformAreaService;
 	@Override
-	public List<Map<String, Object>> queryCondition(String cut) {
+	public List<Map<String,String>> queryCondition(String flag, String cut) {
-		List<Map<String, Object>> list = new ArrayList<>();
+		List<Map<String,String>> list = new ArrayList<>();
-		Map<String, Object> map1 = new HashMap<>();
+		Map<String, String> map1 = new HashMap<>();
-		Map<String, Object> map2 = new HashMap<>();
+		Map<String, String> map2 = new HashMap<>();
 		if (CutEnum.CN.getValue().equals(cut)) {
-			map2= (Map<String, Object>) onlCgformAreaService.queryShowArea(onlCgformArea);
+			map2= (Map<String, String>) onlCgformAreaService.queryShowArea(cut,onlCgformArea);
 			map1.put("db_field_name", "show_area");//字段
 			map1.put("db_field_txt", "展示区域");//字段中文名
-			map1.put("value", map2);
+			map1.put("value", String.valueOf(map2));
 			map1.put("field_show_type", "1");
 			list.add(map1);
 
 		} else {
-			map2= (Map<String, Object>) onlCgformAreaService.queryShowAreaEnName(onlCgformArea);
+			map2= (Map<String, String>) onlCgformAreaService.queryShowArea(cut,onlCgformArea);
 			map1.put("db_field_name", "show_area");//字段
 			map1.put("db_field_txt", "display area");//字段英文名
-			map1.put("value", map2);
+			map1.put("value", String.valueOf(map2));
 			map1.put("field_show_type", "1");
 			list.add(map1);
 		}