diff --git a/src/main/java/cc/ryanc/halo/service/LogsService.java b/src/main/java/cc/ryanc/halo/service/LogsService.java index f8698b2b8..1c5ce36d9 100644 --- a/src/main/java/cc/ryanc/halo/service/LogsService.java +++ b/src/main/java/cc/ryanc/halo/service/LogsService.java @@ -1,6 +1,7 @@ package cc.ryanc.halo.service; import cc.ryanc.halo.model.domain.Logs; +import cc.ryanc.halo.service.base.CrudService; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -15,7 +16,7 @@ import java.util.List; * @author : RYAN0UP * @date : 2018/1/19 */ -public interface LogsService { +public interface LogsService extends CrudService { /** * 保存日志 @@ -26,19 +27,6 @@ public interface LogsService { */ void save(String logTitle, String logContent, HttpServletRequest request); - /** - * 移除所有日志 - */ - void removeAll(); - - /** - * 查询所有日志并分页 - * - * @param pageable pageable - * @return Page - */ - Page findAll(Pageable pageable); - /** * 查询最新的五条日志 * diff --git a/src/main/java/cc/ryanc/halo/service/base/AbstractCrudService.java b/src/main/java/cc/ryanc/halo/service/base/AbstractCrudService.java index 6875b054f..f065f795b 100644 --- a/src/main/java/cc/ryanc/halo/service/base/AbstractCrudService.java +++ b/src/main/java/cc/ryanc/halo/service/base/AbstractCrudService.java @@ -179,5 +179,8 @@ public abstract class AbstractCrudService implements CrudService { void removeAll(@NonNull Collection domains); + void removeAll(); } diff --git a/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java index 57f0bf861..e27d013f7 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java @@ -3,8 +3,8 @@ package cc.ryanc.halo.service.impl; import cc.ryanc.halo.model.domain.Logs; import cc.ryanc.halo.repository.LogsRepository; import cc.ryanc.halo.service.LogsService; +import cc.ryanc.halo.service.base.AbstractCrudService; import cn.hutool.extra.servlet.ServletUtil; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -21,10 +21,15 @@ import java.util.List; * @date : 2018/1/19 */ @Service -public class LogsServiceImpl implements LogsService { +public class LogsServiceImpl extends AbstractCrudService implements LogsService { + + private final LogsRepository logsRepository; + + public LogsServiceImpl(LogsRepository logsRepository) { + super(logsRepository); + this.logsRepository = logsRepository; + } - @Autowired - private LogsRepository logsRepository; /** * 保存日志 @@ -42,25 +47,6 @@ public class LogsServiceImpl implements LogsService { logsRepository.save(logs); } - /** - * 移除所有日志 - */ - @Override - public void removeAll() { - logsRepository.deleteAll(); - } - - /** - * 查询所有日志并分页 - * - * @param pageable pageable - * @return Page - */ - @Override - public Page findAll(Pageable pageable) { - return logsRepository.findAll(pageable); - } - /** * 查询最新的五条日志 * diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java index 8da497d7f..3a7db1484 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java @@ -205,7 +205,7 @@ public class AdminController extends BaseController { */ @GetMapping(value = "/logs") public String logs(Model model, @PageableDefault Pageable pageable) { - final Page logs = logsService.findAll(pageable); + final Page logs = logsService.listAll(pageable); model.addAttribute("logs", logs); return "admin/widget/_logs-all"; }