upd: 编码规范

cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java

@@ -1,7 +1,9 @@
 package cn.odboy.util;
 
 import cn.odboy.base.PageResult;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.Collections;
 import java.util.List;
@@ -53,4 +55,8 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
     public static <T> PageResult<T> toPage(List<T> list, long totalElements) {
         return new PageResult<>(list, totalElements);
     }
+
+    public static Page<Object> getCount(BaseMapper<?> baseMapper) {
+        return new Page<>(1, baseMapper.selectCount(null));
+    }
 }

cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictMapper.java

@@ -8,12 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 @Mapper
 public interface DictMapper extends BaseMapper<Dict> {
-
+    IPage<Dict> findDictPage(@Param("criteria") DictQueryCriteria criteria, Page<Object> page);
-    IPage<Dict> selectByPage(@Param("criteria") DictQueryCriteria criteria, Page<Object> page);
-
-    List<Dict> selectByPage(@Param("criteria") DictQueryCriteria criteria);
 }

cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java

@@ -32,13 +32,13 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
 
     @Override
     public PageResult<Dict> queryAll(DictQueryCriteria criteria, Page<Object> page) {
-        IPage<Dict> dicts = dictMapper.selectByPage(criteria, page);
+        IPage<Dict> dicts = dictMapper.findDictPage(criteria, page);
         return PageUtil.toPage(dicts);
     }
 
     @Override
     public List<Dict> queryAll(DictQueryCriteria criteria) {
-        return dictMapper.selectByPage(criteria);
+        return dictMapper.findDictPage(criteria, PageUtil.getCount(dictMapper)).getRecords();
     }
 
     @Override
@@ -62,12 +62,12 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
     @Transactional(rollbackFor = Exception.class)
     public void delete(Set<Long> ids) {
         // 清理缓存
-        List<Dict> dicts = dictMapper.selectBatchIds(ids);
+        List<Dict> dicts = dictMapper.selectByIds(ids);
         for (Dict dict : dicts) {
             delCaches(dict);
         }
         // 删除字典
-        dictMapper.deleteBatchIds(ids);
+        dictMapper.deleteByIds(ids);
         // 删除字典详情
         dictDetailMapper.deleteDictDetailsByDictIds(ids);
     }

cutejava/cutejava-system/src/main/resources/mapper/DictMapper.xml

@@ -1,7 +1,7 @@
 <?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" >
 <mapper namespace="cn.odboy.modules.system.mapper.DictMapper">
-    <select id="selectByPage" resultType="cn.odboy.model.system.domain.Dict">
+    <select id="findDictPage" resultType="cn.odboy.model.system.domain.Dict">
         SELECT
         *
         from sys_dict d

cutejava/cutejava-tools/src/main/java/cn/odboy/mapper/LocalStorageMapper.java

@@ -12,6 +12,5 @@ import java.util.List;
 
 @Mapper
 public interface LocalStorageMapper extends BaseMapper<LocalStorage> {
-    IPage<LocalStorage> findLocalStorage(@Param("criteria") LocalStorageQueryCriteria criteria, Page<Object> page);
+    IPage<LocalStorage> findLocalStoragePage(@Param("criteria") LocalStorageQueryCriteria criteria, Page<Object> page);
-    List<LocalStorage> findLocalStorage(@Param("criteria") LocalStorageQueryCriteria criteria);
 }

cutejava/cutejava-tools/src/main/java/cn/odboy/mapper/QiniuContentMapper.java

@@ -14,6 +14,5 @@ import java.util.List;
 @Mapper
 public interface QiniuContentMapper extends BaseMapper<QiniuContent> {
     QiniuContent findQiniuContentByName(@Param("name") String name);
-    IPage<QiniuContent> findQiniuContent(@Param("criteria") QiniuQueryCriteria criteria, Page<Object> page);
+    IPage<QiniuContent> findQiniuContentPage(@Param("criteria") QiniuQueryCriteria criteria, Page<Object> page);
-    List<QiniuContent> findQiniuContent(@Param("criteria") QiniuQueryCriteria criteria);
 }

cutejava/cutejava-tools/src/main/java/cn/odboy/service/impl/LocalStorageServiceImpl.java

@@ -36,12 +36,12 @@ public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, Loc
 
     @Override
     public PageResult<LocalStorage> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page) {
-        return PageUtil.toPage(localStorageMapper.findLocalStorage(criteria, page));
+        return PageUtil.toPage(localStorageMapper.findLocalStoragePage(criteria, page));
     }
 
     @Override
     public List<LocalStorage> queryAll(LocalStorageQueryCriteria criteria) {
-        return localStorageMapper.findLocalStorage(criteria);
+        return localStorageMapper.findLocalStoragePage(criteria, PageUtil.getCount(localStorageMapper)).getRecords();
     }
 
     @Override

cutejava/cutejava-tools/src/main/java/cn/odboy/service/impl/QiniuContentServiceImpl.java

@@ -47,12 +47,12 @@ public class QiniuContentServiceImpl extends ServiceImpl<QiniuContentMapper, Qin
 
     @Override
     public PageResult<QiniuContent> queryAll(QiniuQueryCriteria criteria, Page<Object> page) {
-        return PageUtil.toPage(qiniuContentMapper.findQiniuContent(criteria, page));
+        return PageUtil.toPage(qiniuContentMapper.findQiniuContentPage(criteria, page));
     }
 
     @Override
     public List<QiniuContent> queryAll(QiniuQueryCriteria criteria) {
-        return qiniuContentMapper.findQiniuContent(criteria);
+        return qiniuContentMapper.findQiniuContentPage(criteria,PageUtil.getCount(qiniuContentMapper)).getRecords();
     }
 
     @Override

cutejava/cutejava-tools/src/main/resources/mapper/LocalStorageMapper.xml

@@ -1,7 +1,7 @@
 <?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" >
 <mapper namespace="cn.odboy.mapper.LocalStorageMapper">
-    <select id="findLocalStorage" resultType="cn.odboy.model.tools.domain.LocalStorage">
+    <select id="findLocalStoragePage" resultType="cn.odboy.model.tools.domain.LocalStorage">
         select
         *
         from tool_local_storage

cutejava/cutejava-tools/src/main/resources/mapper/QiniuContentMapper.xml

@@ -7,7 +7,7 @@
         WHERE name = #{name}
     </select>
 
-    <select id="findQiniuContent" resultType="cn.odboy.model.tools.domain.QiniuContent">
+    <select id="findQiniuContentPage" resultType="cn.odboy.model.tools.domain.QiniuContent">
         SELECT
         *
         FROM tool_qiniu_content