From 9b460ff33cb97af94ea6cbbd06f84cfea20c6dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Mon, 31 Aug 2020 09:46:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(link):=20=E5=88=86=E7=A6=BB=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E7=8A=B6=E6=80=81=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/celess/blog/controller/LinksController.java | 5 +++--
 src/main/java/cn/celess/blog/mapper/PartnerMapper.java       | 1 +
 src/main/java/cn/celess/blog/service/PartnerSiteService.java | 2 +-
 .../blog/service/serviceimpl/PartnerSiteServiceImpl.java     | 4 ++--
 src/main/resources/mapper/PartnerSiteMapper.xml              | 3 +++
 src/main/resources/sql/schema.sql                            | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/celess/blog/controller/LinksController.java b/src/main/java/cn/celess/blog/controller/LinksController.java
index 1375acc..f79c588 100644
--- a/src/main/java/cn/celess/blog/controller/LinksController.java
+++ b/src/main/java/cn/celess/blog/controller/LinksController.java
@@ -59,8 +59,9 @@ public class LinksController {
 
     @GetMapping("/admin/links")
     public Response all(@RequestParam("page") int page,
-                        @RequestParam("count") int count) {
-        return Response.success(partnerSiteService.partnerSitePages(page, count));
+                        @RequestParam("count") int count,
+                        @RequestParam(value = "deleted", required = false) Boolean deleted) {
+        return Response.success(partnerSiteService.partnerSitePages(page, count, deleted));
     }
 
     @PostMapping("/apply")
diff --git a/src/main/java/cn/celess/blog/mapper/PartnerMapper.java b/src/main/java/cn/celess/blog/mapper/PartnerMapper.java
index 4785ee5..c1c2de6 100644
--- a/src/main/java/cn/celess/blog/mapper/PartnerMapper.java
+++ b/src/main/java/cn/celess/blog/mapper/PartnerMapper.java
@@ -36,5 +36,6 @@ public interface PartnerMapper {
 
     List<PartnerSite> findAll();
 
+    List<PartnerSite> findAll(Boolean deleted);
 
 }
diff --git a/src/main/java/cn/celess/blog/service/PartnerSiteService.java b/src/main/java/cn/celess/blog/service/PartnerSiteService.java
index e76db4a..a0b4f69 100644
--- a/src/main/java/cn/celess/blog/service/PartnerSiteService.java
+++ b/src/main/java/cn/celess/blog/service/PartnerSiteService.java
@@ -45,7 +45,7 @@ public interface PartnerSiteService {
      * @param page  数据页
      * @return 分页数据
      */
-    PageData<PartnerSite> partnerSitePages(int page, int count);
+    PageData<PartnerSite> partnerSitePages(int page, int count, Boolean deleted);
 
     /**
      * 获取全部数据
diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java
index 0e790fe..7c79525 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java
@@ -123,9 +123,9 @@ public class PartnerSiteServiceImpl implements PartnerSiteService {
     }
 
     @Override
-    public PageData<PartnerSite> partnerSitePages(int page, int count) {
+    public PageData<PartnerSite> partnerSitePages(int page, int count, Boolean deleted) {
         PageHelper.startPage(page, count);
-        List<PartnerSite> sitePage = partnerMapper.findAll();
+        List<PartnerSite> sitePage = partnerMapper.findAll(deleted);
         PageInfo<PartnerSite> pageInfo = new PageInfo<PartnerSite>(sitePage);
         return new PageData<>(pageInfo, sitePage);
     }
diff --git a/src/main/resources/mapper/PartnerSiteMapper.xml b/src/main/resources/mapper/PartnerSiteMapper.xml
index b763e3d..4b625f2 100644
--- a/src/main/resources/mapper/PartnerSiteMapper.xml
+++ b/src/main/resources/mapper/PartnerSiteMapper.xml
@@ -78,6 +78,9 @@
     <select id="findAll" resultMap="partnerSiteResultMap">
         select *
         from links
+        <if test="_parameter != null">
+            where is_delete=#{deleted}
+        </if>
     </select>
 
 
diff --git a/src/main/resources/sql/schema.sql b/src/main/resources/sql/schema.sql
index d755609..fe1c62a 100644
--- a/src/main/resources/sql/schema.sql
+++ b/src/main/resources/sql/schema.sql
@@ -88,7 +88,7 @@ CREATE TABLE `links`
     `l_url`          varchar(255) unique                     not null comment '首页地址',
     `l_icon_path`    varchar(255)                            not null comment '友链的icon地址',
     `l_desc`         varchar(255) COLLATE utf8mb4_unicode_ci not null comment '友链的说明描述',
-    `is_delete`      boolean                                 not null default false comment '该数据是否被删除',
+    `is_delete`         boolean                                 not null default false comment '该数据是否被删除',
     `l_email`        varchar(255) comment '网站管理员的邮箱',
     `l_notification` boolean                                          default false comment '是否通知了'
 ) comment '友站表';