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;
 
 /**
@@ -55,6 +56,7 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
         params.put("chat_id", sessionId);
         params.put("user_id", userId);
         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);
@@ -73,6 +75,7 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
         params.put("chat_id", sessionId);
         params.put("user_id", userId);
         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));
@@ -82,7 +85,9 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
 
     @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());
     }
 
@@ -93,6 +98,7 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
         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());
     }
 
@@ -182,9 +192,9 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
     @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);
             return Lists.newArrayList();
         }
@@ -194,7 +204,8 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService {
     public List<AnswerVO> getAnswerBySessionIds(String sessionIds) {
         Map<String, Object> params = new HashMap<>();
         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) {

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 = "";