From c146a3c1d0caf7f533bc804d2e3c706315314e2d Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 11 Mar 2022 10:36:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformAreaController.java | 7 +- .../controller/OnlCgformTagController.java | 67 +++++++++++++++++-- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 2b7655a7e..c0003059b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -11,6 +11,7 @@ import com.jero.modules.tag.service.IOnlCgformTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -88,7 +89,7 @@ public class OnlCgformAreaController extends JeroController add(@Validated @RequestBody OnlCgformArea onlCgformArea) { onlCgformAreaService.add(onlCgformArea); return Result.OK("添加成功！"); @@ -103,7 +104,7 @@ public class OnlCgformAreaController extends JeroController edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { onlCgformAreaService.editById(onlCgformArea); return Result.OK("编辑成功!"); @@ -118,7 +119,7 @@ public class OnlCgformAreaController extends JeroController delete(@RequestParam(name="id",required=true) String id) { OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); int count=onlCgformTagService.queryExitArea(onlCgformArea); 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 6a8fe50d8..c825e49d5 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 @@ -3,9 +3,11 @@ package com.jero.modules.tag.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.CommonConstant; import com.jero.common.system.base.controller.JeroController; import com.jero.generater.modules.online.cgform.controller.OnlCgformApiController; import com.jero.modules.enums.FixedFieldEnum; +import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; @@ -15,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -82,7 +85,7 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { onlCgformTagService.add(onlCgformTag); onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal"); @@ -98,7 +101,7 @@ public class OnlCgformTagController extends JeroController edit(@Validated @RequestBody OnlCgformTag onlCgformTag) { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { return Result.error("固定字段,不可修改"); @@ -118,7 +121,7 @@ public class OnlCgformTagController extends JeroController delete(@RequestParam(name="id",required=true) String id) { Result result = new Result<>(); OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id); @@ -134,6 +137,30 @@ public class OnlCgformTagController extends JeroController logicDelete(@RequestParam(name="id",required=true) String id) { + Result result = new Result<>(); + OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id); + if(StringUtils.isNotBlank(String.valueOf(onlCgformTag.getIsReadOnly()))) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { + result.error500("固定字段,不可删除"); + } else { + onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_1); + //onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->要处理同步数据库问题!!!! + result.OK("删除成功！"); + } + } + return result; + } /** * 批量删除 * @@ -143,7 +170,7 @@ public class OnlCgformTagController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { OnlCgformTag onlCgformTag = onlCgformTagService.queryById(ids); if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { @@ -155,6 +182,38 @@ public class OnlCgformTagController extends JeroController logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) { + Result result = new Result(); + OnlCgformTag onlCgformTag = onlCgformTagService.queryById(ids); + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { + return Result.error("包含固定字段,不可删除"); + }else { + List idList = Arrays.asList(ids.split(",")); + for(String list:idList){ + OnlCgformTag midTag=onlCgformTagService.getById(list); + if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly()))) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(midTag.getIsReadOnly())) { + result.error500("包含固定字段,不可删除"); + } else { + midTag.setIsDelete(CommonConstant.DEL_FLAG_1); + //onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal");//逻辑删除-->要处理同步数据库问题!!!! + result.success("批量删除成功!"); + } + } + } + } + return result; + } /** * 通过id查询 *