diff --git a/src/main/java/com/supervision/controller/SessionController.java b/src/main/java/com/supervision/controller/SessionController.java index e316e77..b6ecd72 100644 --- a/src/main/java/com/supervision/controller/SessionController.java +++ b/src/main/java/com/supervision/controller/SessionController.java @@ -5,6 +5,7 @@ import com.supervision.domain.IrSession; import com.supervision.domain.IrSessionHistory; import com.supervision.service.IrSessionService; import com.supervision.vo.session.FinishSessionVO; +import com.supervision.vo.session.NewSessionReqVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,14 +28,9 @@ public class SessionController { private final IrSessionService irSessionService; @ApiOperation("创建新的会话") - @GetMapping("createNewSession") - @ApiImplicitParams({ - @ApiImplicitParam(name = "caseNumber", value = "案件编号", required = true, dataType = "String", paramType = "query"), - @ApiImplicitParam(name = "type", value = "播报方式(1语音 2文字)", required = true, dataType = "Integer", paramType = "query"), - @ApiImplicitParam(name = "speed", value = "播放速度(2位,小数后1位,例如:1.0,0.5,1.5,2.0)", required = true, dataType = "String", paramType = "query") - }) - public IrSession createNewSession(String caseNumber, Integer type, BigDecimal speed) { - return irSessionService.createNewSession(caseNumber, type, speed); + @PostMapping("createNewSession") + public IrSession createNewSession(@RequestBody NewSessionReqVO newSessionReqVO) { + return irSessionService.createNewSession(newSessionReqVO); } @ApiOperation("分页获取会话列表") @@ -61,9 +57,9 @@ public class SessionController { } @ApiOperation("删除会话记录") - @DeleteMapping("deleteSession") - public void deleteSession(@NotBlank(message = "会话ID不能为空") String sessionId) { - irSessionService.deleteSession(sessionId); + @PostMapping("deleteSession") + public void deleteSession(@NotBlank(message = "会话ID不能为空") @RequestBody List sessionList) { + irSessionService.deleteSession(sessionList); } diff --git a/src/main/java/com/supervision/service/IrSessionService.java b/src/main/java/com/supervision/service/IrSessionService.java index 978ded0..e2c2a9b 100644 --- a/src/main/java/com/supervision/service/IrSessionService.java +++ b/src/main/java/com/supervision/service/IrSessionService.java @@ -5,6 +5,7 @@ import com.supervision.domain.IrSession; import com.baomidou.mybatisplus.extension.service.IService; import com.supervision.domain.IrSessionHistory; import com.supervision.vo.session.FinishSessionVO; +import com.supervision.vo.session.NewSessionReqVO; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; @@ -17,7 +18,7 @@ import java.util.List; */ public interface IrSessionService extends IService { - IrSession createNewSession(String caseNumber, Integer type, BigDecimal speed); + IrSession createNewSession(NewSessionReqVO newSessionReqVO); IPage querySessionPage(String sessionName,Integer pageSize, Integer pageNum); @@ -25,6 +26,6 @@ public interface IrSessionService extends IService { List querySessionHistory(String sessionId); - void deleteSession(String sessionId); + void deleteSession(List sessionList); } diff --git a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java index f15d4b4..ede97f2 100644 --- a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java +++ b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java @@ -3,17 +3,23 @@ package com.supervision.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.config.domain.UserInfo; import com.supervision.domain.IrSession; +import com.supervision.domain.IrSessionParam; +import com.supervision.domain.IrSqlParam; import com.supervision.exception.BusinessException; import com.supervision.service.IrSessionHistoryService; +import com.supervision.service.IrSessionParamService; import com.supervision.service.IrSessionService; import com.supervision.mapper.IrSessionMapper; +import com.supervision.service.IrSqlParamService; import com.supervision.util.UserUtil; import com.supervision.vo.session.FinishSessionVO; +import com.supervision.vo.session.NewSessionReqVO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,16 +41,53 @@ public class IrSessionServiceImpl extends ServiceImpl sessionList) { + if (CollUtil.isEmpty(sessionList)){ + throw new BusinessException("会话ID不能为空"); + } + this.removeByIds(sessionList); } } diff --git a/src/main/java/com/supervision/vo/session/NewSessionReqVO.java b/src/main/java/com/supervision/vo/session/NewSessionReqVO.java new file mode 100644 index 0000000..231e36c --- /dev/null +++ b/src/main/java/com/supervision/vo/session/NewSessionReqVO.java @@ -0,0 +1,27 @@ +package com.supervision.vo.session; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +@ApiModel +public class NewSessionReqVO { + @ApiModelProperty("案件编号") + private String caseNumber; + @ApiModelProperty("播报方式(1语音 2文字)") + private Integer type; + @ApiModelProperty("播放速度(2位,小数后1位,例如:1.0,0.5,1.5,2.0)") + private BigDecimal speed; + @ApiModelProperty("交易用户名") + private String transactionUsername; + @ApiModelProperty("交易卡号") + private List transactionAccount; + @ApiModelProperty("交易证件号码") + private String transactionNumber; + + +}