标签管理-标签项

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

@@ -85,7 +85,6 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	@PostMapping(value = "/add")
 	public Result<?> add(@Validated @RequestBody OnlCgformTag onlCgformTag) {
 		onlCgformTagService.queryExitData(onlCgformTag);
-		QueryWrapper<OnlCgformTag> queryWrapper = new QueryWrapper<>();
 		onlCgformTagService.add(onlCgformTag);
 		return Result.OK("添加成功！");
 	}

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

@@ -60,10 +60,9 @@ public class OnlCgformTag implements Serializable {
     private java.lang.String sysOrgCode;
 
     /**所属模块(1文档库,0文档拆分)*/
-    @Excel(name = "所属模块(1文档库,0文档拆分)", width = 15, dictTable = "onl_cgform_area", dicText = "is_model", dicCode = "is_model")
+    @Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dicCode = "module")
-    //@Dict(dictTable = "onl_cgform_area", dicText = "is_model", dicCode = "is_model")
     @Dict(dicCode = "module")
-    @ApiModelProperty(value = "所属模块(1文档库,0文档拆分)")
+    @ApiModelProperty(value = "所属模块(1文档库,0文档拆分")
     private java.lang.String isModel;
 
     /**字段备注*/
@@ -77,8 +76,8 @@ public class OnlCgformTag implements Serializable {
     private java.lang.String dbFieldName;
 
     /**表单控件类型*/
-    @Excel(name = "表单控件类型", width = 15, dictTable = "onl_cgform_field", dicText = "field_show_type", dicCode = "field_show_type")
+    @Excel(name = "表单控件类型", width = 15, dicCode = "field_show_type")
-    @Dict(dictTable = "onl_cgform_field", dicText = "field_show_type", dicCode = "field_show_type")
+    @Dict(dicCode = "field_show_type")
     @ApiModelProperty(value = "表单控件类型")
     private java.lang.String fieldShowType;
 

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

@@ -1,10 +1,12 @@
 package com.jero.modules.tag.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.Result;
 import com.jero.modules.tag.entity.OnlCgformTag;
 import com.jero.modules.tag.mapper.OnlCgformTagMapper;
 import com.jero.modules.tag.service.IOnlCgformTagService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -83,16 +85,6 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 		return getById(id);
 	}
 
-	/**
-	 *根据id查展示区域
-	 */
-	@Override
-	public List<OnlCgformTag> queryShowAreaById(String id) {
-		QueryWrapper<OnlCgformTag> queryWrapper=new QueryWrapper<>();
-		queryWrapper.select("show_area").eq("id",id);
-		return list(queryWrapper);
-	}
-
 	/**
 	 * 列表查询
 	 *
@@ -105,14 +97,21 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 
 	/**
 	 * 同一“所属模块”下的“属性名称”不能重复
-	 *
+	 *select count()from onl_cgform_tag
 	 * @return
 	 */
 	@Override
-	public void queryExitData(OnlCgformTag onlCgformTag) {
+	public Result<?> queryExitData(OnlCgformTag onlCgformTag) {
-		QueryWrapper<OnlCgformTag> queryWrapper = new QueryWrapper<>();
+		LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.like("isModel",onlCgformTag.getIsModel()).and(wq->wq.like("db_field_txt",onlCgformTag.getDbFieldTxt()));
+		if (StringUtils.isNotBlank(onlCgformTag.getIsModel())) {// && StringUtils.isNotBlank(onlCgformTag.getDbFieldName())) {
-		Integer count = Math.toIntExact(onlCgformTagMapper.selectCount(queryWrapper));
+			queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel()).and(wq -> wq.eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt()));
-	}
+		}
+		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
+			if (count > 0) {
+				return Result.error("该数据已存在");
+			} else {
+				return Result.OK();
+			}
+		}
 
 }