From ac2b4d5602faa84d0b3d198e97bdb6a98969c38e Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Tue, 26 Mar 2024 11:35:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SessionController.java         | 12 ++---
 .../supervision/service/IrSessionService.java |  3 +-
 .../service/impl/IrSessionServiceImpl.java    | 51 +++++++++++++++++--
 .../vo/session/NewSessionReqVO.java           | 27 ++++++++++
 4 files changed, 80 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/com/supervision/vo/session/NewSessionReqVO.java

diff --git a/src/main/java/com/supervision/controller/SessionController.java b/src/main/java/com/supervision/controller/SessionController.java
index e316e77..3a71ff2 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("分页获取会话列表")
diff --git a/src/main/java/com/supervision/service/IrSessionService.java b/src/main/java/com/supervision/service/IrSessionService.java
index 978ded0..f10036d 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> {
 
-    IrSession createNewSession(String caseNumber, Integer type, BigDecimal speed);
+    IrSession createNewSession(NewSessionReqVO newSessionReqVO);
 
     IPage<IrSession> querySessionPage(String sessionName,Integer pageSize, Integer pageNum);
 
diff --git a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java
index f15d4b4..bbb8ab8 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<IrSessionMapper, IrSession
 
     private final IrSessionHistoryService irSessionHistoryService;
 
+    private final IrSessionParamService irSessionParamService;
+
     @Override
-    public IrSession createNewSession(String caseNumber, Integer type, BigDecimal speed) {
+    @Transactional(rollbackFor = Exception.class)
+    public IrSession createNewSession(NewSessionReqVO newSessionReqVO) {
+        if (StrUtil.isBlank(newSessionReqVO.getCaseNumber())) {
+            throw new BusinessException("案件编号不能为空");
+        }
         UserInfo user = UserUtil.getUser();
         IrSession irSession = new IrSession();
-        irSession.setSessionName("案件编号:" + caseNumber);
+        irSession.setSessionName("案件编号:" + newSessionReqVO.getCaseNumber());
         irSession.setSessionState(1);
         irSession.setUserId(user.getId());
-        irSession.setVideoSpeed(speed);
-        irSession.setBroadcastType(type);
+        irSession.setVideoSpeed(newSessionReqVO.getSpeed());
+        irSession.setBroadcastType(newSessionReqVO.getType());
         this.save(irSession);
+        IrSessionParam irSessionParam = new IrSessionParam();
+        irSessionParam.setSessionId(irSession.getId());
+        irSessionParam.setParamName("ajid");
+        irSessionParam.setParamValue(newSessionReqVO.getCaseNumber());
+        irSessionParam.setParamType("String");
+        irSessionParamService.save(irSessionParam);
+        // 保存交易卡号证件号以及用户名信息
+        if (StrUtil.isNotBlank(newSessionReqVO.getTransactionNumber())) {
+            IrSessionParam transactionNumberParam = new IrSessionParam();
+            transactionNumberParam.setSessionId(irSession.getId());
+            transactionNumberParam.setParamName("khrzjhm");
+            transactionNumberParam.setParamValue(newSessionReqVO.getCaseNumber());
+            transactionNumberParam.setParamType("String");
+            irSessionParamService.save(transactionNumberParam);
+        }
+        if (CollUtil.isNotEmpty(newSessionReqVO.getTransactionAccount())) {
+            IrSessionParam transactionNumberParam = new IrSessionParam();
+            transactionNumberParam.setSessionId(irSession.getId());
+            transactionNumberParam.setParamName("jykh");
+            transactionNumberParam.setParamValue(JSONUtil.toJsonStr(newSessionReqVO.getTransactionAccount()));
+            transactionNumberParam.setParamType("List");
+            irSessionParamService.save(transactionNumberParam);
+        }
+        if (StrUtil.isNotBlank(newSessionReqVO.getTransactionUsername())) {
+            IrSessionParam transactionNumberParam = new IrSessionParam();
+            transactionNumberParam.setSessionId(irSession.getId());
+            transactionNumberParam.setParamName("suspectName");
+            transactionNumberParam.setParamValue(newSessionReqVO.getTransactionUsername());
+            transactionNumberParam.setParamType("String");
+            irSessionParamService.save(transactionNumberParam);
+        }
         return irSession;
     }
 
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<String> transactionAccount;
+    @ApiModelProperty("交易证件号码")
+    private String transactionNumber;
+
+
+}

From ba4c3ae91b9935215153763059afa94c0fa32875 Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Tue, 26 Mar 2024 13:46:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/supervision/controller/SessionController.java | 6 +++---
 .../java/com/supervision/service/IrSessionService.java     | 2 +-
 .../com/supervision/service/impl/IrSessionServiceImpl.java | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/supervision/controller/SessionController.java b/src/main/java/com/supervision/controller/SessionController.java
index 3a71ff2..b6ecd72 100644
--- a/src/main/java/com/supervision/controller/SessionController.java
+++ b/src/main/java/com/supervision/controller/SessionController.java
@@ -57,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<String> 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 f10036d..e2c2a9b 100644
--- a/src/main/java/com/supervision/service/IrSessionService.java
+++ b/src/main/java/com/supervision/service/IrSessionService.java
@@ -26,6 +26,6 @@ public interface IrSessionService extends IService<IrSession> {
 
     List<IrSessionHistory> querySessionHistory(String sessionId);
 
-    void deleteSession(String sessionId);
+    void deleteSession(List<String> sessionList);
 
 }
diff --git a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java
index bbb8ab8..ede97f2 100644
--- a/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java
+++ b/src/main/java/com/supervision/service/impl/IrSessionServiceImpl.java
@@ -132,8 +132,11 @@ public class IrSessionServiceImpl extends ServiceImpl<IrSessionMapper, IrSession
     }
 
     @Override
-    public void deleteSession(String sessionId) {
-        this.removeById(sessionId);
+    public void deleteSession(List<String> sessionList) {
+        if (CollUtil.isEmpty(sessionList)){
+            throw new BusinessException("会话ID不能为空");
+        }
+        this.removeByIds(sessionList);
     }
 }