大表-小时维度数据处理

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

@@ -131,7 +131,7 @@ public class GRPCController extends BaseController {
             InferenceAPIsServiceGrpc.InferenceAPIsServiceBlockingStub stub = InferenceAPIsServiceGrpc.newBlockingStub(channel);
 //            dataJson = "{\"bot_id\":\"b00001\",\"exp_id\":\"721\",\"norm\":\"" + chatReq.getCategory() + "\",\"feedback\":" + feedback + ",\"simulate\":" + simulate + ",\"session_id\":" + "\"" + sessionId + "\"" + ",\"generate_args\":{\"max_new_tokens\":1024,\"max_length\":4096,\"num_beams\":1,\"do_sample\":true,\"top_p\":0.7,\"temperature\":0.95},\"extra\":{\"rows\":" +  rows + "}}";
             //2024年6月24日17:59:17  优化，不再拼接JSON字符串
-            dataJson = buildBigModelReqForDecision(chatReq, feedback, simulate, sessionId, decisionReqs, xinyiWarningRecord);
+            dataJson = buildBigModelReqForDecision(chatReq, feedback, simulate, sessionId, decisionReqs, xinyiWarningRecord, chatReq.getTopP(), chatReq.getTemperature());
             log.info("请求大模型的决策的参数为{}", dataJson);
             PredictionsRequest request = PredictionsRequest.newBuilder()
                     .setModelName("slibra_bot")
@@ -209,7 +209,7 @@ public class GRPCController extends BaseController {
         }
     }
 
