mozhe
/
mental-health-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改启动报错

This commit is contained in:
jiangzhe 2024-04-25 17:17:36 +08:00
parent fce0409b25
commit a667873b06
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
View File

@ -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);
}

11
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/SysScalePublishController.java
View File

@ -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));
}
/**
* 删除量表发布
*

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScalePublishService.java
View File

@ -43,6 +43,8 @@ public interface ISysScalePublishService {
*/
Boolean updateByBo(SysScalePublishBo bo);
Boolean end(SysScalePublishBo bo);
/**
* 校验并批量删除量发布信息
*/

9
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java
View File

@ -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;
}
/**
* 保存前的数据校验
*/