标签管理-标签内容

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -1,23 +1,15 @@
 package com.jero.modules.system.controller;
 
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import com.jero.common.api.vo.Result;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.DictModel;
-import com.jero.common.system.vo.DictQuery;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.SqlInjectionUtil;
@@ -29,6 +21,12 @@ import com.jero.modules.system.model.TreeSelectModel;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.vo.SysDictPage;
+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.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -318,7 +316,18 @@ public class SysDictController {
 		result.setResult(ls);
 		return result;
 	}
-
+	/**
+	 * 查询选项内容--数据字典名称
+	 * @return
+	 */
+	@GetMapping(value = "/deleteList")
+	public Result<List<SysDict>> deleteList() {
+		Result<List<SysDict>> result = new Result<List<SysDict>>();
+		List<SysDict> list = this.sysDictService.queryDeleteList();
+		result.setSuccess(true);
+		result.setResult(list);
+		return result;
+	}
 	/**
 	 * @功能：新增
 	 * @param sysDict
@@ -356,7 +365,12 @@ public class SysDictController {
 		SysDict sysdict = sysDictService.getById(sysDict.getId());
 		if (sysdict == null) {
 			result.error500("未找到对应实体");
-		}else {
+		}
+		else {
+			if (sysDict.getIsReadOnly() == 1) {
+				result.error500("固定字段,不能修改");
+			}
+			else{
 				sysDict.setUpdateTime(new Date());
 				boolean ok = sysDictService.updateById(sysDict);
 				if (ok) {
@@ -365,6 +379,7 @@ public class SysDictController {
 					sysDictService.refreshCache();
 				}
 			}
+		}
 		return result;
 	}
 
@@ -378,16 +393,23 @@ public class SysDictController {
 	@DeleteMapping(value = "/delete")
 	@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
 	public Result<SysDict> delete(@RequestParam(name="id",required=true) String id) {
+
 		Result<SysDict> result = new Result<SysDict>();
+		SysDict sysDict = sysDictService.queryById(id);
+		if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) {
+			if (sysDict.getIsReadOnly() == 1) {
+				result.error500("固定字段,不可删除");
+			} else {
 				boolean ok = sysDictService.removeById(id);
 				if (ok) {
 					result.success("删除成功!");
 				} else {
 					result.error500("删除失败!");
 				}
+			}
+		}
 		return result;
 	}
-
 	/**
 	 * @功能：批量删除
 	 * @param ids
@@ -398,12 +420,19 @@ public class SysDictController {
 	@CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true)
 	public Result<SysDict> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		Result<SysDict> result = new Result<SysDict>();
+		SysDict sysDict = sysDictService.queryById(ids);
 		if(oConvertUtils.isEmpty(ids)) {
 			result.error500("参数不识别！");
+		}else {
+			if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) {
+				if (sysDict.getIsReadOnly() == 1) {
+					result.error500("固定字段,不可删除");
 				} else {
 					sysDictService.removeByIds(Arrays.asList(ids.split(",")));
 					result.success("删除成功!");
 				}
+			}
+		}
 		return result;
 	}
 
@@ -521,13 +550,10 @@ public class SysDictController {
 	 * 查询被删除的列表
 	 * @return
 	 */
-	@GetMapping(value = "/deleteList")
+	@GetMapping(value = "/queryDictName")
-	public Result<List<SysDict>> deleteList() {
+	public Result<List<SysDict>> queryDictName(SysDict sysDict) {
-		Result<List<SysDict>> result = new Result<List<SysDict>>();
+		List<SysDict> list =sysDictService.queryDictName(sysDict);
-		List<SysDict> list = this.sysDictService.queryDeleteList();
+		return Result.OK(list);
-		result.setSuccess(true);
-		result.setResult(list);
-		return result;
 	}
 
 	/**

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java

@@ -165,7 +165,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	}
 
     /**
-     * 查询展示区域
+     * 查询选项内容--数据字典名称
      * @return
      */
     @Override
@@ -321,4 +321,15 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		redisTemplate.delete(keys5);
 		redisTemplate.delete(keys6);
 	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public SysDict queryById(String id) {
+		return getById(id);
+	}
 }