-    private String buildBigModelReqForDecision(ChatReq chatReq, String feedback, String simulate, String sessionId, List<DecisionReq> decisionReqs, TXinyiWarningRecord xinyiWarningRecord) {
+    private String buildBigModelReqForDecision(ChatReq chatReq, String feedback, String simulate, String sessionId, List<DecisionReq> decisionReqs, TXinyiWarningRecord xinyiWarningRecord, Double topP, Double temperature) {
         PolicyReq policyReq = new PolicyReq();
         policyReq.setNorm(chatReq.getCategory());
         policyReq.setFeedback(StringUtils.isBlank(feedback) ? null : JSON.parseObject(feedback, Map.class));
@@ -217,7 +217,8 @@ public class GRPCController extends BaseController {
         policyReq.setSessionId(sessionId);
         //2024年7月5日13:24:10 temperature做区分
         GenerateArgs generateArgs = new GenerateArgs();
-        generateArgs.setTemperature(bigModelConfig.getTemperature());
+        generateArgs.setTemperature(Objects.isNull(temperature) ? bigModelConfig.getTemperature() : temperature);
+        generateArgs.setTopP(Objects.isNull(topP) ? bigModelConfig.getTopP() : topP);
         policyReq.setGenerateArgs(generateArgs);
         HashMap<String, Object> map = new HashMap<>();
         map.put("rows", decisionReqs);
@@ -422,7 +423,7 @@ public class GRPCController extends BaseController {
             InferenceAPIsServiceGrpc.InferenceAPIsServiceBlockingStub stub = InferenceAPIsServiceGrpc.newBlockingStub(channel);
 //            String dataJson = "{\"bot_id\":\"721\",\"exp_id\":\"721\",\"session_id\":\"" + sessionId + "\",\"use_rag\":\"true\",\"prompt\":\"你是LibraAI水务大模型，由红杉天枰开发的水务垂直大语言模型，能够提供水务行业专家问答、智能决策、报表分析、智能工单管理等一系列功能，作为水务人的AI助手，你会竭尽全力帮助我处理工作问题。\",\"history_dia\":" + JSON.toJSONString(historyDates) + ",\"generate_args\":{\"max_new_tokens\":2048,\"max_length\":4096,\"num_beams\":1,\"do_sample\":true,\"top_p\":0.7,\"temperature\":0.95},\"extra\":{ \"ip_address\": \"" + ipAddr  + "\" },\"strengthen\":" + (isStrong == 1) + "}";
             //2024年6月25日18:12:23 优化，不再使用拼接JSON字符串
-            String dataJson = buildBigModelReqForChat(sessionId, historyDates, ipAddr, isStrong);
+            String dataJson = buildBigModelReqForChat(sessionId, historyDates, ipAddr, isStrong, chatReq.getTopP(), chatReq.getTemperature());
             log.info("请求大模型的问答参数为{}", dataJson);
             PredictionsRequest request = PredictionsRequest.newBuilder()
                     .setModelName("slibra_bot")
@@ -478,13 +479,14 @@ public class GRPCController extends BaseController {
 //        return AjaxResult.success("ok");
     }
 
-    private String buildBigModelReqForChat(String sessionId, List<String> historyDates, String ipAddr, int isStrong) {
+    private String buildBigModelReqForChat(String sessionId, List<String> historyDates, String ipAddr, int isStrong, Double topP, Double temperature) {
         ChatRequest chatRequest = new ChatRequest();
         chatRequest.setSessionId(sessionId);
         chatRequest.setHistoryDia(historyDates);
         //2024年7月5日13:24:10 temperature做区分
         GenerateArgs generateArgs = new GenerateArgs();
-        generateArgs.setTemperature(bigModelConfig.getTemperature());
+        generateArgs.setTemperature(Objects.isNull(temperature) ? bigModelConfig.getTemperature() : temperature);
+        generateArgs.setTopP(Objects.isNull(topP) ? bigModelConfig.getTopP() : topP);
         chatRequest.setGenerateArgs(generateArgs);
         Map<String, Object> extra = new HashMap<>();
         extra.put("ip_address", ipAddr);

slibra-admin/src/main/resources/application-dev.yml

@@ -88,4 +88,5 @@ application:
 big-model:
   ip: 10.0.0.24
   port: 27070
-  temperature: 0.7
+  temperature: 0.7
+  topP: 0.7

slibra-admin/src/main/resources/application-local.yml

@@ -110,4 +110,5 @@ oss:
 big-model:
   ip: 10.0.0.24
   port: 27070
-  temperature: 0.7
+  temperature: 0.7
+  topP: 0.7

slibra-admin/src/main/resources/application-prod.yml

@@ -88,4 +88,5 @@ application:
 big-model:
   ip: 10.0.0.24
   port: 17070
-  temperature: 0.95
+  temperature: 0.95
+  topP: 0.7

slibra-admin/src/main/resources/application.yml

@@ -234,3 +234,4 @@ big-model:
   ip: 10.0.0.24
   port: 27070
   temperature: 0.7
+  topP: 0.7

slibra-common/src/main/java/com/slibra/common/config/BigModelConfig.java

@@ -26,5 +26,7 @@ public class BigModelConfig
 
     private Double temperature;
 
+    private Double topP;
+
 
 }

slibra-quartz/src/main/java/com/slibra/quartz/task/AsyncTask.java

@@ -108,11 +108,101 @@ public class AsyncTask {
     private void addBigTable(TXinyiIndustry tXinyiIndustry, TXinyiCalculate xinyiCalculate) {
         TXinyiBigTableHour xinyiBigTableHour = TXinyiBigTableHour.builder().build();
 
-        //todo  数据处理
+        //处理工业库的在线数据
+        this.addIndustry2BigTable(xinyiBigTableHour, tXinyiIndustry);
 
+        //处理计算的数据
+        this.addCalculate2BigTable(xinyiBigTableHour, xinyiCalculate);
+
+        //插入
         this.xinyiBigTableHourMapper.insertTXinyiBigTableHour(xinyiBigTableHour);
     }
 
+    private void addIndustry2BigTable(TXinyiBigTableHour xinyiBigTableHour, TXinyiIndustry tXinyiIndustry) {
+        xinyiBigTableHour.setGyJsCod(tXinyiIndustry.getJsCod());
+        xinyiBigTableHour.setGyJsPh(tXinyiIndustry.getJsPh());
+        xinyiBigTableHour.setGyJsSs(tXinyiIndustry.getJsSs());
+        xinyiBigTableHour.setGyJsTp(tXinyiIndustry.getJsTp());
+        xinyiBigTableHour.setGyJsTn(tXinyiIndustry.getJsTn());
+        xinyiBigTableHour.setGyJsNh3(tXinyiIndustry.getJsNh3());
+        xinyiBigTableHour.setGyJsSwPh(tXinyiIndustry.getJsSwPh());
+        xinyiBigTableHour.setGyJsBfyw(tXinyiIndustry.getJsBfyw());
+        xinyiBigTableHour.setGyCsSlqc(tXinyiIndustry.getCsSlqc());
+        xinyiBigTableHour.setGyCsCod(tXinyiIndustry.getCsCod());
+        xinyiBigTableHour.setGyCsPh(tXinyiIndustry.getCsPh());
+        xinyiBigTableHour.setGyCsSs(tXinyiIndustry.getCsSs());
+        xinyiBigTableHour.setGyCsTn(tXinyiIndustry.getCsTn());
+        xinyiBigTableHour.setGyCsTp(tXinyiIndustry.getCsTp());
+        xinyiBigTableHour.setGyCsNh3(tXinyiIndustry.getCsNh3());
+        xinyiBigTableHour.setGyOneHyzdDo(tXinyiIndustry.getOneHyzdDo());
+        xinyiBigTableHour.setGyOneHymdDo(tXinyiIndustry.getOneHymdDo());
+        xinyiBigTableHour.setGyTwoHyzdDo(tXinyiIndustry.getTwoHyzdDo());
+        xinyiBigTableHour.setGyTwoHymdDo(tXinyiIndustry.getTwoHymdDo());
+        xinyiBigTableHour.setGyOneMlss(tXinyiIndustry.getOneMlss());
+        xinyiBigTableHour.setGyTwoMlss(tXinyiIndustry.getTwoMlss());
+        xinyiBigTableHour.setGyJsTds(tXinyiIndustry.getJsTds());
+        xinyiBigTableHour.setGyJsSlq(tXinyiIndustry.getJsSlq());
+        xinyiBigTableHour.setGyNHlbOneGp(tXinyiIndustry.getNHlbOneGp());
+        xinyiBigTableHour.setGyNHlbTwoGp(tXinyiIndustry.getNHlbTwoGp());
+        xinyiBigTableHour.setGyNHlbThreeGp(tXinyiIndustry.getNHlbThreeGp());
+        xinyiBigTableHour.setGyNHlbFourGp(tXinyiIndustry.getNHlbFourGp());
+        xinyiBigTableHour.setGyNhlBFiveGp(tXinyiIndustry.getNhlBFiveGp());
+        xinyiBigTableHour.setGyNHlbSixGp(tXinyiIndustry.getNHlbSixGp());
+        xinyiBigTableHour.setGyWHlbOneGp(tXinyiIndustry.getWHlbOneGp());
+        xinyiBigTableHour.setGyWHlbTwoGp(tXinyiIndustry.getWHlbTwoGp());
+        xinyiBigTableHour.setGyWHlbThreeGp(tXinyiIndustry.getWHlbThreeGp());
+        xinyiBigTableHour.setGyWHlbFourGp(tXinyiIndustry.getWHlbFourGp());
+        xinyiBigTableHour.setGyWHlbFiveGp(tXinyiIndustry.getWHlbFiveGp());
+        xinyiBigTableHour.setGyFjOne(tXinyiIndustry.getFjOne());
+        xinyiBigTableHour.setGyFjTwo(tXinyiIndustry.getFjTwo());
+        xinyiBigTableHour.setGyFjThree(tXinyiIndustry.getFjThree());
+        xinyiBigTableHour.setGyFjFour(tXinyiIndustry.getFjFour());
+        xinyiBigTableHour.setGyFjFive(tXinyiIndustry.getFjFive());
+        xinyiBigTableHour.setGyFjSix(tXinyiIndustry.getFjSix());
+        xinyiBigTableHour.setGyKqllOne(tXinyiIndustry.getKqllOne());
+        xinyiBigTableHour.setGyKqllTwo(tXinyiIndustry.getKqllTwo());
+        xinyiBigTableHour.setGyKqllThree(tXinyiIndustry.getKqllThree());
+        xinyiBigTableHour.setGyKqllFour(tXinyiIndustry.getKqllFour());
+        xinyiBigTableHour.setGyKqllFive(tXinyiIndustry.getKqllFive());
+        xinyiBigTableHour.setGyKqllSix(tXinyiIndustry.getKqllSix());
+        xinyiBigTableHour.setGySjtyjly(tXinyiIndustry.getSJTYJLY());
+        xinyiBigTableHour.setGyCljyssll(tXinyiIndustry.getCLJYSSLL());
+        xinyiBigTableHour.setGyHycRjyAll(tXinyiIndustry.getHycRjyAll());
+        xinyiBigTableHour.setGyHycRjyZdAll(tXinyiIndustry.getHycRjyZdAll());
+        xinyiBigTableHour.setGyHycWnndAll(tXinyiIndustry.getHycWnndAll());
+        xinyiBigTableHour.setGyClP04Ycz(tXinyiIndustry.getCLP04YCZ());
+    }
+
+    private void addCalculate2BigTable(TXinyiBigTableHour xinyiBigTableHour, TXinyiCalculate xinyiCalculate) {
+        xinyiBigTableHour.setJsJsTdb(xinyiCalculate.getJsTdb());
+        xinyiBigTableHour.setJsJsTlb(xinyiCalculate.getJsTlb());
+        xinyiBigTableHour.setJsJsBodBCod(xinyiCalculate.getJsBodBCod());
+        xinyiBigTableHour.setJsYyqHrt(xinyiCalculate.getYyqHrt());
+        xinyiBigTableHour.setJsQyqHrt(xinyiCalculate.getQyqHrt());
+        xinyiBigTableHour.setJsHyqHrt(xinyiCalculate.getHyqHrt());
+        xinyiBigTableHour.setJsHfxwnndzb(xinyiCalculate.getHFXWNNDZB());
+        xinyiBigTableHour.setJsFM(xinyiCalculate.getFM());
+        xinyiBigTableHour.setJsGsls(xinyiCalculate.getGSLS());
+        xinyiBigTableHour.setJsGslsOne(xinyiCalculate.getGslsOne());
+        xinyiBigTableHour.setJsGslsTwo(xinyiCalculate.getGslsTwo());
+        xinyiBigTableHour.setJsXgsGsls(xinyiCalculate.getXgsGsls());
+        xinyiBigTableHour.setJsXlcscBmfh(xinyiCalculate.getXlcscBmfh());
+        xinyiBigTableHour.setJsXlcscHrt(xinyiCalculate.getXlcscHrt());
+        xinyiBigTableHour.setJsCccdcBmfh(xinyiCalculate.getCccdcBmfh());
+        xinyiBigTableHour.setJsCccdcHrt(xinyiCalculate.getCccdcHrt());
+        xinyiBigTableHour.setJsEccBmfh(xinyiCalculate.getEccBmfh());
+        xinyiBigTableHour.setJsEccHrt(xinyiCalculate.getEccHrt());
+        xinyiBigTableHour.setJsEccGtfh(xinyiCalculate.getEccGtfh());
+        xinyiBigTableHour.setJsClsnJcsj(xinyiCalculate.getClsnJcsj());
+        xinyiBigTableHour.setJsXgcdcQsqSsls(xinyiCalculate.getXgcdcQsqSsls());
+        xinyiBigTableHour.setJsWhlb(xinyiCalculate.getWHLB());
+        xinyiBigTableHour.setJsNhlb(xinyiCalculate.getNHLB());
+        xinyiBigTableHour.setJsWdscnl(xinyiCalculate.getWDSCNL());
+        xinyiBigTableHour.setJsQsb(xinyiCalculate.getQSB());
+        xinyiBigTableHour.setJsFcxsl(xinyiCalculate.getFCXSL());
+        xinyiBigTableHour.setJsFcxslbl(xinyiCalculate.getFCXSLBL());
+    }
+
     /**
      * 额外计算一下预测的准确度
      * @param tXinyiIndustry

slibra-system/src/main/java/com/slibra/business/req/ChatReq.java

@@ -1,5 +1,6 @@
 package com.slibra.business.req;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.slibra.business.domain.TXinyiChatRecord;
 import com.slibra.common.annotation.Excel;
@@ -107,6 +108,29 @@ public class ChatReq extends TXinyiChatRecord {
     /** 二沉池-正磷酸盐 + 化验机器人正磷化验有效值二沉池（正磷二沉池机器人） */
     private Boolean tpRccJqr = false;
 
+
+    //2024年7月5日17:12:06 新增参数 (方便前端调试获取结果)
+    private Double topP;
+
+    private Double temperature;
+
+
+    public Double getTopP() {
+        return topP;
+    }
+
+    public void setTopP(Double topP) {
+        this.topP = topP;
+    }
+
+    public Double getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(Double temperature) {
+        this.temperature = temperature;
+    }
+
     public String getFeedback() {
         return feedback;
     }

slibra-system/src/main/java/com/slibra/business/req/GenerateArgs.java

@@ -26,7 +26,7 @@ public class GenerateArgs {
     private boolean doSample = true;
 
     @JSONField(name = "top_p")
-    private double tooP = 0.7D;
+    private double topP = 0.7D;
 
     @JSONField(name = "temperature")
     private double temperature = 0.95D;