add:大模型，调整字段，查询排序等

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInvokeServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.google.common.collect.Lists;
 import com.hnac.hzims.bigmodel.business.dto.RunReportAnalyseRequest;
 import com.hnac.hzims.bigmodel.business.feign.IAuthClient;
-import com.hnac.hzims.bigmodel.business.dto.RunReportDataAnalyseDTO;
 import com.hnac.hzims.bigmodel.configuration.BigModelInvokeApi;
 import com.hnac.hzims.bigmodel.interactive.service.IHznlmInvokeService;
 import com.hnac.hzims.bigmodel.interactive.vo.AnswerVO;
@@ -21,6 +20,7 @@ import com.hnac.hzinfo.exception.HzServiceException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -51,10 +52,11 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
 
     @Override
     public void ask(String question, String sessionId, String userId) {
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
-        params.put("chat_id",sessionId);
+        params.put("chat_id", sessionId);
         params.put("user_id", userId);
-        params.put("query",question);
+        params.put("query", question);
+        params.put("q_id", UUID.randomUUID());
         Map<String, String[]> authDataIds = this.getAuthDataIds(userId);
         params.putAll(authDataIds);
         RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantAsk(), params);
@@ -69,30 +71,34 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
 
     @Override
     public void specialAsk(String sessionId, String userId, Map<String, Object> extra) {
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
-        params.put("chat_id",sessionId);
+        params.put("chat_id", sessionId);
         params.put("user_id", userId);
-        params.put("extra",extra);
+        params.put("extra", extra);
+        params.put("q_id", UUID.randomUUID());
         Map<String, String[]> authDataIds = this.getAuthDataIds(userId);
         params.putAll(authDataIds);
-        log.info("调用大模型接口：{},传参为：{}",gglmUrl + bigModelInvokeApi.getAssistantSpecialAsk(),JSON.toJSONString(params));
+        log.info("调用大模型接口：{},传参为：{}", gglmUrl + bigModelInvokeApi.getAssistantSpecialAsk(), JSON.toJSONString(params));
         RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantSpecialAsk(), params);
         sessionRedisManager.addSessionId(sessionId);
     }
 
     @Override
     public void specialAsk(QuestionDTO question) {
-        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantSpecialAsk(), JSON.toJSONString(question));
+        Map<String, Object> questionMap = JsonUtil.toMap(JSON.toJSONString(question));
+        questionMap.put("q_id", UUID.randomUUID());
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantSpecialAsk(), JSON.toJSONString(questionMap));
         sessionRedisManager.addSessionId(question.getChatId());
     }
 
     @Override
     public void knowledgeAsk(String question, String sessionId, String userId, String knowledge) {
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         params.put("chat_id", sessionId);
         params.put("user_id", userId);
         params.put("query", question);
         params.put("knowledge", knowledge);
+        params.put("q_id", UUID.randomUUID());
         Map<String, String[]> authDataIds = this.getAuthDataIds(userId);
         params.putAll(authDataIds);
         RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantKnowledgeAsk(), params);
@@ -101,13 +107,17 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
 
     @Override
     public void knowledgeAsk(QuestionDTO question) {
-        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantKnowledgeAsk(), JSON.toJSONString(question));
+        Map<String, Object> questionMap = JsonUtil.toMap(JSON.toJSONString(question));
+        questionMap.put("q_id", UUID.randomUUID());
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantKnowledgeAsk(), JSON.toJSONString(questionMap));
         sessionRedisManager.addSessionId(question.getChatId());
     }
 
     @Override
     public void analyseAsk(QuestionDTO question) {
-        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantAnalyseAsk(), JSON.toJSONString(question));
+        Map<String, Object> questionMap = JsonUtil.toMap(JSON.toJSONString(question));
+        questionMap.put("q_id", UUID.randomUUID());
+        RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantAnalyseAsk(), JSON.toJSONString(questionMap));
         sessionRedisManager.addSessionId(question.getChatId());
     }
 
@@ -121,8 +131,8 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
 
     @Override
     public void askAbort(String sessionId) {
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
-        params.put("chat_id",sessionId);
+        params.put("chat_id", sessionId);
         RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAskAbort(), params);
         sessionRedisManager.removeSessionId(sessionId);
     }
@@ -131,73 +141,74 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
         this.askAbort(sessionId);
         // 循环获取该会话ID中断状态，当状态等于-2或重连超6次则中断返回结果
         int status = 999;
