规范了部分方法命令，逻辑本身未做修改

jiashuaizhang · Dec 12, 2021 · 3b1320c · 3b1320c
1 parent ef26fe5
commit 3b1320c
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 78 deletions.
diff --git a/yyets-history-ui/src/view/Main.vue b/yyets-history-ui/src/view/Main.vue
@@ -137,11 +137,12 @@
         this.resourceLinksTableData = this.resourceLinks[linkGroup].items;
       },
       copyLink(link) {
-        let hiddenLink = document.getElementById('hiddenLink');
+        let textareaId = 'hiddenLink';
+        let hiddenLink = document.getElementById(textareaId);
         if (!hiddenLink) {
           hiddenLink = document.createElement('textarea');
           hiddenLink.style.display = 'none';
-          hiddenLink.id = 'hiddenLink';
+          hiddenLink.id = textareaId;
         }
         hiddenLink.value = link;
         hiddenLink.select();

diff --git a/...s-history/src/main/java/com/zhangjiashuai/yyetshistory/config/YyetsHistoryProperties.java b/...s-history/src/main/java/com/zhangjiashuai/yyetshistory/config/YyetsHistoryProperties.java
@@ -4,15 +4,17 @@
 
 import java.util.LinkedHashSet;
 
-import static com.zhangjiashuai.yyetshistory.repository.impl.ResourceMapper.DEFAULT_PAGE_SIZE;
+import static com.zhangjiashuai.yyetshistory.repository.ResourceRepository.DEFAULT_PAGE_SIZE;
 
 @Data
 public class YyetsHistoryProperties {
     /**
      * 保留的链接类型
      */
     private LinkedHashSet<String> linkWayFilter;
-
+    /**
+     * 默认每页大小
+     */
     private int defaultPageSize;
 
     public int getDefaultPageSize() {

diff --git a/...s-history/src/main/java/com/zhangjiashuai/yyetshistory/controller/ResourceController.java b/...s-history/src/main/java/com/zhangjiashuai/yyetshistory/controller/ResourceController.java
@@ -1,6 +1,5 @@
 package com.zhangjiashuai.yyetshistory.controller;
 
-import cn.hutool.db.Page;
 import cn.hutool.db.PageResult;
 import com.zhangjiashuai.yyetshistory.entity.Resource;
 import com.zhangjiashuai.yyetshistory.service.ResourceService;

diff --git a/...s-history/src/main/java/com/zhangjiashuai/yyetshistory/repository/ResourceRepository.java b/...s-history/src/main/java/com/zhangjiashuai/yyetshistory/repository/ResourceRepository.java
@@ -1,23 +1,38 @@
 package com.zhangjiashuai.yyetshistory.repository;
 
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.db.PageResult;
 import com.zhangjiashuai.yyetshistory.entity.ResourceDO;
 
 import java.util.List;
 
 public interface ResourceRepository {
 
+    int DEFAULT_PAGE_SIZE = 20;
+
     ResourceDO findById(long id);
 
-    List<ResourceDO> findByName(String name);
+    List<ResourceDO> findByNameLike(String name);
 
     ResourceDO findOneByName(String name);
 
     List<ResourceDO> findAll();
 
-    PageResult<ResourceDO> selectPage(String name, int pageNo);
-
-    PageResult<ResourceDO> selectPage(String name, int pageNo, int pageSize);
-
-    long countByNameLike(String name);
+    int countByNameLike(String name);
+
+    default PageResult<ResourceDO> selectPage(String name, int pageNo) {
+        return selectPage(name, pageNo, DEFAULT_PAGE_SIZE);
+    }
+
+    default PageResult<ResourceDO> selectPage(String name, int pageNo, int pageSize) {
+        int count = countByNameLike(name);
+        PageResult<ResourceDO> pageResult = new PageResult<>(pageNo, pageSize, count);
+        if(count == 0) {
+            return pageResult;
+        }
+        List<ResourceDO> list = findByNameLike(name);
+        List<ResourceDO> pageList = ListUtil.page(pageNo - 1, pageSize, list);
+        pageResult.addAll(pageList);
+        return pageResult;
+    }
 }
diff --git a/...-history/src/main/java/com/zhangjiashuai/yyetshistory/repository/impl/ResourceMapper.java b/...-history/src/main/java/com/zhangjiashuai/yyetshistory/repository/impl/ResourceMapper.java
@@ -1,7 +1,6 @@
 package com.zhangjiashuai.yyetshistory.repository.impl;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.db.PageResult;
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,49 +13,30 @@
 @Mapper
 public interface ResourceMapper extends BaseMapper<ResourceDO>, ResourceRepository {
 
-    int DEFAULT_PAGE_SIZE = 20;
-
-    default PageResult<ResourceDO> selectPage(String name, int pageNo) {
-        return selectPage(name, pageNo, DEFAULT_PAGE_SIZE);
-    }
-
-    default PageResult<ResourceDO> selectPage(String name, int pageNo, int pageSize) {
-        long count = countByNameLike(name);
-        PageResult<ResourceDO> pageResult = new PageResult<>(pageNo, pageSize, (int)count);
-        if(count == 0) {
-            return pageResult;
-        }
-        List<ResourceDO> list = selectByNameLike(name);
-        List<ResourceDO> pageList = ListUtil.page(pageNo - 1, pageSize, list);
-        pageResult.addAll(pageList);
-        return pageResult;
+    static LambdaQueryWrapper<ResourceDO> queryWrapperByNameLike(String name) {
+        return Wrappers.<ResourceDO>lambdaQuery()
+                .like(ResourceDO::getName, name).orderByAsc(ResourceDO::getName);
     }
 
-    default long countByNameLike(String name) {
-        return selectCount(queryWrapperByNameLike(name));
+    default int countByNameLike(String name) {
+        return selectCount(queryWrapperByNameLike(name)).intValue();
     }
 
-    default List<ResourceDO> selectByNameLike(String name) {
+    default List<ResourceDO> findByNameLike(String name) {
         return selectList(queryWrapperByNameLike(name));
     }
 
-    default LambdaQueryWrapper<ResourceDO> queryWrapperByNameLike(String name) {
-        return Wrappers.<ResourceDO>lambdaQuery()
-                .like(ResourceDO::getName, name).orderByAsc(ResourceDO::getName);
-    }
-
     default ResourceDO findById(long id) {
         return selectById(id);
     }
 
-    default List<ResourceDO> findByName(String name) {
-        return selectList(Wrappers.<ResourceDO>lambdaQuery()
-                .eq(ResourceDO::getName, name));
-    }
-
     default ResourceDO findOneByName(String name) {
-        return selectOne(Wrappers.<ResourceDO>lambdaQuery()
+        List<ResourceDO> list = selectList(Wrappers.<ResourceDO>lambdaQuery()
                 .eq(ResourceDO::getName, name));
+        if(CollectionUtil.isEmpty(list)) {
+            return null;
+        }
+        return list.get(0);
     }
 
     default List<ResourceDO> findAll() {

diff --git a/.../main/java/com/zhangjiashuai/yyetshistory/repository/impl/ResourceRepositoryJdbcImpl.java b/.../main/java/com/zhangjiashuai/yyetshistory/repository/impl/ResourceRepositoryJdbcImpl.java
@@ -1,6 +1,6 @@
 package com.zhangjiashuai.yyetshistory.repository.impl;
 
-import cn.hutool.db.PageResult;
+import cn.hutool.core.collection.CollectionUtil;
 import com.zhangjiashuai.yyetshistory.entity.ResourceDO;
 import com.zhangjiashuai.yyetshistory.repository.ResourceRepository;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -10,9 +10,12 @@
 
 public class ResourceRepositoryJdbcImpl implements ResourceRepository {
 
-    private static final String BASE_SQL = "SELECT ID, URL, NAME, EXPIRE, EXPIRE_CST, DATA FROM resource";
+    private static final String BASE_SQL = "SELECT ID, URL, NAME, EXPIRE, EXPIRE_CST, DATA FROM RESOURCE";
+    private static final String BASE_COUNT_SQL = "SELECT COUNT(*) FROM RESOURCE";
     private static final String FIND_BY_ID_SQL = BASE_SQL + " WHERE ID = ?";
-    private static final String FIND_BY_NAME_SQL = BASE_SQL + " WHERE NAME like ?";
+    private static final String BY_NAME_CONDITION = " WHERE NAME like ?";
+    private static final String FIND_BY_NAME_SQL = BASE_SQL + BY_NAME_CONDITION;
+    private static final String COUNT_BY_NAME_SQL = BASE_COUNT_SQL + BY_NAME_CONDITION;
     private static final String FIND_ONE_BY_NAME_SQL = BASE_SQL + " WHERE NAME = ?";
 
     private JdbcTemplate jdbcTemplate;
@@ -27,15 +30,15 @@ public ResourceDO findById(long id) {
     }
 
     @Override
-    public List<ResourceDO> findByName(String name) {
+    public List<ResourceDO> findByNameLike(String name) {
         String nameFilter = "%" + name + "%";
         return jdbcTemplate.query(FIND_BY_NAME_SQL, new BeanPropertyRowMapper<>(ResourceDO.class), nameFilter);
     }
 
     @Override
     public ResourceDO findOneByName(String name) {
         List<ResourceDO> list = jdbcTemplate.query(FIND_ONE_BY_NAME_SQL, new BeanPropertyRowMapper<>(ResourceDO.class), name);
-        if(list.isEmpty()) {
+        if(CollectionUtil.isEmpty(list)) {
             return null;
         }
         return list.get(0);
@@ -47,17 +50,7 @@ public List<ResourceDO> findAll() {
     }
 
     @Override
-    public PageResult<ResourceDO> selectPage(String name, int pageNo) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public PageResult<ResourceDO> selectPage(String name, int pageNo, int pageSize) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long countByNameLike(String name) {
-        throw new UnsupportedOperationException();
+    public int countByNameLike(String name) {
+        return jdbcTemplate.queryForObject(COUNT_BY_NAME_SQL, Integer.class);
     }
 }
diff --git a/yyets-history/src/main/java/com/zhangjiashuai/yyetshistory/service/ResourceService.java b/yyets-history/src/main/java/com/zhangjiashuai/yyetshistory/service/ResourceService.java
@@ -11,7 +11,7 @@ public interface ResourceService {
 
     ResourceDO findById(long id);
 
-    List<ResourceDO> findByName(String name);
+    List<ResourceDO> findByNameLike(String name);
 
     ResourceDO findOneByName(String name);
 
@@ -23,7 +23,7 @@ public interface ResourceService {
 
     Resource getResourceById(long id);
 
-    List<Resource> getResourcesByName(String name);
+    List<Resource> getResourceByNameLike(String name);
 
     List<Resource> getAllResources();
 

diff --git a/...istory/src/main/java/com/zhangjiashuai/yyetshistory/service/impl/ResourceServiceImpl.java b/...istory/src/main/java/com/zhangjiashuai/yyetshistory/service/impl/ResourceServiceImpl.java
@@ -36,8 +36,8 @@ public ResourceDO findById(long id) {
     }
 
     @Override
-    public List<ResourceDO> findByName(String name) {
-        return resourceRepository.findByName(name);
+    public List<ResourceDO> findByNameLike(String name) {
+        return resourceRepository.findByNameLike(name);
     }
 
     @Override
@@ -153,8 +153,8 @@ public Resource getResourceById(long id) {
     }
 
     @Override
-    public List<Resource> getResourcesByName(String name) {
-        List<ResourceDO> resourceDOList = findByName(name);
+    public List<Resource> getResourceByNameLike(String name) {
+        List<ResourceDO> resourceDOList = findByNameLike(name);
         if (CollectionUtil.isEmpty(resourceDOList)) {
             return Collections.emptyList();
         }

diff --git a/yyets-history/src/main/resources/application-dev.yml b/yyets-history/src/main/resources/application-dev.yml
diff --git a/yyets-history/src/main/resources/application.yml b/yyets-history/src/main/resources/application.yml
@@ -1,6 +1,4 @@
 spring:
-  profiles:
-    active: dev
   datasource:
     driver-class-name: org.sqlite.JDBC
     url: jdbc:sqlite::resource:static/yyets.db
@@ -13,10 +11,11 @@ logging:
   level:
     root: info
   file:
-    name: /var/logs/yyets-history.log
+    name: logs/yyets-history.log
 mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 server:
   port: 9000
 yyets-history:

diff --git a/yyets-history/src/test/java/com/zhangjiashuai/yyetshistory/YyetsHistoryApplicationTests.java b/yyets-history/src/test/java/com/zhangjiashuai/yyetshistory/YyetsHistoryApplicationTests.java
@@ -33,7 +33,7 @@ class YyetsHistoryApplicationTests {
 
     @Test
     public void jdbcTemplateTest() {
-        List<ResourceDO> resources = resourceRepository.findByName("绝命律师");
+        List<ResourceDO> resources = resourceRepository.findByNameLike("绝命律师");
         Assert.notEmpty(resources);
     }