运营端相关接口编写

slibra-admin/src/main/java/com/slibra/web/controller/business/TXinyiChatRecordController.java

@@ -1,9 +1,14 @@
 package com.slibra.web.controller.business;
 
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
+
+import com.slibra.common.core.domain.entity.SysUser;
+import com.slibra.system.mapper.SysUserMapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -34,6 +39,9 @@ public class TXinyiChatRecordController extends BaseController
     @Autowired
     private ITXinyiChatRecordService tXinyiChatRecordService;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询信义大模型问答记录列表
      */
@@ -43,6 +51,9 @@ public class TXinyiChatRecordController extends BaseController
     {
         startPage();
         List<TXinyiChatRecord> list = tXinyiChatRecordService.selectTXinyiChatRecordList(tXinyiChatRecord);
+        //2024年7月1日14:43:48 额外出来2个关联的字段
+        if(!CollectionUtils.isEmpty(list))
+            this.addExtra(list);
         return getDataTable(list);
     }
 
@@ -55,10 +66,22 @@ public class TXinyiChatRecordController extends BaseController
     public void export(HttpServletResponse response, TXinyiChatRecord tXinyiChatRecord)
     {
         List<TXinyiChatRecord> list = tXinyiChatRecordService.selectTXinyiChatRecordList(tXinyiChatRecord);
+        if(!CollectionUtils.isEmpty(list))
+            this.addExtra(list);
         ExcelUtil<TXinyiChatRecord> util = new ExcelUtil<TXinyiChatRecord>(TXinyiChatRecord.class);
         util.exportExcel(response, list, "信义大模型问答记录数据");
     }
 
+    private void addExtra(List<TXinyiChatRecord> list) {
+        for (TXinyiChatRecord xinyiChatRecord : list) {
+            SysUser sysUser = this.sysUserMapper.selectUserById(Long.valueOf(xinyiChatRecord.getUserId()));
+            if(!Objects.isNull(sysUser)){
+                xinyiChatRecord.setUserName(sysUser.getUserName());
+                xinyiChatRecord.setPhonenumber(sysUser.getPhonenumber());
+            }
+        }
+    }
+
     /**
      * 获取信义大模型问答记录详细信息
      */

slibra-admin/src/main/java/com/slibra/web/controller/business/TXinyiWarningRecordController.java

@@ -1,9 +1,15 @@
 package com.slibra.web.controller.business;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
+
+import com.slibra.common.utils.DateUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -21,12 +27,15 @@ import com.slibra.business.service.ITXinyiWarningRecordService;
 import com.slibra.common.utils.poi.ExcelUtil;
 import com.slibra.common.core.page.TableDataInfo;
 
+import static com.slibra.common.constant.MyConstants.MAX_COUNT;
+
 /**
  * 信义告警记录Controller
  * 
  * @author slibra
  * @date 2024-05-17
  */
+@Slf4j
 @RestController
 @RequestMapping("/business/record")
 public class TXinyiWarningRecordController extends BaseController
@@ -43,6 +52,7 @@ public class TXinyiWarningRecordController extends BaseController
     {
         startPage();
         List<TXinyiWarningRecord> list = tXinyiWarningRecordService.selectTXinyiWarningRecordList(tXinyiWarningRecord);
+        handleWarningCounts(list);
         return getDataTable(list);
     }
 
@@ -55,6 +65,7 @@ public class TXinyiWarningRecordController extends BaseController
     public void export(HttpServletResponse response, TXinyiWarningRecord tXinyiWarningRecord)
     {
         List<TXinyiWarningRecord> list = tXinyiWarningRecordService.selectTXinyiWarningRecordList(tXinyiWarningRecord);
+        handleWarningCounts(list);
         ExcelUtil<TXinyiWarningRecord> util = new ExcelUtil<TXinyiWarningRecord>(TXinyiWarningRecord.class);
         util.exportExcel(response, list, "信义告警记录数据");
     }
@@ -103,4 +114,24 @@ public class TXinyiWarningRecordController extends BaseController
     {
         return toAjax(tXinyiWarningRecordService.deleteTXinyiWarningRecordByIds(ids));
     }
+
+
+    private void handleWarningCounts(List<TXinyiWarningRecord> tXinyiWarningRecords) {
+        if(!CollectionUtils.isEmpty(tXinyiWarningRecords)){
+            for (TXinyiWarningRecord tXinyiWarningRecord : tXinyiWarningRecords) {
+                Date endDate = null;
+                //判断类型 如果结束了 截止时间就是告警截止时间；  如果正在报警 截止时间就是当前时间
+                if(0 == tXinyiWarningRecord.getStatus() || 3 == tXinyiWarningRecord.getStatus())
+                    endDate = DateUtils.getNowDate();
+                else
+                    endDate = tXinyiWarningRecord.getOffTime();
+                //防止 之前程序处理错误  理论上不再报警了，一定有截止时间的
+                if(Objects.isNull(endDate)){
+                    log.error("xxxxxxxxx：之前处理告警结束的逻辑异常，没有更新截止时间");
+                    endDate = DateUtils.getNowDate();
+                }
+                tXinyiWarningRecord.setCounts(Math.min(DateUtils.differentHoursByMillisecond(tXinyiWarningRecord.getTime(), endDate) + 1, MAX_COUNT));
+            }
+        }
+    }
 }

slibra-system/src/main/java/com/slibra/business/domain/TXinyiChatRecord.java

@@ -81,5 +81,15 @@ public class TXinyiChatRecord extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
+    //2024年7月1日14:40:48 新增字段，运营端展示的
+
+    /** 用户账号 */
+    @Excel(name = "登录名称")
+    private String userName;
+
+    /** 手机号码 */
+    @Excel(name = "手机号码")
+    private String phonenumber;
+
 
 }

slibra-system/src/main/resources/mapper/business/TXinyiChatRecordMapper.xml

@@ -40,7 +40,7 @@
             <if test="module != null "> and module = #{module}</if>
             <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
             <if test="showVal != null  and showVal != ''"> and show_val = #{showVal}</if>
-            <if test="question != null  and question != ''"> and question = #{question}</if>
+            <if test="question != null  and question != ''"> and (question like concat('%', #{question}, '%') or show_val like concat('%', #{question}, '%'))</if>
             <if test="answer != null  and answer != ''"> and answer = #{answer}</if>
             <if test="warningId != null  and warningId != ''"> and warning_id = #{warningId}</if>
             <if test="counts != null "> and counts = #{counts}</if>

slibra-system/src/main/resources/mapper/business/TXinyiFeedbackMapper.xml

@@ -25,8 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTXinyiFeedbackVo"/>
         <where>
             1 = 1
-            <if test="description != null  and description != ''"> and description = #{description}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="description != null  and description != ''"> and description like concat('%', #{description}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
         and del_flag = 0 order by id desc

slibra-system/src/main/resources/mapper/business/TXinyiWarningRecordMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null "> and type = #{type}</if>
             <if test="category != null  and category != ''"> and category = #{category}</if>
             <if test="time != null "> and time = #{time}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+            <if test="reason != null  and reason != ''"> and reason like concat('%', #{reason}, '%')</if>
             <if test="warningVal != null "> and warning_val = #{warningVal}</if>
             <if test="designVal != null "> and design_val = #{designVal}</if>
             <if test="controlVal != null "> and control_val = #{controlVal}</if>