需求更改

main
liu 11 months ago
parent 8a3bed8ed8
commit ce4e804251

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.domain.IrSession;
import com.supervision.domain.IrSessionHistory;
import com.supervision.service.IrSessionService;
import com.supervision.vo.session.CreateAjResVO;
import com.supervision.vo.session.FinishSessionVO;
import com.supervision.vo.session.NewSessionReqVO;
import io.swagger.annotations.Api;
@ -27,6 +28,12 @@ public class SessionController {
private final IrSessionService irSessionService;
@ApiOperation("创建案件前,根据关键词查找案件ID或名称")
@GetMapping("queryAjBeforeCreatSession")
public List<CreateAjResVO> queryAjBeforeCreatSession(String keyword){
return irSessionService.queryAjBeforeCreatSession(keyword);
}
@ApiOperation("创建新的会话")
@PostMapping("createNewSession")
public IrSession createNewSession(@RequestBody NewSessionReqVO newSessionReqVO) {

@ -0,0 +1,13 @@
package com.supervision.mapper;
import com.supervision.vo.session.CreateAjResVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface RobotDataMapper {
List<CreateAjResVO> queryAjByAjidOrAjmc(@Param("ajid") Integer ajid, @Param("ajmc") String ajmc);
}

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.domain.IrSession;
import com.baomidou.mybatisplus.extension.service.IService;
import com.supervision.domain.IrSessionHistory;
import com.supervision.vo.session.CreateAjResVO;
import com.supervision.vo.session.FinishSessionVO;
import com.supervision.vo.session.NewSessionReqVO;
@ -18,6 +19,8 @@ import java.util.List;
*/
public interface IrSessionService extends IService<IrSession> {
List<CreateAjResVO> queryAjBeforeCreatSession(String keyword);
IrSession createNewSession(NewSessionReqVO newSessionReqVO);
IPage<IrSession> querySessionPage(String sessionName,Integer pageSize, Integer pageNum);

@ -1,6 +1,7 @@
package com.supervision.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
@ -12,19 +13,23 @@ import com.supervision.domain.IrSession;
import com.supervision.domain.IrSessionParam;
import com.supervision.domain.IrSqlParam;
import com.supervision.exception.BusinessException;
import com.supervision.mapper.RobotDataMapper;
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.CreateAjResVO;
import com.supervision.vo.session.FinishSessionVO;
import com.supervision.vo.session.NewSessionReqVO;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.supervision.domain.IrSessionHistory;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;
@ -43,6 +48,18 @@ public class IrSessionServiceImpl extends ServiceImpl<IrSessionMapper, IrSession
private final IrSessionParamService irSessionParamService;
@Resource
private RobotDataMapper robotDataMapper;
@Override
public List<CreateAjResVO> queryAjBeforeCreatSession(String keyword) {
Integer ajid = null;
if (NumberUtil.isNumber(keyword)) {
ajid = NumberUtil.parseInt(keyword);
}
return robotDataMapper.queryAjByAjidOrAjmc(ajid, keyword);
}
@Override
@Transactional(rollbackFor = Exception.class)
public IrSession createNewSession(NewSessionReqVO newSessionReqVO) {
@ -108,7 +125,7 @@ public class IrSessionServiceImpl extends ServiceImpl<IrSessionMapper, IrSession
@Override
public void deleteSession(List<String> sessionList) {
if (CollUtil.isEmpty(sessionList)){
if (CollUtil.isEmpty(sessionList)) {
throw new BusinessException("会话ID不能为空");
}
this.removeByIds(sessionList);

@ -0,0 +1,11 @@
package com.supervision.vo.session;
import lombok.Data;
@Data
public class CreateAjResVO {
private Integer ajid;
private String ajmc;
}

@ -5,12 +5,11 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
@ApiModel
public class NewSessionReqVO {
@ApiModelProperty("案件编号")
@ApiModelProperty("案件编号,对应上一个接口的ajid")
private String caseNumber;
@ApiModelProperty("播报方式(1语音 2文字)")
private Integer type;

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.supervision.mapper.RobotDataMapper">
<select id="queryAjByAjidOrAjmc" resultType="com.supervision.vo.session.CreateAjResVO">
select ajid, ajmc
from yxyc_robot_data.yxyc_case
where 1 = 1
<if test="ajid != null ">
and ajid = #{ajid} or ajmc like concat('%', #{ajmc}, '%')
</if>
<if test="ajid == null ">
and ajmc like concat('%', #{ajmc}, '%')
</if>
</select>
</mapper>
Loading…
Cancel
Save