upd: 编码规范
This commit is contained in:
+3
-3
@@ -13,9 +13,9 @@ import java.util.Set;
|
|||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface DictDetailMapper extends BaseMapper<DictDetail> {
|
public interface DictDetailMapper extends BaseMapper<DictDetail> {
|
||||||
List<DictDetail> selectDictDetailByDictName(@Param("name") String name);
|
List<DictDetail> queryDictDetailListByDictName(@Param("name") String name);
|
||||||
|
|
||||||
IPage<DictDetail> queryDictDetail(@Param("criteria") QueryDictDetailRequest criteria, Page<Object> page);
|
IPage<DictDetail> queryDictDetailPageByArgs(@Param("criteria") QueryDictDetailRequest criteria, Page<Object> page);
|
||||||
|
|
||||||
void deleteDictDetailsByDictIds(@Param("dictIds") Set<Long> dictIds);
|
void deleteDictDetailByDictIds(@Param("dictIds") Set<Long> dictIds);
|
||||||
}
|
}
|
||||||
+1
-1
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Param;
|
|||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface DictMapper extends BaseMapper<Dict> {
|
public interface DictMapper extends BaseMapper<Dict> {
|
||||||
IPage<Dict> queryDictPage(@Param("criteria") QueryDictRequest criteria, Page<Object> page);
|
IPage<Dict> queryDictPageByArgs(@Param("criteria") QueryDictRequest criteria, Page<Object> page);
|
||||||
}
|
}
|
||||||
+2
-2
@@ -30,7 +30,7 @@ public class DictDetailServiceImpl extends ServiceImpl<DictDetailMapper, DictDet
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResult<DictDetail> queryDictDetailPage(QueryDictDetailRequest criteria, Page<Object> page) {
|
public PageResult<DictDetail> queryDictDetailPage(QueryDictDetailRequest criteria, Page<Object> page) {
|
||||||
return PageUtil.toPage(dictDetailMapper.queryDictDetail(criteria, page));
|
return PageUtil.toPage(dictDetailMapper.queryDictDetailPageByArgs(criteria, page));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -59,7 +59,7 @@ public class DictDetailServiceImpl extends ServiceImpl<DictDetailMapper, DictDet
|
|||||||
String key = SystemRedisKey.DICT_NAME + name;
|
String key = SystemRedisKey.DICT_NAME + name;
|
||||||
List<DictDetail> dictDetails = redisHelper.getList(key, DictDetail.class);
|
List<DictDetail> dictDetails = redisHelper.getList(key, DictDetail.class);
|
||||||
if (CollUtil.isEmpty(dictDetails)) {
|
if (CollUtil.isEmpty(dictDetails)) {
|
||||||
dictDetails = dictDetailMapper.selectDictDetailByDictName(name);
|
dictDetails = dictDetailMapper.queryDictDetailListByDictName(name);
|
||||||
redisHelper.set(key, dictDetails, 1, TimeUnit.DAYS);
|
redisHelper.set(key, dictDetails, 1, TimeUnit.DAYS);
|
||||||
}
|
}
|
||||||
return dictDetails;
|
return dictDetails;
|
||||||
|
|||||||
+4
-4
@@ -37,13 +37,13 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PageResult<Dict> queryDictPage(QueryDictRequest criteria, Page<Object> page) {
|
public PageResult<Dict> queryDictPage(QueryDictRequest criteria, Page<Object> page) {
|
||||||
IPage<Dict> dicts = dictMapper.queryDictPage(criteria, page);
|
IPage<Dict> dicts = dictMapper.queryDictPageByArgs(criteria, page);
|
||||||
return PageUtil.toPage(dicts);
|
return PageUtil.toPage(dicts);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Dict> selectDictByCriteria(QueryDictRequest criteria) {
|
public List<Dict> selectDictByCriteria(QueryDictRequest criteria) {
|
||||||
return dictMapper.queryDictPage(criteria, PageUtil.getCount(dictMapper)).getRecords();
|
return dictMapper.queryDictPageByArgs(criteria, PageUtil.getCount(dictMapper)).getRecords();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -74,14 +74,14 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
|
|||||||
// 删除字典
|
// 删除字典
|
||||||
dictMapper.deleteByIds(ids);
|
dictMapper.deleteByIds(ids);
|
||||||
// 删除字典详情
|
// 删除字典详情
|
||||||
dictDetailMapper.deleteDictDetailsByDictIds(ids);
|
dictDetailMapper.deleteDictDetailByDictIds(ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void downloadExcel(List<Dict> dicts, HttpServletResponse response) throws IOException {
|
public void downloadExcel(List<Dict> dicts, HttpServletResponse response) throws IOException {
|
||||||
List<Map<String, Object>> list = new ArrayList<>();
|
List<Map<String, Object>> list = new ArrayList<>();
|
||||||
for (Dict dict : dicts) {
|
for (Dict dict : dicts) {
|
||||||
List<DictDetail> dictDetails = dictDetailMapper.selectDictDetailByDictName(dict.getName());
|
List<DictDetail> dictDetails = dictDetailMapper.queryDictDetailListByDictName(dict.getName());
|
||||||
if (CollectionUtil.isNotEmpty(dictDetails)) {
|
if (CollectionUtil.isNotEmpty(dictDetails)) {
|
||||||
for (DictDetail dictDetail : dictDetails) {
|
for (DictDetail dictDetail : dictDetails) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<result column="name" property="name" jdbcType="VARCHAR"/>
|
<result column="name" property="name" jdbcType="VARCHAR"/>
|
||||||
</association>
|
</association>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<select id="selectDictDetailByDictName" resultMap="BaseResultMap">
|
<select id="queryDictDetailListByDictName" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
|
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
|
d.id as dict_id, d.name
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
</if>
|
</if>
|
||||||
order by dd.dict_sort
|
order by dd.dict_sort
|
||||||
</select>
|
</select>
|
||||||
<select id="queryDictDetail" resultMap="BaseResultMap">
|
<select id="queryDictDetailPageByArgs" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time,
|
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
|
d.id as dict_id, d.name
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
</if>
|
</if>
|
||||||
order by dd.dict_sort, dd.dict_id desc
|
order by dd.dict_sort, dd.dict_id desc
|
||||||
</select>
|
</select>
|
||||||
<delete id="deleteDictDetailsByDictIds">
|
<delete id="deleteDictDetailByDictIds">
|
||||||
delete from sys_dict_detail
|
delete from sys_dict_detail
|
||||||
where dict_id in
|
where dict_id in
|
||||||
<foreach collection="dictIds" item="item" index="index" open="(" separator="," close=")">
|
<foreach collection="dictIds" item="item" index="index" open="(" separator="," close=")">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||||
<mapper namespace="cn.odboy.application.system.mapper.DictMapper">
|
<mapper namespace="cn.odboy.application.system.mapper.DictMapper">
|
||||||
<select id="queryDictPage" resultType="cn.odboy.model.system.domain.Dict">
|
<select id="queryDictPageByArgs" resultType="cn.odboy.model.system.domain.Dict">
|
||||||
SELECT
|
SELECT
|
||||||
*
|
*
|
||||||
from sys_dict d
|
from sys_dict d
|
||||||
|
|||||||
Reference in New Issue
Block a user