From daa473e220df02da20de95e3ae41915661fa0ea7 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 23 Feb 2022 15:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDictItemController.java | 49 +++++++++++++------ .../OnlCgformCollectionController.java | 27 ++++++++-- .../service/IOnlCgformCollectionService.java | 15 ++++-- .../impl/OnlCgformCollectionServiceImpl.java | 21 ++++++-- 4 files changed, 85 insertions(+), 27 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 af6543c8b..25513d70b 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 @@ -93,14 +93,20 @@ public class SysDictItemController { public Result edit(@RequestBody SysDictItem sysDictItem) { Result result = new Result(); SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); - if(sysdict==null) { + if (sysdict == null) { result.error500("未找到对应实体"); - }else { - sysDictItem.setUpdateTime(new Date()); - boolean ok = sysDictItemService.updateById(sysDictItem); - //TODO 返回false说明什么？ - if(ok) { - result.success("编辑成功!"); + } else { + if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDictItem.getIsReadOnly()))) { + if (sysDictItem.getIsReadOnly() == 1) { + result.error500("固定字段,不可删除"); + } else { + sysDictItem.setUpdateTime(new Date()); + boolean ok = sysDictItemService.updateById(sysDictItem); + //TODO 返回false说明什么？ + if (ok) { + result.success("编辑成功!"); + } + } } } return result; @@ -118,14 +124,19 @@ public class SysDictItemController { public Result delete(@RequestParam(name="id",required=true) String id) { Result result = new Result(); SysDictItem joinSystem = sysDictItemService.getById(id); - if(joinSystem==null) { + if (joinSystem == null) { result.error500("未找到对应实体"); - }/*else if(joinSystem.getIsReadOnly()==1||joinSystem.getIsTagDict()==1){ - result.error("固定字段,不可修改"); - }*/else { - boolean ok = sysDictItemService.removeById(id); - if(ok) { - result.success("删除成功!"); + }else { + if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { + if (joinSystem.getIsReadOnly() == 1) { + result.error500("固定字段,不可删除"); + } + else { + boolean ok = sysDictItemService.removeById(id); + if (ok) { + result.success("删除成功!"); + } + } } } return result; @@ -147,8 +158,14 @@ public class SysDictItemController { result.error500("参数不识别！"); } else { - this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); - result.success("批量删除成功!"); + if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDictItem.getIsReadOnly()))) { + if (sysDictItem.getIsReadOnly() == 1) { + result.error500("固定字段,不可删除"); + } else { + this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); + result.success("批量删除成功!"); + } + } } return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java index 8948a88ec..50d19d20c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java @@ -9,6 +9,8 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.collection.entity.OnlCgformCollection; import com.jero.modules.collection.service.IOnlCgformCollectionService; +import com.jero.modules.document.controller.BussDocumentLibraryEOController; +import com.jero.modules.document.entity.BussDocumentLibraryEO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -34,6 +36,8 @@ import java.util.List; public class OnlCgformCollectionController extends JeroController { @Autowired private IOnlCgformCollectionService onlCgformCollectionService; + @Autowired + BussDocumentLibraryEOController BussDocumentLibraryEOService; /** * 分页列表查询 @@ -73,14 +77,14 @@ public class OnlCgformCollectionController extends JeroController add(@Validated @RequestBody OnlCgformCollection onlCgformCollection) { - onlCgformCollectionService.add(onlCgformCollection); + public Result add(@Validated @RequestBody BussDocumentLibraryEO bussDocumentLibraryEO) { + onlCgformCollectionService.add(bussDocumentLibraryEO); return Result.OK("添加成功！"); } @@ -128,4 +132,21 @@ public class OnlCgformCollectionController extends JeroController queryDocumentById(@RequestParam(name="id",required=true) String documentId) { + OnlCgformCollection onlCgformCollection = onlCgformCollectionService.queryById(documentId); + if(onlCgformCollection==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(onlCgformCollection); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java index 01e97fe41..d08b97973 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java @@ -2,6 +2,7 @@ package com.jero.modules.collection.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.collection.entity.OnlCgformCollection; +import com.jero.modules.document.entity.BussDocumentLibraryEO; import java.util.List; @@ -16,10 +17,10 @@ public interface IOnlCgformCollectionService extends IService