-        int attempts  = 0;
+        int attempts = 0;
         while (status > 0) {
             // 若重连超过10次 则抛出错误
-            if(attempts  >= 8) {
+            if (attempts >= 8) {
                 throw new HzServiceException("中断失败！长时间未获取到中断状态");
             }
             List<AnswerVO> answers = this.getAnswerBySessionIds(sessionId);
-            if(Func.isNotEmpty(answers)) {
+            if (Func.isNotEmpty(answers)) {
-                log.info(answers.get(0).getStatus()+"");
+                log.info(answers.get(0).getStatus() + "");
                 status = answers.get(0).getStatus();
             }
             // 若获取到的状态不等于2 则延时0.5秒
-            if(status > 0) {
+            if (status > 0) {
                 try {
                     Thread.sleep(500);
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
                 }
             }
-            attempts ++;
+            attempts++;
         }
     }
 
     @Override
     public void smartReportGeneratePower(RunReportAnalyseRequest req) {
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         String sessionId = IdWorker.get32UUID();
-        params.put("chat_id",sessionId);
+        params.put("chat_id", sessionId);
         params.put("user_id", CommonConstant.SYSTEM_USER.toString());
         params.put("data", req.getAnalyseDTOS());
         params.put("query", "");
         RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getSmartReportGeneratePower(), params);
         // 将sessionId存入redis，拿到数据之后输入月报中
         JSONObject report = new JSONObject();
-        report.put("stationCode",req.getStationCode());
+        report.put("stationCode", req.getStationCode());
-        report.put("month",req.getMonth());
+        report.put("month", req.getMonth());
-        report.put("sessionId",sessionId);
+        report.put("sessionId", sessionId);
-        redisTemplate.opsForList().leftPush(RedisKeyConstants.RUN_REPORT_SESSION_ID,JSON.toJSONString(report));
+        redisTemplate.opsForList().leftPush(RedisKeyConstants.RUN_REPORT_SESSION_ID, JSON.toJSONString(report));
-        redisTemplate.expire(RedisKeyConstants.RUN_REPORT_SESSION_ID,5, TimeUnit.MINUTES);
+        redisTemplate.expire(RedisKeyConstants.RUN_REPORT_SESSION_ID, 5, TimeUnit.MINUTES);
     }
 
     @Override
     public void updateKnowledge(String name) {
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
-        params.put("name",name);
+        params.put("name", name);
         RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getUpdateKnowledge(), params);
     }
 
     @Override
     public List hotQuestions() {
         try {
-            return RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getHotQuestion(), null, new TypeReference<List<String>>(){});
+            return RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getHotQuestion(), null, new TypeReference<List<String>>() {
-        }
+            });
-        catch (Exception e) {
+        } catch (Exception e) {
-            log.error("An error occurred",e);
+            log.error("An error occurred", e);
             return Lists.newArrayList();
         }
     }
 
     @Override
     public List<AnswerVO> getAnswerBySessionIds(String sessionIds) {
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
-        params.put("chat_ids",Func.toStrList(",",sessionIds).toArray());
+        params.put("chat_ids", Func.toStrList(",", sessionIds).toArray());
-        return RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantStatus(), params, new TypeReference<List<AnswerVO>>(){});
+        return RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getAssistantStatus(), params, new TypeReference<List<AnswerVO>>() {
+        });
     }
 
-    private Map<String,String[]> getAuthDataIds(String userId) {
+    private Map<String, String[]> getAuthDataIds(String userId) {
         Map<String, String[]> result = new HashMap<>(2);
         R<Map<String, String[]>> authDataR = authClient.getAuthData(userId);
         result.putAll(authDataR.getData());

hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/service/impl/AgentLogServiceImpl.java

@@ -65,8 +65,8 @@ public class AgentLogServiceImpl extends ServiceImpl<AgentLogMapper, AgentLogEnt
                 .eq(ObjectUtil.isNotEmpty(req.getId()), AgentLogEntity::getId, req.getId())
                 .eq(ObjectUtil.isNotEmpty(req.getChatId()), AgentLogEntity::getChatId, req.getChatId())
                 .eq(ObjectUtil.isNotEmpty(req.getQId()), AgentLogEntity::getQId, req.getQId())
-                .eq(ObjectUtil.isNotEmpty(req.getModelName()), AgentLogEntity::getModelName, req.getModelName())
+                .like(ObjectUtil.isNotEmpty(req.getModelName()), AgentLogEntity::getModelName, req.getModelName())
-                .orderByDesc(AgentLogEntity::getCreateTime)
+                .orderByAsc(AgentLogEntity::getCreateTime)
                 .orderByAsc(AgentLogEntity::getChatId);
         return this.page(page, queryWrapper);
     }

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StartStopScheduledTask.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Date;
 
-import static com.hnac.hzims.operational.main.constant.ScheduledConstant.START_STOP_TIME_RECORD;
+//import static com.hnac.hzims.operational.main.constant.ScheduledConstant.START_STOP_TIME_RECORD;
 import static com.hnac.hzims.operational.main.constant.ScheduledConstant.THIS_DAY_START_STOP_RECORD;
 
 
@@ -44,7 +44,7 @@ public class StartStopScheduledTask {
     /**
      * 设备开停机时间记录
      */
-    @XxlJob(START_STOP_TIME_RECORD)
+    //@XxlJob(START_STOP_TIME_RECORD)
     //@Scheduled(cron = "0/40 * * * * ? ")
     public ReturnT<String> startStopTimeRecord() {
         String param = "";