标签修改

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<OnlCgformArea, IOnlC
 	@AutoLog(value = "区域管理表-添加")
 	@ApiOperation(value="区域管理表-添加", notes="区域管理表-添加")
 	@PostMapping(value = "/add")
-	//@RequiresPermissions("area:add")
+	@RequiresPermissions("area:add")
 	public Result<?> add(@Validated @RequestBody OnlCgformArea onlCgformArea) {
 		onlCgformAreaService.add(onlCgformArea);
 		return Result.OK("添加成功！");
@@ -103,7 +104,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	@AutoLog(value = "区域管理表-编辑")
 	@ApiOperation(value="区域管理表-编辑", notes="区域管理表-编辑")
 	@PutMapping(value = "/edit")
-	//@RequiresPermissions("area:edit")
+	@RequiresPermissions("area:edit")
 	public Result<?> edit(@Validated @RequestBody OnlCgformArea onlCgformArea) {
 		onlCgformAreaService.editById(onlCgformArea);
 		return Result.OK("编辑成功!");
@@ -118,7 +119,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
 	@AutoLog(value = "区域管理表-通过id删除")
 	@ApiOperation(value="区域管理表-通过id删除", notes="区域管理表-通过id删除")
 	@DeleteMapping(value = "/delete")
-	//@RequiresPermissions("area:delete")
+	@RequiresPermissions("area:delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id);
 		int count=onlCgformTagService.queryExitArea(onlCgformArea);

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<OnlCgformTag, IOnlCgf
 	@AutoLog(value = "标签管理-添加")
 	@ApiOperation(value="标签管理-添加", notes="标签管理-添加")
 	@PostMapping(value = "/add")
-	//@RequiresPermissions("tag:add")
+	@RequiresPermissions("tag:add")
 	public Result<?> 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<OnlCgformTag, IOnlCgf
 	@AutoLog(value = "标签管理-编辑")
 	@ApiOperation(value="标签管理-编辑", notes="标签管理-编辑")
 	@PutMapping(value = "/edit")
-	//@RequiresPermissions("tag:edit")
+	@RequiresPermissions("tag:edit")
 	public Result<?> 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<OnlCgformTag, IOnlCgf
 	@AutoLog(value = "标签管理-通过id删除")
 	@ApiOperation(value="标签管理-通过id删除", notes="标签管理-通过id删除")
 	@DeleteMapping(value = "/delete")
-	//@RequiresPermissions("tag:delete")
+	@RequiresPermissions("tag:delete")
 	public Result<OnlCgformTag> delete(@RequestParam(name="id",required=true) String id) {
 		Result<OnlCgformTag> result = new Result<>();
 		OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id);
@@ -134,6 +137,30 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		return result;
 	}
 
+	/**
+	 *   逻辑删除
+	 *（0非固定字段 1固定字段 2字段固定，内部可配）
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "标签管理-通过id删除")
+	@ApiOperation(value="标签管理-通过id删除", notes="标签管理-通过id删除")
+	@DeleteMapping(value = "/logicDelete")
+	@RequiresPermissions("tag:logicDelete")
+	public Result<OnlCgformTag> logicDelete(@RequestParam(name="id",required=true) String id) {
+		Result<OnlCgformTag> 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<OnlCgformTag, IOnlCgf
 	@AutoLog(value = "标签管理-批量删除")
 	@ApiOperation(value="标签管理-批量删除", notes="标签管理-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	//@RequiresPermissions("tag:deleteBatch")
+	@RequiresPermissions("tag:deleteBatch")
 	public Result<?> 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<OnlCgformTag, IOnlCgf
 		}
 	}
 
+	/**
+	 *  批量逻辑删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "标签管理-批量删除")
+	@ApiOperation(value="标签管理-批量删除", notes="标签管理-批量删除")
+	@DeleteMapping(value = "/logicDeleteBatch")
+	@RequiresPermissions("tag:logicDeleteBatch")
+	public Result<?> logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<SysCategory> result = new Result<SysCategory>();
+		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<String> 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查询
 	 *