From 79bfe693a7daaf84cd8b02109c7af23041dd5399 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 16 Feb 2022 16:03:02 +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+=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDictItemController.java | 74 ++++++++----------- .../jero/modules/system/entity/SysDict.java | 22 +++++- .../modules/system/entity/SysDictItem.java | 12 +-- .../controller/OnlCgformTagController.java | 1 + .../modules/tag/entity/OnlCgformArea.java | 3 - .../tag/service/IOnlCgformTagService.java | 3 +- .../service/impl/OnlCgformTagServiceImpl.java | 7 +- 7 files changed, 58 insertions(+), 64 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 1cec501ef..10af86dcc 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -37,7 +37,7 @@ public class SysDictItemController { @Autowired private ISysDictItemService sysDictItemService; - + /** * @功能：查询字典数据 * @param sysDictItem @@ -49,24 +49,17 @@ public class SysDictItemController { @RequiresPermissions("sys:dict:list") @RequestMapping(value = "/page", method = RequestMethod.GET) public Result> queryPageList(SysDictItem sysDictItem,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDictItem, req.getParameterMap()); + queryWrapper.orderByAsc("sort_order"); Page page = new Page(pageNo, pageSize); - if(sysDictItem.getIsTagDict()==0) { - queryWrapper.like("is_tag_dict",0).and(wq->wq.orderByAsc("sort_order")); - IPage pageList = sysDictItemService.page(page, queryWrapper); - result.setResult(pageList); - } - else if(sysDictItem.getIsTagDict()==1) { - queryWrapper.like("is_tag_dict",1).and(wq->wq.orderByAsc("sort_order")); - IPage pageList = sysDictItemService.page(page, queryWrapper); - result.setResult(pageList); - } + IPage pageList = sysDictItemService.page(page, queryWrapper); result.setSuccess(true); + result.setResult(pageList); return result; } - + /** * @功能：新增 * @return @@ -87,7 +80,7 @@ public class SysDictItemController { } return result; } - + /** * @功能：编辑 * @param sysDictItem @@ -102,21 +95,19 @@ public class SysDictItemController { SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); if(sysdict==null) { result.error500("未找到对应实体"); - }else { - if(sysDictItem.getIsReadOnly()==2){ - result.error("固定字段,不可修改"); - }else { - sysDictItem.setUpdateTime(new Date()); - boolean ok = sysDictItemService.updateById(sysDictItem); - //TODO 返回false说明什么？ - if(ok) { - result.success("编辑成功!"); - } + }/*else if(sysDictItem.getIsReadOnly()==1){ + result.error("固定字段,不可修改"); + }*/else { + sysDictItem.setUpdateTime(new Date()); + boolean ok = sysDictItemService.updateById(sysDictItem); + //TODO 返回false说明什么？ + if(ok) { + result.success("编辑成功!"); } } return result; } - + /** * @功能：删除字典数据 * @param id @@ -131,20 +122,17 @@ public class SysDictItemController { SysDictItem joinSystem = sysDictItemService.getById(id); if(joinSystem==null) { result.error500("未找到对应实体"); - }else { - if(joinSystem.getIsReadOnly()==2){ - result.error("固定字段,不可修改"); - }else { - boolean ok = sysDictItemService.removeById(id); - if(ok) { - result.success("删除成功!"); - } + }/*else if(joinSystem.getIsReadOnly()==1||joinSystem.getIsTagDict()==1){ + result.error("固定字段,不可修改"); + }*/else { + boolean ok = sysDictItemService.removeById(id); + if(ok) { + result.success("删除成功!"); } - } return result; } - + /** * @功能：批量删除字典数据 * @param ids @@ -156,16 +144,14 @@ public class SysDictItemController { @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); + SysDictItem sysDictItem = sysDictItemService.getById(ids); if(ids==null || "".equals(ids.trim())) { result.error500("参数不识别！"); - }else { - SysDictItem sysDictItem = sysDictItemService.getById(ids); - if(sysDictItem.getIsReadOnly() == 1 || sysDictItem.getIsReadOnly()==2){ - result.error("固定字段,不可删除"); - }else { - this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); - result.success("批量删除成功!"); - } + }/*else if(sysDictItem.getIsReadOnly() == 1){ + result.error("固定字段,不可删除"); + }*/else { + this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); + result.success("批量删除成功!"); } return result; } @@ -198,5 +184,5 @@ public class SysDictItemController { return Result.error("该值不可用，系统中已存在！"); } } - + } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java index 2aac6b479..69947b431 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java @@ -1,15 +1,16 @@ package com.jero.modules.system.entity; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; - +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.io.Serializable; +import java.util.Date; /** *

@@ -86,5 +87,18 @@ public class SysDict implements Serializable { */ private Date updateTime; + /**是否为标签内容-数据字典（1是 0否）*/ + @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) + @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") + private java.lang.Integer isTagDict; + /**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/ + @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15) + @ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）") + private java.lang.Integer isReadOnly; + + /**表单控件类型*/ + @Excel(name = "表单控件类型", width = 15) + @ApiModelProperty(value = "表单控件类型") + private java.lang.String fieldShowType; } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java index 03de2afa1..6b4fdc5bf 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDictItem.java @@ -77,16 +77,18 @@ public class SysDictItem implements Serializable { private Date updateTime; - /** - * 是否为标签内容-数据字典（1是 0否） - */ + /**是否为标签内容-数据字典（1是 0否）*/ @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15) @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）") private java.lang.Integer isTagDict; /**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/ - @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15, dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only") - @Dict(dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only") + @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15) @ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）") private java.lang.Integer isReadOnly; + + /**表单控件类型*/ + @Excel(name = "表单控件类型", width = 15) + @ApiModelProperty(value = "表单控件类型") + private java.lang.String fieldShowType; } 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 b1d291c48..6a7dc4893 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 @@ -83,6 +83,7 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { onlCgformTagService.queryExitData(onlCgformTag); + QueryWrapper queryWrapper = new QueryWrapper<>(); 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 eabd2fd10..6c010719a 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,19 +60,16 @@ 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; 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 af9875fd9..6c0ebe863 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,6 @@ package com.jero.modules.tag.service; 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; @@ -66,5 +65,5 @@ public interface IOnlCgformTagService extends IService { * * @return */ - Result queryExitData(OnlCgformTag onlCgformTag) ; + void 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 5f0a083ea..fe0712d0f 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 @@ -2,7 +2,6 @@ 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; @@ -100,14 +99,10 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryExitData(OnlCgformTag onlCgformTag) { + public void 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); } }