From a667873b06a9d48f335eae4004d66a03fe46830c Mon Sep 17 00:00:00 2001
From: jiangzhe <244140623@qq.com>
Date: Thu, 25 Apr 2024 17:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/web/controller/AuthController.java    | 11 -----------
 .../scale/controller/SysScalePublishController.java   | 11 +++++++++++
 .../scale/service/ISysScalePublishService.java        |  2 ++
 .../service/impl/SysScalePublishServiceImpl.java      |  9 +++++++++
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index ce3dd2c..37ad1c9 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -14,8 +14,6 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.dromara.system.domain.SysClient;
 import org.dromara.system.service.ISysClientService;
 import org.dromara.web.domain.vo.LoginVo;
@@ -28,9 +26,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 /**
  * 认证
  *
@@ -47,7 +42,6 @@ public class AuthController {
     private final SysLoginService loginService;
     private final SysRegisterService registerService;
     private final ISysClientService clientService;
-    private final ScheduledExecutorService scheduledExecutorService;
 
 
     /**
@@ -74,11 +68,6 @@ public class AuthController {
         }
         // 登录
         LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
-
-        Long userId = LoginHelper.getUserId();
-        scheduledExecutorService.schedule(() -> {
-            WebSocketUtils.sendMessage(userId, "欢迎登录RuoYi-Vue-Plus后台管理系统");
-        }, 3, TimeUnit.SECONDS);
         return R.ok(loginVo);
     }
 
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
index aa5927c..0efecbe 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
@@ -89,6 +89,17 @@ public class SysScalePublishController extends BaseController {
         return toAjax(sysScalePublishService.updateByBo(bo));
     }
 
+    /**
+     * 中止记录
+     *
+     * @param bo
+     * @return
+     */
+    @PostMapping("/end")
+    public R<Void> end(@RequestBody SysScalePublishBo bo) {
+        return toAjax(sysScalePublishService.end(bo));
+    }
+
     /**
      * 删除量表发布
      *
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java
index ef9031a..29d87c4 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java
@@ -43,6 +43,8 @@ public interface ISysScalePublishService {
      */
     Boolean updateByBo(SysScalePublishBo bo);
 
+    Boolean end(SysScalePublishBo bo);
+
     /**
      * 校验并批量删除量发布信息
      */
diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java
index 0395380..3bc5419 100644
--- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java
+++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java
@@ -15,6 +15,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.redis.utils.QueueUtils;
+import org.dromara.scale.constant.StatusEnum;
 import org.dromara.scale.domain.SysScalePublish;
 import org.dromara.scale.domain.bo.BaseQueryBo;
 import org.dromara.scale.domain.bo.SysScalePublishBo;
@@ -140,6 +141,14 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService {
         return baseMapper.updateById(update) > 0;
     }
 
+    @Override
+    public Boolean end(SysScalePublishBo bo) {
+        SysScalePublish update = new SysScalePublish();
+        update.setBatchNo(bo.getBatchNo());
+        update.setStatus(StatusEnum.DISABLED.getValue());
+        return baseMapper.updateById(update) > 0;
+    }
+
     /**
      * 保存前的数据校验
      */