diff --git a/src/main/java/com/supervision/controller/SessionController.java b/src/main/java/com/supervision/controller/SessionController.java index 5594908..b153126 100644 --- a/src/main/java/com/supervision/controller/SessionController.java +++ b/src/main/java/com/supervision/controller/SessionController.java @@ -39,8 +39,8 @@ public class SessionController { @ApiOperation("分页获取会话列表") @GetMapping("querySessionPage") - public IPage querySessionPage(Integer pageSize, Integer pageNum) { - return irSessionService.querySessionPage(pageSize, pageNum); + public IPage querySessionPage(String sessionName, Integer pageSize, Integer pageNum) { + return irSessionService.querySessionPage(sessionName, pageSize, pageNum); } @ApiOperation("结束会话") @@ -55,5 +55,11 @@ public class SessionController { return irSessionService.querySessionHistory(sessionId); } + @ApiOperation("删除会话") + @DeleteMapping("deleteSession") + public void deleteSession(@NotBlank(message = "会话ID不能为空") String sessionId) { + irSessionService.deleteSession(sessionId); + } + } diff --git a/src/main/java/com/supervision/domain/IrSession.java b/src/main/java/com/supervision/domain/IrSession.java index 8f90518..cd53f1f 100644 --- a/src/main/java/com/supervision/domain/IrSession.java +++ b/src/main/java/com/supervision/domain/IrSession.java @@ -22,6 +22,11 @@ public class IrSession implements Serializable { @TableId private String id; + /** + * 会话名称,一般以案件号作为会话名称 + */ + private String sessionName; + /** * 会话状态(1进行中,2已结束) */ diff --git a/src/main/java/com/supervision/service/IrSessionService.java b/src/main/java/com/supervision/service/IrSessionService.java index 9a8c40a..978ded0 100644 --- a/src/main/java/com/supervision/service/IrSessionService.java +++ b/src/main/java/com/supervision/service/IrSessionService.java @@ -19,10 +19,12 @@ public interface IrSessionService extends IService { IrSession createNewSession(String caseNumber, Integer type, BigDecimal speed); - IPage querySessionPage(Integer pageSize, Integer pageNum); + IPage querySessionPage(String sessionName,Integer pageSize, Integer pageNum); void finishSession(FinishSessionVO finishSessionVO); List querySessionHistory(String sessionId); + void deleteSession(String sessionId); + } diff --git a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java index 35578c1..f15d4b4 100644 --- a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java +++ b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java @@ -2,6 +2,7 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -38,6 +39,7 @@ public class IrSessionServiceImpl extends ServiceImpl querySessionPage(Integer pageSize, Integer pageNum) { + public IPage querySessionPage(String sessionName, Integer pageSize, Integer pageNum) { UserInfo user = UserUtil.getUser(); - return this.lambdaQuery().eq(IrSession::getUserId, user.getId()).page(new Page<>(pageNum, pageSize)); + return this.lambdaQuery().like(StrUtil.isNotBlank(sessionName), IrSession::getSessionName, sessionName).eq(IrSession::getUserId, user.getId()).page(new Page<>(pageNum, pageSize)); } @Override @@ -85,6 +87,11 @@ public class IrSessionServiceImpl extends ServiceImpl querySessionHistory(String sessionId) { return irSessionHistoryService.lambdaQuery().eq(IrSessionHistory::getSessionId, sessionId).list(); } + + @Override + public void deleteSession(String sessionId) { + this.removeById(sessionId); + } }