WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标签增加批量删除功能

Browse Source
This commit is contained in:
xiejunyu
2022-03-09 16:00:23 +08:00
parent 0635bee38e
commit f3187aaf2c
7 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+1
View File
@@ -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> sysCategory = sysCategoryService.queryBySysDictId(sysDictId);
if(sysCategory==null) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+5 -2
View File
@@ -365,6 +365,7 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
@RequiresRoles({"admin"})
@RequestMapping(value = "/add", method = RequestMethod.POST)
//@RequiresPermissions("dict:add")
public Result<SysDict> add(@RequestBody SysDict sysDict) {
Result<SysDict> result = new Result<SysDict>();
try {
@@ -405,6 +406,7 @@ public class SysDictController {
@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
@RequiresRoles({"admin"})
@RequestMapping(value = "/edit", method = RequestMethod.PUT)
//@RequiresPermissions("dict:edit")
public Result<SysDict> edit(@RequestBody SysDict sysDict) {
Result<SysDict> result = new Result<SysDict>();
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<SysDict> logicDelete(@RequestParam(name="id",required=true) String id) {
Result<SysDict> result = new Result<SysDict>();
@@ -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("删除成功!");
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java
-1
View File
@@ -161,6 +161,5 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
"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<Map<String,Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
IPage<SysDict> queryPageList(IPage page,@Param("params") Map<String,Object> params);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
-2
View File
@@ -160,8 +160,6 @@ public interface ISysDictService extends IService<SysDict> {
*/
Integer queryExitData(SysDict sysDict);
//List<Map<String, Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
Integer queryExitDictName(SysDict sysDict);
IPage<SysDict> queryPageList(Map<String, Object> params);
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
-7
View File
@@ -392,13 +392,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
return count;
}
/*@Override
public List<Map<String, Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper) {
IPage<Map<String, Object>> info= sysDictMapper.selectPageInfo(page, queryWrapper);
List<Map<String, Object>> list = info.getRecords().stream().collect(Collectors.toList());
return list;
}*/
/**
* 标签内容-分页查询
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java
+4 -24
View File
@@ -48,34 +48,11 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
@AutoLog(value = "区域管理表-分页列表查询")
@ApiOperation(value="区域管理表-分页列表查询", notes="区域管理表-分页列表查询")
@PostMapping(value = "/page")
//@RequiresPermissions("area:page")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
IPage<OnlCgformArea> 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<OnlCgformArea> queryWrapper = QueryGenerator.initQueryWrapper(onlCgformArea, req.getParameterMap());
Page<OnlCgformArea> page = new Page<OnlCgformArea>(pageNo, pageSize);
if(StringUtils.isNotBlank("create_time")) {
queryWrapper.orderByDesc("create_time");
}
//中英切换-所属模块列
List<Map<String, Object>> pageList = onlCgformAreaService.selectPageInfo(page, queryWrapper);
if (CutEnum.CN.getValue().equals(cut)) {
return Result.OK(pageList);
} else {
JSONArray jsonArray = new JSONArray();
jsonArray.addAll(pageList);
List<OnlCgformArea> 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<OnlCgformArea, IOnlC
@AutoLog(value = "区域管理表-添加")
@ApiOperation(value="区域管理表-添加", notes="区域管理表-添加")
@PostMapping(value = "/add")
//@RequiresPermissions("area:add")
public Result<?> add(@Validated @RequestBody OnlCgformArea onlCgformArea) {
onlCgformAreaService.add(onlCgformArea);
return Result.OK("添加成功！");
@@ -125,6 +103,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
@AutoLog(value = "区域管理表-编辑")
@ApiOperation(value="区域管理表-编辑", notes="区域管理表-编辑")
@PutMapping(value = "/edit")
//@RequiresPermissions("area:edit")
public Result<?> edit(@Validated @RequestBody OnlCgformArea onlCgformArea) {
onlCgformAreaService.editById(onlCgformArea);
return Result.OK("编辑成功!");
@@ -139,6 +118,7 @@ public class OnlCgformAreaController extends JeroController<OnlCgformArea, IOnlC
@AutoLog(value = "区域管理表-通过id删除")
@ApiOperation(value="区域管理表-通过id删除", notes="区域管理表-通过id删除")
@DeleteMapping(value = "/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
+5
View File
@@ -81,6 +81,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
@AutoLog(value = "标签管理-添加")
@ApiOperation(value="标签管理-添加", notes="标签管理-添加")
@PostMapping(value = "/add")
//@RequiresPermissions("tag:add")
public Result<?> add(@Validated @RequestBody OnlCgformTag onlCgformTag) {
onlCgformTagService.add(onlCgformTag);
onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal");
@@ -96,6 +97,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
@AutoLog(value = "标签管理-编辑")
@ApiOperation(value="标签管理-编辑", notes="标签管理-编辑")
@PutMapping(value = "/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("固定字段,不可修改");
@@ -115,6 +117,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
@AutoLog(value = "标签管理-通过id删除")
@ApiOperation(value="标签管理-通过id删除", notes="标签管理-通过id删除")
@DeleteMapping(value = "/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);
@@ -139,12 +142,14 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
@AutoLog(value = "标签管理-批量删除")
@ApiOperation(value="标签管理-批量删除", notes="标签管理-批量删除")
@DeleteMapping(value = "/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())) {
return Result.error("固定字段,不可删除");
}else {
this.onlCgformTagService.deleteByIds(Arrays.asList(ids.split(",")));
onlCgformApiController.h("48308196e7b04761b533dc31bc899707","normal");
return Result.OK("批量删除成功！");
}
}