排序优化 新增部分接口

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

@@ -1,9 +1,8 @@
 package com.slibra.web.controller.business;
 
-import com.google.protobuf.ByteString;
 import com.slibra.business.domain.TXinyiChatRecord;
+import com.slibra.business.domain.TXinyiWarningRecord;
 import com.slibra.business.mapper.*;
-import com.slibra.business.res.XinyiIndustrySimple;
 import com.slibra.business.service.IFrontService;
 import com.slibra.common.core.controller.BaseController;
 import com.slibra.common.core.domain.AjaxResult;
@@ -11,25 +10,12 @@ import com.slibra.common.core.page.TableDataInfo;
 import com.slibra.common.exception.ServiceException;
 import com.slibra.common.utils.SecurityUtils;
 import com.slibra.common.utils.StringUtils;
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.pytorch.serve.grpc.inference.InferenceAPIsServiceGrpc;
-import org.pytorch.serve.grpc.inference.PredictionResponse;
-import org.pytorch.serve.grpc.inference.PredictionsRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * 前端用户相关接口
  */
@@ -44,7 +30,10 @@ public class FrontController extends BaseController {
 
 
     @Autowired
-    private TXinyiChatRecordMapper tXinyiChatRecordMapper;
+    private TXinyiChatRecordMapper xinyiChatRecordMapper;
+
+    @Autowired
+    private TXinyiWarningRecordMapper xinyiWarningRecordMapper;
 
 
 
@@ -73,7 +62,7 @@ public class FrontController extends BaseController {
         Long userId = SecurityUtils.getUserId();
         tXinyiChatRecord.setUserId(String.valueOf(userId));
         startPage();
-        return getDataTable(tXinyiChatRecordMapper.selectTXinyiChatRecordFirstList(tXinyiChatRecord));
+        return getDataTable(xinyiChatRecordMapper.selectTXinyiChatRecordFirstList(tXinyiChatRecord));
     }
 
 
@@ -93,7 +82,7 @@ public class FrontController extends BaseController {
         //获取登录用户信息
         Long userId = SecurityUtils.getUserId();
         tXinyiChatRecord.setUserId(String.valueOf(userId));
-        return AjaxResult.success(tXinyiChatRecordMapper.selectTXinyiChatRecordList(tXinyiChatRecord));
+        return AjaxResult.success(xinyiChatRecordMapper.selectTXinyiChatRecordList(tXinyiChatRecord));
     }
 
 
@@ -138,7 +127,19 @@ public class FrontController extends BaseController {
 
 
 
-
+    //报警+预警记录列表 【水质报警  1生化报警 2预测报警】
+    /**
+     * 分页获取大模型的问答记录
+     * @param tXinyiWarningRecord
+     * @return
+     */
+    @GetMapping("/bigModel/warning/pageList")
+    public TableDataInfo warningPageList(TXinyiWarningRecord tXinyiWarningRecord)
+    {
+        log.info("进入了 分页获取大模型的问答记录 接口");
+        startPage();
+        return getDataTable(xinyiWarningRecordMapper.selectTXinyiWarningRecordList(tXinyiWarningRecord));
+    }
 
 
 

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
-        and del_flag = 0
+        and del_flag = 0 order by sort asc, id desc
     </select>
     
     <select id="selectTXinyiAgentAssistantById" parameterType="Long" resultMap="TXinyiAgentAssistantResult">

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

@@ -136,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hfxwnndAll != null  and hfxwnndAll != ''"> and HFXWNND_ALL = #{hfxwnndAll}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectTXinyiDailyByID" parameterType="Long" resultMap="TXinyiDailyResult">

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

@@ -128,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CLP04YCZ != null "> and CL_P04_YCZ = #{CLP04YCZ}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectTXinyiIndustryByID" parameterType="Long" resultMap="TXinyiIndustryResult">

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

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="twoQyad != null "> and TWO_QYAD = #{twoQyad}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectTXinyiLaboratoryByID" parameterType="Long" resultMap="TXinyiLaboratoryResult">

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

@@ -239,7 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ECCGTFHNKXXZ != null "> and ECCGTFHNKXXZ = #{ECCGTFHNKXXZ}</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
-        and del_flag = 0
+        and del_flag = 0 order by id desc
     </select>
     
     <select id="selectTXinyiNormConfigById" parameterType="Long" resultMap="TXinyiNormConfigResult">

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

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="EHHL != null "> and EHHL = #{EHHL}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
+        order by id desc
     </select>
     
     <select id="selectTXinyiPhosphorusByID" parameterType="Long" resultMap="TXinyiPhosphorusResult">

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

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sort != null  and sort != ''"> and sort = #{sort}</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
-        and del_flag = 0 order by id desc
+        and del_flag = 0 order by sort asc, id desc
     </select>
     
     <select id="selectTXinyiRecommendQaById" parameterType="Long" resultMap="TXinyiRecommendQaResult">

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

@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="JSLL != null "> and JSLL = #{JSLL}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
+        order by id desc
     </select>
     
     <select id="selectTXinyiRobotByID" parameterType="Long" resultMap="TXinyiRobotResult">

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

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="useRecommend != null "> and use_recommend = #{useRecommend}</if>
             <if test="revision != null "> and revision = #{revision}</if>
         </where>
-        and del_flag = 0
+        and del_flag = 0 order by id desc
     </select>
     
     <select id="selectTXinyiWarningRecordById" parameterType="Long" resultMap="TXinyiWarningRecordResult">