From cac1d0b73b5cefa7c5f97c68ffe6db03176478b2 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Sat, 12 Feb 2022 17:10:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86-=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B9=E4=BF=AE=E6=94=B9&=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOController.java | 8 +-- .../entity/BussDocumentLibraryEO.java | 13 ++-- .../IBussDocumentLibraryEOService.java | 4 +- .../BussDocumentLibraryEOServiceImpl.java | 7 +- .../controller/OnlCgformTagController.java | 3 +- .../modules/tag/entity/OnlCgformArea.java | 5 ++ .../jero/modules/tag/entity/OnlCgformTag.java | 48 ++++++++----- .../tag/mapper/OnlCgformTagMapper.java | 5 +- .../tag/service/IOnlCgformAreaService.java | 3 +- .../tag/service/IOnlCgformTagService.java | 11 ++- .../service/impl/OnlCgformTagServiceImpl.java | 69 ++++++++++++------- .../src/main/resources/application.yml | 5 +- 12 files changed, 110 insertions(+), 71 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index c88b3b592..6f1f1a169 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -13,13 +13,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 90da831b8..03c5f75d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -1,21 +1,18 @@ package com.jero.modules.document.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -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 com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index d584c553e..492c953f4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -1,8 +1,8 @@ package com.jero.modules.document.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.document.entity.BussDocumentLibraryEO; + import java.util.List; import java.util.Map; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 5534f1963..c8808e1fd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -22,12 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index 75b0a792c..c900e4824 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -36,7 +36,7 @@ import java.util.List; public class OnlCgformTagController extends JeroController { @Autowired private IOnlCgformTagService onlCgformTagService; - + /** * 分页列表查询 * @@ -82,6 +82,7 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { + onlCgformTagService.queryExitData(onlCgformTag); onlCgformTagService.add(onlCgformTag); return Result.OK("添加成功！"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java index 6c010719a..2e3b7219f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java @@ -60,21 +60,26 @@ public class OnlCgformArea implements Serializable { /**展示区域(1基本信息,2文本信息,3关联关系)*/ @Excel(name = "展示区域(1基本信息,2文本信息,3关联关系)", width = 15) + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "展示区域(1基本信息,2文本信息,3关联关系)") private java.lang.String showArea; /**英文名称*/ @Excel(name = "英文名称", width = 15) + @javax.validation.constraints.Pattern(regexp = "^[A-Za-z]*(\\s[A-Za-z]*)*$",message = "请输入正确的英文名称") @ApiModelProperty(value = "英文名称") private java.lang.String enName; /**所属模块(1文档库,0文档拆分)*/ @Excel(name = "所属模块(1文档库,0文档拆分)", width = 15) + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "所属模块(1文档库,0文档拆分)") private java.lang.String isModel; /**排序号*/ @Excel(name = "排序号", width = 15) + @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "排序号") private java.lang.Integer sort; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java index c712bef56..35eeff0cb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java @@ -62,11 +62,13 @@ public class OnlCgformTag implements Serializable { /**所属模块(1文档库,0文档拆分*/ @Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dictTable = "onl_cgform_area", dicText = "所属模块", dicCode = "is_model") @Dict(dictTable = "onl_cgform_area", dicText = "所属模块", dicCode = "is_model") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "所属模块(1文档库,0文档拆分") private String isModel; /**字段备注*/ @Excel(name = "字段备注", width = 15) + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "字段备注") private String dbFieldTxt; @@ -78,70 +80,82 @@ public class OnlCgformTag implements Serializable { /**表单控件类型*/ @Excel(name = "表单控件类型", width = 15, dictTable = "onl_cgform_field", dicText = "属性类型", dicCode = "field_show_type") @Dict(dictTable = "onl_cgform_field", dicText = "属性类型", dicCode = "field_show_type") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "表单控件类型") private String fieldShowType; /**字典名称*/ @Excel(name = "字典名称", width = 15, dictTable = "sys_dict", dicText = "选项内容", dicCode = "dict_name") @Dict(dictTable = "sys_dict", dicText = "选项内容", dicCode = "dict_name") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "字典名称") private String dictName; /**数据库字段长度*/ @Excel(name = "数据库字段长度", width = 15) + @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "数据库字段长度") private Integer dbLength; /**排序*/ @Excel(name = "排序", width = 15) + @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "排序") private Integer orderNum; /**字段是否必填0否 1是*/ - @Excel(name = "字段是否必填0否 1是", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") + @Excel(name = "字段是否必填0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "是否必填", dicCode = "field_must_input") + @Dict(dictTable = "onl_cgform_field", dicText = "是否必填", dicCode = "field_must_input") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "字段是否必填0否 1是") private String fieldMustInput; /**表单是否显示0否 1是*/ - @Excel(name = "表单是否显示0否 1是", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") + @Excel(name = "表单是否显示0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "文档库列表展示", dicCode = "is_show_form") + @Dict(dictTable = "onl_cgform_field", dicText = "文档库列表展示", dicCode = "is_show_form") + @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数") @ApiModelProperty(value = "表单是否显示0否 1是") private Integer isShowForm; - /**列表是否显示0否 1是*/ - @Excel(name = "列表是否显示0否 1是", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") +/* *//**列表是否显示0否 1是*//* + @Excel(name = "列表是否显示0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "", dicCode = "is_show_list") + @Dict(dictTable = "onl_cgform_field", dicText = "", dicCode = "is_show_list") @ApiModelProperty(value = "列表是否显示0否 1是") private Integer isShowList; - /**是否是只读（1是 0否）*/ - @Excel(name = "是否是只读（1是 0否）", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") + *//*//***是否是只读（1是 0否）*//* + @Excel(name = "是否是只读（1是 0否）", width = 15, dictTable = "onl_cgform_field", dicText = "", dicCode = "is_read_only") + @Dict(dictTable = "onl_cgform_field", dicText = "", dicCode = "is_read_only") @ApiModelProperty(value = "是否是只读（1是 0否）") - private Integer isReadOnly; + private Integer isReadOnly;*/ /**展示区域*/ @Excel(name = "展示区域", width = 15, dictTable = "onl_cgform_area", dicText = "展示区域", dicCode = "show_area") @Dict(dictTable = "onl_cgform_area", dicText = "展示区域", dicCode = "show_area") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "展示区域") private String showArea; /**是否查询条件0否 1是*/ - @Excel(name = "是否查询条件0否 1是", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") + @Excel(name = "是否查询条件0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "是否搜索", dicCode = "is_query") + @Dict(dictTable = "onl_cgform_field", dicText = "是否搜索", dicCode = "is_query") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "是否查询条件0否 1是") private Integer isQuery; /**法规清单是否展示0否 1是*/ - @Excel(name = "法规清单是否展示0否 1是", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") + @Excel(name = "法规清单是否展示0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "法规清单展示", dicCode = "is_show_laws_list") + @Dict(dictTable = "onl_cgform_field", dicText = "法规清单展示", dicCode = "is_show_laws_list") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "法规清单是否展示0否 1是") private Integer isShowLawsList; /**搜索中心是否展示0否 1是*/ - @Excel(name = "搜索中心是否展示0否 1是", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") + @Excel(name = "搜索中心是否展示0否 1是", width = 15, dictTable = "onl_cgform_field", dicText = "搜索中心展示", dicCode = "is_show_search") + @Dict(dictTable = "onl_cgform_field", dicText = "搜索中心展示", dicCode = "is_show_search") + @javax.validation.constraints.NotNull(message = "不能为空") @ApiModelProperty(value = "搜索中心是否展示0否 1是") private Integer isShowSearch; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java index fd41a0873..7fe6a7bd7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java @@ -1,10 +1,7 @@ package com.jero.modules.tag.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.tag.entity.OnlCgformTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.tag.entity.OnlCgformTag; /** * @Description: 标签管理 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index 0829b4610..138aba1cb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -1,7 +1,8 @@ package com.jero.modules.tag.service; -import com.jero.modules.tag.entity.OnlCgformArea; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.tag.entity.OnlCgformArea; + import java.util.List; /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java index c6a5d938e..af9875fd9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -1,7 +1,9 @@ package com.jero.modules.tag.service; -import com.jero.modules.tag.entity.OnlCgformTag; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.common.api.vo.Result; +import com.jero.modules.tag.entity.OnlCgformTag; + import java.util.List; /** @@ -58,4 +60,11 @@ public interface IOnlCgformTagService extends IService { * @return */ List queryList(); + + /** + * 同一“所属模块”下的“属性名称”不能重复 + * + * @return + */ + Result queryExitData(OnlCgformTag onlCgformTag) ; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 5360b6508..ff9bc2aac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -1,12 +1,16 @@ package com.jero.modules.tag.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; + import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 标签管理 @@ -16,6 +20,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class OnlCgformTagServiceImpl extends ServiceImpl implements IOnlCgformTagService { + @Autowired + private OnlCgformTagMapper onlCgformTagMapper; /** * 保存 @@ -24,12 +30,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl ids) { - removeByIds(ids); - } + public void deleteByIds(List ids) { + removeByIds(ids); + } /** * 通过id查询 @@ -73,11 +79,11 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryList() { return list(); } + + /** + * 同一“所属模块”下的“属性名称”不能重复 + * + * @return + */ + @Override + public Result queryExitData(OnlCgformTag onlCgformTag) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like("isModel",onlCgformTag.getIsModel()).and(wq->wq.like("db_field_txt",onlCgformTag.getDbFieldTxt())); + Integer count = onlCgformTagMapper.selectCount(queryWrapper); + if (count > 0) { + return Result.error("已存在数据,不能重复添加"); + } + return Result.OK(onlCgformTag); + } + } diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application.yml index 7b86c331f..36bcb2d39 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application.yml @@ -2,4 +2,7 @@ spring: application: name: weilai-system profiles: - active: @profile.name@ \ No newline at end of file + active: @profile.name@ + +mybatis-plus: + mapper-locations: classpath:mappers/*.xml \ No newline at end of file