From 502c44850fd424136933b318c9eb15bd5c4b7664 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Tue, 13 Sep 2022 16:18:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/channel/OaReplyController.java | 10 ++++++--
 .../channel/IChannelOaReplyService.java       |  8 ++++++-
 .../impl/ChannelOaReplyServiceImpl.java       | 23 +++++++++++++++----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyController.java
index 890831ee..3c9bbacb 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyController.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/controller/channel/OaReplyController.java
@@ -1,7 +1,10 @@
 package com.mdd.admin.controller.channel;
 
+import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.mdd.admin.service.channel.IChannelOaReplyService;
 import com.mdd.common.core.AjaxResult;
+import com.mdd.common.validator.IDMustValidator;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -59,7 +62,8 @@ public class OaReplyController {
      * @return Object
      */
     @PostMapping("/edit")
-    public Object edit() {
+    public Object edit(@RequestBody Map<String, String> params) {
+        iChannelOaReplyService.edit(params);
         return AjaxResult.success();
     }
 
@@ -70,7 +74,9 @@ public class OaReplyController {
      * @return Object
      */
     @PostMapping("/del")
-    public Object del() {
+    public Object del(@RequestBody Map<String, String> params) {
+        Assert.notNull(params.get("id"), "id参数缺失");
+        iChannelOaReplyService.del(Integer.parseInt(params.get("id")));
         return AjaxResult.success();
     }
 
diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyService.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyService.java
index 24220dbe..bfd4db65 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyService.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/channel/IChannelOaReplyService.java
@@ -24,6 +24,12 @@ public interface IChannelOaReplyService {
      */
     void edit(Map<String, String> params);
 
-    void del();
+    /**
+     * 回复删除
+     *
+     * @author fzr
+     * @param id 主键
+     */
+    void del(Integer id);
 
 }
diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyServiceImpl.java
index 44362c5d..72417d83 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyServiceImpl.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/channel/impl/ChannelOaReplyServiceImpl.java
@@ -124,7 +124,7 @@ public class ChannelOaReplyServiceImpl implements IChannelOaReplyService {
                 officialReply.setStatus(Integer.parseInt(params.get("status")));
                 officialReply.setCreateTime(System.currentTimeMillis() / 1000);
                 officialReply.setUpdateTime(System.currentTimeMillis() / 1000);
-                officialReplyMapper.insert(officialReply);
+                officialReplyMapper.updateById(officialReply);
                 break;
             case 2:
                 Assert.notNull(params.get("name"), "规则名称不能为空");
@@ -143,7 +143,7 @@ public class ChannelOaReplyServiceImpl implements IChannelOaReplyService {
                 officialReply.setStatus(Integer.parseInt(params.get("status")));
                 officialReply.setCreateTime(System.currentTimeMillis() / 1000);
                 officialReply.setUpdateTime(System.currentTimeMillis() / 1000);
-                officialReplyMapper.insert(officialReply);
+                officialReplyMapper.updateById(officialReply);
                 break;
             case 3:
                 Assert.notNull(params.get("name"), "规则名称不能为空");
@@ -158,16 +158,31 @@ public class ChannelOaReplyServiceImpl implements IChannelOaReplyService {
                 officialReply.setStatus(Integer.parseInt(params.get("status")));
                 officialReply.setCreateTime(System.currentTimeMillis() / 1000);
                 officialReply.setUpdateTime(System.currentTimeMillis() / 1000);
-                officialReplyMapper.insert(officialReply);
+                officialReplyMapper.updateById(officialReply);
                 break;
             default:
                 throw new OperateException("不被支持的类型");
         }
     }
 
+    /**
+     * 回复删除
+     *
+     * @author fzr
+     * @param id 主键
+     */
     @Override
-    public void del() {
+    public void del(Integer id) {
+        OfficialReply officialReply =officialReplyMapper.selectOne(new QueryWrapper<OfficialReply>()
+                .eq("id", id)
+                .eq("is_delete", 0)
+                .last("limit 1"));
 
+        Assert.notNull(officialReply, "数据不存在!");
+
+        officialReply.setIsDelete(1);
+        officialReply.setDeleteTime(System.currentTimeMillis() / 1000);
+        officialReplyMapper.updateById(officialReply);
     }
 
 }