diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java index c91685cf..438e8a57 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictDetailMapper.java @@ -13,9 +13,9 @@ import java.util.Set; @Mapper public interface DictDetailMapper extends BaseMapper { - List selectDictDetailByDictName(@Param("name") String name); + List queryDictDetailListByDictName(@Param("name") String name); - IPage queryDictDetail(@Param("criteria") QueryDictDetailRequest criteria, Page page); + IPage queryDictDetailPageByArgs(@Param("criteria") QueryDictDetailRequest criteria, Page page); - void deleteDictDetailsByDictIds(@Param("dictIds") Set dictIds); + void deleteDictDetailByDictIds(@Param("dictIds") Set dictIds); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java index a4fe6044..94679e07 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/DictMapper.java @@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface DictMapper extends BaseMapper { - IPage queryDictPage(@Param("criteria") QueryDictRequest criteria, Page page); + IPage queryDictPageByArgs(@Param("criteria") QueryDictRequest criteria, Page page); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java index e7e22c0f..74777c6b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictDetailServiceImpl.java @@ -30,7 +30,7 @@ public class DictDetailServiceImpl extends ServiceImpl queryDictDetailPage(QueryDictDetailRequest criteria, Page page) { - return PageUtil.toPage(dictDetailMapper.queryDictDetail(criteria, page)); + return PageUtil.toPage(dictDetailMapper.queryDictDetailPageByArgs(criteria, page)); } @Override @@ -59,7 +59,7 @@ public class DictDetailServiceImpl extends ServiceImpl dictDetails = redisHelper.getList(key, DictDetail.class); if (CollUtil.isEmpty(dictDetails)) { - dictDetails = dictDetailMapper.selectDictDetailByDictName(name); + dictDetails = dictDetailMapper.queryDictDetailListByDictName(name); redisHelper.set(key, dictDetails, 1, TimeUnit.DAYS); } return dictDetails; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java index 88c70709..ac2c139b 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DictServiceImpl.java @@ -37,13 +37,13 @@ public class DictServiceImpl extends ServiceImpl implements Di @Override public PageResult queryDictPage(QueryDictRequest criteria, Page page) { - IPage dicts = dictMapper.queryDictPage(criteria, page); + IPage dicts = dictMapper.queryDictPageByArgs(criteria, page); return PageUtil.toPage(dicts); } @Override public List selectDictByCriteria(QueryDictRequest criteria) { - return dictMapper.queryDictPage(criteria, PageUtil.getCount(dictMapper)).getRecords(); + return dictMapper.queryDictPageByArgs(criteria, PageUtil.getCount(dictMapper)).getRecords(); } @Override @@ -74,14 +74,14 @@ public class DictServiceImpl extends ServiceImpl implements Di // 删除字典 dictMapper.deleteByIds(ids); // 删除字典详情 - dictDetailMapper.deleteDictDetailsByDictIds(ids); + dictDetailMapper.deleteDictDetailByDictIds(ids); } @Override public void downloadExcel(List dicts, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (Dict dict : dicts) { - List dictDetails = dictDetailMapper.selectDictDetailByDictName(dict.getName()); + List dictDetails = dictDetailMapper.queryDictDetailListByDictName(dict.getName()); if (CollectionUtil.isNotEmpty(dictDetails)) { for (DictDetail dictDetail : dictDetails) { Map map = new LinkedHashMap<>(); diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml index 1adfa22f..4dc8bf51 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml @@ -16,7 +16,7 @@ - select dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time, d.id as dict_id, d.name @@ -27,7 +27,7 @@ order by dd.dict_sort - select dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time, d.id as dict_id, d.name @@ -41,7 +41,7 @@ order by dd.dict_sort, dd.dict_id desc - + delete from sys_dict_detail where dict_id in diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml index 52858676..38d1bfc0 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml @@ -1,7 +1,7 @@ - SELECT * from sys_dict d