From e0b402d561387ddfcb84701057440ddc79fb4521 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 16 Mar 2022 15:46:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCategoryController.java | 82 +++++++++---------- .../system/controller/SysDictController.java | 22 ++--- .../controller/SysDictItemController.java | 38 +++++---- .../system/mapper/SysCategoryMapper.java | 22 +++-- .../modules/system/mapper/SysDictMapper.java | 5 +- .../system/service/ISysCategoryService.java | 7 ++ .../service/impl/SysCategoryServiceImpl.java | 5 +- .../controller/OnlCgformTagController.java | 34 ++++---- .../tag/mapper/OnlCgformTagMapper.java | 6 +- .../tag/service/IOnlCgformTagService.java | 4 +- .../service/impl/OnlCgformTagServiceImpl.java | 6 +- 11 files changed, 128 insertions(+), 103 deletions(-) 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 cb860cedb..310c4fa9e 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 @@ -38,7 +38,7 @@ import java.io.IOException; import java.util.*; import java.util.stream.Collectors; - /** +/** * @Description: 分类字典 * @Author: jero-boot * @Date: 2019-05-29 @@ -190,21 +190,21 @@ public class SysCategoryController { * @return */ // @RequiresPermissions("sys:category:list") - @DeleteMapping(value = "/logicDelete") - public Result logicDelete(@RequestParam(name="id",required=true) String id) { - Result result = new Result(); - SysCategory sysCategory = sysCategoryService.getById(id); - if(sysCategory==null) { - result.error500("未找到对应实体"); - }else { - sysCategory.setDelFlag(CommonConstant.DEL_FLAG_1); - result.success("删除成功!"); - } - return result; - } + @DeleteMapping(value = "/logicDelete") + public Result logicDelete(@RequestParam(name="id",required=true) String id) { + Result result = new Result(); + SysCategory sysCategory = sysCategoryService.getById(id); + if(sysCategory==null) { + result.error500("未找到对应实体"); + }else { + sysCategoryService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,sysCategory.getId()); + result.success("删除成功!"); + } + return result; + } /** - * 批量删除 + * 批量删除 * @param ids * @return */ @@ -221,33 +221,33 @@ public class SysCategoryController { return result; } - /** - * 批量逻辑删除 - * @param ids - * @return - */ -// @RequiresPermissions("sys:category:del")未改 - @DeleteMapping(value = "/logicDeleteBatch") - public Result logicDBatch(@RequestParam(name="ids",required=true) String ids) { - Result result = new Result(); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - }else { - List idList = Arrays.asList(ids.split(",")); - for(String list:idList){ - SysCategory joinSystem=sysCategoryService.getById(list); - if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) { - result.error500("包含固定字段,不可删除"); - } else { - joinSystem.setDelFlag(CommonConstant.DEL_FLAG_1); - result.success("批量删除成功!"); - } - } - } - } - return result; - } + /** + * 批量逻辑删除 + * @param ids + * @return + */ +// @RequiresPermissions("category:logicDeleteBatch") + @DeleteMapping(value = "/logicDeleteBatch") + public Result logicDBatch(@RequestParam(name="ids",required=true) String ids) { + Result result = new Result(); + List idList = Arrays.asList(ids.split(",")); + for(String list:idList){ + SysCategory joinSystem=sysCategoryService.getById(list); + if(ids==null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + }else { + if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) { + result.error500("包含固定字段,不可删除"); + } else { + sysCategoryService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,joinSystem.getId()); + result.success("批量删除成功!"); + } + } + } + } + return result; + } /** * 通过id查询 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 d1b4993f1..9506ada7c 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 @@ -501,11 +501,13 @@ public class SysDictController { if(oConvertUtils.isEmpty(ids)) { result.error500("参数不识别！"); }else { - if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) { - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly())) { - result.error500("包含固定字段,不可删除"); + List idList = Arrays.asList(ids.split(",")); + for (String list : idList) { + SysDict midDict = sysDictService.getById(list); + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(midDict.getIsReadOnly())) { + return result.error500("包含固定字段,不可删除"); } else { - sysDictService.removeByIds(Arrays.asList(ids.split(","))); + sysDictService.removeByIds(idList); result.success("删除成功!"); } } @@ -523,12 +525,12 @@ public class SysDictController { @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result logicdeleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); - if(oConvertUtils.isEmpty(ids)) { - result.error500("参数不识别！"); - }else { - List idList = Arrays.asList(ids.split(",")); - for(String list:idList){ - SysDict joinSystem=sysDictService.getById(list); + List idList = Arrays.asList(ids.split(",")); + for(String list:idList){ + SysDict joinSystem=sysDictService.getById(list); + if(oConvertUtils.isEmpty(ids)) { + result.error500("参数不识别！"); + }else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) { result.error500("包含固定字段,不可删除"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 6db43fa91..889c8e5c7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -185,17 +185,19 @@ public class SysDictItemController { @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); - SysDictItem sysDictItem = sysDictItemService.getById(ids); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - } - else { - if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDictItem.getIsReadOnly()))) { - if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDictItem.getIsReadOnly())) { - result.error500("固定字段,不可删除"); - } else { - this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); - result.success("批量删除成功!"); + List idList = Arrays.asList(ids.split(",")); + for(String list:idList) { + SysDictItem joinSystem = sysDictItemService.getById(list); + if (ids == null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } else { + if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) { + result.error500("固定字段,不可删除"); + } else { + this.sysDictItemService.removeByIds(Arrays.asList(ids.split(","))); + result.success("批量删除成功!"); + } } } } @@ -213,13 +215,13 @@ public class SysDictItemController { @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) { Result result = new Result(); - if(ids==null || "".equals(ids.trim())) { - result.error500("参数不识别！"); - } - else { - List idList = Arrays.asList(ids.split(",")); - for(String list:idList){ - SysDictItem joinSystem=sysDictItemService.getById(list); + List idList = Arrays.asList(ids.split(",")); + for(String list:idList){ + SysDictItem joinSystem=sysDictItemService.getById(list); + if(ids==null || "".equals(ids.trim())) { + result.error500("参数不识别！"); + } + else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(joinSystem.getIsReadOnly()))) { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) { result.error500("包含固定字段,不可删除"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java index 594f7af94..1d8567a33 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java @@ -1,15 +1,15 @@ package com.jero.modules.system.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.model.TreeSelectModel; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + import java.util.List; import java.util.Map; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import com.jero.modules.system.entity.SysCategory; -import com.jero.modules.system.model.TreeSelectModel; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - /** * @Description: 分类字典 * @Author: jero-boot @@ -27,6 +27,12 @@ public interface SysCategoryMapper extends BaseMapper { @Select("SELECT ID FROM sys_category WHERE CODE = #{code,jdbcType=VARCHAR}") public String queryIdByCode(@Param("code") String code); - + /** + * 修改状态值 + * @param delFlag + * @param id + */ + @Update("update sys_dict set del_flag = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") + public void updateDictDelFlag(@Param("flag") int delFlag, @Param("id") String id); } 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 f9d190611..ac13785bd 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 @@ -160,6 +160,7 @@ public interface SysDictMapper extends BaseMapper { "i.item_text as attribute_type_name,i.en_name as attribute_type_en_name\n" + "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\" and d.del_flag=0") - IPage queryPageList(IPage page,@Param("params") Map params); + "where i.dict_id=\"1494570247913512962\" and d.del_flag=0\n" + + "order by d.create_time desc") + 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/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index b368b3204..84cf638ba 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -73,4 +73,11 @@ public interface ISysCategoryService extends IService { List getSysCategoryTree(); List queryBySysName(String sysDictId); + + /** + * 修改delFlag + * @param delFlag + * @param id + */ + public void updateDictDelFlag(int delFlag,String id); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 6733da937..cf73af50b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -242,5 +242,8 @@ public class SysCategoryServiceImpl extends ServiceImpl 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(String.valueOf(FileTableIdEnum.FILE_TABLE_ID),"normal"); - return Result.OK("批量删除成功！"); + Result result = new Result(); + List idList = Arrays.asList(ids.split(",")); + for (String list : idList) { + OnlCgformTag midTag = onlCgformTagService.getById(list); + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(midTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(midTag.getIsReadOnly())) { + return result.error500("包含固定字段,不可删除"); + } else { + this.onlCgformTagService.deleteByIds(Arrays.asList(ids.split(","))); + onlCgformApiController.h(String.valueOf(FileTableIdEnum.FILE_TABLE_ID), "normal"); + return result.success("批量删除成功！"); + } } + return result; } /** @@ -201,14 +206,13 @@ 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); + Result result = new Result(); + List idList = Arrays.asList(ids.split(",")); + for(String list:idList){ + OnlCgformTag midTag=onlCgformTagService.getById(list); + if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(midTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(midTag.getIsReadOnly())) { + return Result.error("包含固定字段,不可删除"); + }else { if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(midTag.getIsReadOnly()))) { if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(midTag.getIsReadOnly())) { result.error500("包含固定字段,不可删除"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java index 83944f4ba..986de5fb4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java @@ -24,9 +24,9 @@ public interface OnlCgformTagMapper extends BaseMapper { /** * 修改状态值 - * @param delFlag + * @param isDelete * @param id */ - @Update("update onl_cgform_field set del_flag = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") - public void updateDictDelFlag(@org.apache.ibatis.annotations.Param("flag") int delFlag, @org.apache.ibatis.annotations.Param("id") String id); + @Update("update onl_cgform_field set is_delete = #{flag,jdbcType=INTEGER} where id = #{id,jdbcType=VARCHAR}") + public void updateDictDelFlag(@org.apache.ibatis.annotations.Param("flag") int isDelete, @org.apache.ibatis.annotations.Param("id") String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java index f99d6abfe..9ab8f0035 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -65,10 +65,10 @@ public interface IOnlCgformTagService extends IService { /** * 修改delFlag - * @param delFlag + * @param isDelete * @param id */ - public void updateDictDelFlag(int delFlag,String id); + public void updateDictDelFlag(int isDelete,String id); /** * 列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 0f53acd9c..3ef0a19fe 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -162,12 +162,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl