diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index ca45459ce..bd2f7c0ee 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -101,6 +101,7 @@ public class SysCategoryController { @AutoLog(value = "标签内容-树形结构-通过sysDictId查询") @ApiOperation(value="标签内容-树形结构-通过sysDictId查询", notes="标签内容-树形结构-通过sysDictId查询") @GetMapping(value = "/queryBySysDictId") + // @RequiresPermissions("sys:category:queryBySysDictId") public Result queryBySysDictId(@RequestParam(name="id",required=true) String sysDictId) { List sysCategory = sysCategoryService.queryBySysDictId(sysDictId); if(sysCategory==null) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 7184b847c..a5fd1c57c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -365,6 +365,7 @@ public class SysDictController { @ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典") @RequiresRoles({"admin"}) @RequestMapping(value = "/add", method = RequestMethod.POST) + //@RequiresPermissions("dict:add") public Result add(@RequestBody SysDict sysDict) { Result result = new Result(); try { @@ -405,6 +406,7 @@ public class SysDictController { @ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典") @RequiresRoles({"admin"}) @RequestMapping(value = "/edit", method = RequestMethod.PUT) + //@RequiresPermissions("dict:edit") public Result edit(@RequestBody SysDict sysDict) { Result result = new Result(); SysDict sysdict = sysDictService.getById(sysDict.getId()); @@ -465,6 +467,7 @@ public class SysDictController { @RequiresRoles({"admin"}) @DeleteMapping(value = "/logicDelete") @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) + //@RequiresPermissions("dict:logicDelete") public Result logicDelete(@RequestParam(name="id",required=true) String id) { Result result = new Result(); @@ -498,9 +501,9 @@ public class SysDictController { }else { if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly())) { - result.error500("固定字段,不可删除"); + result.error500("包含固定字段,不可删除"); } else { - sysDictService.removeByIds(Arrays.asList(ids.split(","))); + sysDict.setDelFlag(CommonConstant.DEL_FLAG_1); result.success("删除成功!"); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java index 340a586b6..c3722c5b2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java @@ -161,6 +161,5 @@ public interface SysDictMapper extends BaseMapper { "from sys_dict as d\n" + "left join sys_dict_item as i on d.attribute_type=i.item_value\n" + "where i.dict_id=\"1494570247913512962\"") - //IPage> selectPageInfo(Page page, Wrapper queryWrapper); IPage queryPageList(IPage page,@Param("params") Map params); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java index 305990b6a..ec87c3cb8 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java @@ -160,8 +160,6 @@ public interface ISysDictService extends IService { */ Integer queryExitData(SysDict sysDict); - //List> selectPageInfo(Page page, Wrapper queryWrapper); - Integer queryExitDictName(SysDict sysDict); IPage queryPageList(Map params); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index 81b7156b7..fdeeedb44 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -392,13 +392,6 @@ public class SysDictServiceImpl extends ServiceImpl impl return count; } - /*@Override - public List> selectPageInfo(Page page, Wrapper queryWrapper) { - IPage> info= sysDictMapper.selectPageInfo(page, queryWrapper); - List> list = info.getRecords().stream().collect(Collectors.toList()); - return list; - }*/ - /** * 标签内容-分页查询 * 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 5ba553166..2b7655a7e 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 @@ -48,34 +48,11 @@ public class OnlCgformAreaController extends JeroController queryPageList(@RequestBody Map params) { IPage pageList=onlCgformAreaService.queryPageList(params); return Result.OK(pageList); } - /*@GetMapping(value = "/page") - public Result queryPageList(@RequestParam(name = "cut") String cut, - OnlCgformArea onlCgformArea, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformArea, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - if(StringUtils.isNotBlank("create_time")) { - queryWrapper.orderByDesc("create_time"); - } - //中英切换-所属模块列 - List> pageList = onlCgformAreaService.selectPageInfo(page, queryWrapper); - if (CutEnum.CN.getValue().equals(cut)) { - return Result.OK(pageList); - } else { - JSONArray jsonArray = new JSONArray(); - jsonArray.addAll(pageList); - List list = jsonArray.toJavaList(OnlCgformArea.class); - list.stream().forEach(f -> f.setIsModel(f.getEnName())); - return Result.OK(list); - } - }*/ - /** * 列表查询 @@ -111,6 +88,7 @@ public class OnlCgformAreaController extends JeroController add(@Validated @RequestBody OnlCgformArea onlCgformArea) { onlCgformAreaService.add(onlCgformArea); return Result.OK("添加成功!"); @@ -125,6 +103,7 @@ public class OnlCgformAreaController extends JeroController edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { onlCgformAreaService.editById(onlCgformArea); return Result.OK("编辑成功!"); @@ -139,6 +118,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 54ba9f9d0..29cb86d3e 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 @@ -81,6 +81,7 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { onlCgformTagService.add(onlCgformTag); onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal"); @@ -96,6 +97,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("固定字段,不可修改"); @@ -115,6 +117,7 @@ public class OnlCgformTagController extends JeroController delete(@RequestParam(name="id",required=true) String id) { Result result = new Result<>(); OnlCgformTag onlCgformTag = onlCgformTagService.queryById(id); @@ -139,12 +142,14 @@ 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())) { return Result.error("固定字段,不可删除"); }else { this.onlCgformTagService.deleteByIds(Arrays.asList(ids.split(","))); + onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal"); return Result.OK("批量删除成功!"); } }