新增部分接口 问答调整

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

@@ -49,13 +49,13 @@ public class FrontController extends BaseController {
 
 
     /**
-     * 获取工业库的实时数据
+     * 获取大屏的实时数据 + 统计数据
      * @return
      */
     @GetMapping(value = "/realTimeData")
     public AjaxResult realTimeData()
     {
-        log.info("进入了获取实时工业库数据接口");
+        log.info("进入了 获取大屏的实时数据 + 统计数据 接口");
         return AjaxResult.success(frontService.countInfo());
     }
 
@@ -83,7 +83,7 @@ public class FrontController extends BaseController {
      * @return
      */
     @GetMapping("/bigmodel/qa/qaListBySessionId")
-    public List<TXinyiChatRecord> qaListBySessionId(TXinyiChatRecord tXinyiChatRecord)
+    public AjaxResult qaListBySessionId(TXinyiChatRecord tXinyiChatRecord)
     {
         String sessionId = tXinyiChatRecord.getSessionId();
         if(StringUtils.isBlank(sessionId))
@@ -91,10 +91,21 @@ public class FrontController extends BaseController {
         //获取登录用户信息
         Long userId = SecurityUtils.getUserId();
         tXinyiChatRecord.setUserId(String.valueOf(userId));
-        return tXinyiChatRecordMapper.selectTXinyiChatRecordList(tXinyiChatRecord);
+        return AjaxResult.success(tXinyiChatRecordMapper.selectTXinyiChatRecordList(tXinyiChatRecord));
     }
 
 
+    /**
+     *
+     * 获取报警统计信息接口
+     * @return
+     */
+    @GetMapping("/bigmodel/warningCount")
+    public AjaxResult warningCount()
+    {
+        log.info("进入了获取报警统计信息接口");
+        return AjaxResult.success(frontService.warningCount());
+    }
 
 
 

slibra-common/src/main/java/com/slibra/common/constant/MyConstants.java

@@ -9,4 +9,8 @@ public class MyConstants {
 
     //温度的范围  超过该温度表示夏季;没有超过表示冬季
     public static final String TEMPERATURE_VALUE = "12";
+
+
+    public static final String WARNING_TEMPLATE = "您有#个报警信息，请解决";
+    public static final String FORECAST_WARNING_TEMPLATE = "您有#个预警信息，请解决";
 }

slibra-common/src/main/java/com/slibra/common/utils/DateUtils.java

@@ -33,6 +33,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYYMMDDHHMM_TS = "yyyy/MM/dd HH:mm";
     public static String YYYYMMDDHH_TS = "yyyy/MM/dd HH";
     public static String YYYYMMDD_TS = "yyyy/MM/dd";
+    public static String YYYYMMDDHH_CHINESE = "yyyy年MM月dd日 HH";
 
     private static String[] parsePatterns = {
             "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 

slibra-framework/src/main/java/com/slibra/framework/config/SecurityConfig.java

@@ -123,6 +123,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage","/sendSmsCode/*","/smsLogin","/test/**", "/demo/**").permitAll()
                 .antMatchers("/websocket/**").permitAll()//websocket的
+                .antMatchers("/front/**").permitAll()//临时测试的
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

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

@@ -32,7 +32,7 @@ public class TXinyiChatRecord extends BaseEntity
 
     /** 类型（0问答 1决策） */
     @Excel(name = "类型", readConverterExp = "0=问答,1=决策")
-    private Long type;
+    private Integer type;
 
     /** 隶属哪个模块（0专家问答 1智能工单 2智能体助手） */
     @Excel(name = "隶属哪个模块", readConverterExp = "0=专家问答,1=智能工单,2=智能体助手")
@@ -60,7 +60,7 @@ public class TXinyiChatRecord extends BaseEntity
 
     /** 问答次数 */
     @Excel(name = "问答次数")
-    private Long counts;
+    private Integer counts;
 
     /** 是否使用搜索增强（0否 1是） */
     @Excel(name = "是否使用搜索增强", readConverterExp = "0=否,1=是")

slibra-system/src/main/java/com/slibra/business/mapper/TXinyiChatRecordMapper.java

@@ -1,5 +1,6 @@
 package com.slibra.business.mapper;
 
+import java.util.Collection;
 import java.util.List;
 import com.slibra.business.domain.TXinyiChatRecord;
 
@@ -69,4 +70,5 @@ public interface TXinyiChatRecordMapper
      * @return 信义大模型问答记录集合
      */
     public List<TXinyiChatRecord> selectTXinyiChatRecordFirstList(TXinyiChatRecord tXinyiChatRecord);
+
 }

slibra-system/src/main/java/com/slibra/business/mapper/TXinyiWarningRecordMapper.java

@@ -58,4 +58,6 @@ public interface TXinyiWarningRecordMapper
      * @return 结果
      */
     public int deleteTXinyiWarningRecordByIds(Long[] ids);
+
+    int getWarningCountByType(int type);
 }

slibra-system/src/main/java/com/slibra/business/res/XinyiIndustrySimple.java

@@ -16,6 +16,11 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 public class XinyiIndustrySimple {
 
+
+    @Excel(name = "化验时间-小时", readConverterExp = "yyyy年MM月dd日 HH:mm")
+    private String testHour;
+
+    @JsonIgnore
     /** 化验时间（2023/12/13 5:00:00格式的） */
     @Excel(name = "化验时间", readConverterExp = "2=023/12/13,5=:00:00格式的")
     private String testTime;

slibra-system/src/main/java/com/slibra/business/service/IFrontService.java

@@ -15,4 +15,6 @@ public interface IFrontService
 {
 
     XinyiIndustrySimple countInfo();
+
+    List<String> warningCount();
 }

slibra-system/src/main/java/com/slibra/business/service/impl/FrontServiceImpl.java

@@ -10,6 +10,7 @@ import com.slibra.business.domain.TXinyiNormConfig;
 import com.slibra.business.mapper.TXinyiDailyMapper;
 import com.slibra.business.mapper.TXinyiIndustryMapper;
 import com.slibra.business.mapper.TXinyiNormConfigMapper;
+import com.slibra.business.mapper.TXinyiWarningRecordMapper;
 import com.slibra.business.res.XinyiIndustrySimple;
 import com.slibra.business.service.IFrontService;
 import com.slibra.common.utils.DateUtils;
@@ -26,6 +27,9 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static com.slibra.common.constant.MyConstants.FORECAST_WARNING_TEMPLATE;
+import static com.slibra.common.constant.MyConstants.WARNING_TEMPLATE;
+
 
 @Service
 @Slf4j
@@ -40,6 +44,9 @@ public class FrontServiceImpl implements IFrontService {
     @Autowired
     private TXinyiNormConfigMapper tXinyiNormConfigMapper;
 
+    @Autowired
+    private TXinyiWarningRecordMapper xinyiWarningRecordMapper;
+
     @Override
     public XinyiIndustrySimple countInfo() {
         //查询基本的工业库数据
@@ -54,9 +61,24 @@ public class FrontServiceImpl implements IFrontService {
         this.addConfigData(xinyiIndustrySimple);
         //计算
         this.calculateData(xinyiIndustrySimple, nowTime);
+        //当前的小事数
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateUtils.YYYYMMDDHH_CHINESE);
+        xinyiIndustrySimple.setTestHour(formatter.format(nowTime) + ":00");//只要小时 但是要后面的:00
         return xinyiIndustrySimple;
     }
 
+    @Override
+    public List<String> warningCount() {
+        ArrayList<String> result = new ArrayList<>(2);
+        //获取告警的统计数量
+        int count = this.xinyiWarningRecordMapper.getWarningCountByType(1);
+        result.add(WARNING_TEMPLATE.replace("#", String.valueOf(count)));
+        //获取报警警的统计数量
+        count = this.xinyiWarningRecordMapper.getWarningCountByType(2);
+        result.add(FORECAST_WARNING_TEMPLATE.replace("#", String.valueOf(count)));
+        return result;
+    }
+
     private XinyiIndustrySimple calculateData(XinyiIndustrySimple xinyiIndustrySimple, LocalDateTime nowTime) {
         LocalDateTime yesterdaySameTime = nowTime.plusDays(-1);
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateUtils.YYYYMMDDHHMM_TS);

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

@@ -163,4 +163,7 @@
             #{id}
         </foreach>
     </delete>
+
+    <!-- 下面是手动新增的sql -->
+
 </mapper>

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

@@ -152,4 +152,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+
+    <!-- 下面是新增的 -->
+    <select id="getWarningCountByType"  resultType="int">
+        SELECT
+            COUNT(*)
+        FROM
+            t_xinyi_warning_record
+        WHERE
+            del_flag = 0
+          AND status = 0
+        <if test="type == 2">
+            AND type = 2
+        </if>
+        <if test="type != 2">
+            AND type != 2
+        </if>
+    </select>
 </mapper>