Merge remote-tracking branch 'origin/file_Question' into file_Question

秦芳睿

2025-03-12 9d7ddee9fae205fbca1e6aff2893967079003671

 JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/javaai/qwen/agent/SMTQwenAgentDuckLastValue.java

@@ -200,7 +200,7 @@
         return false;

      }

      

      public SMTJavaAIError queryQualityValueMap(ASTDBMap dbMap, Map<String, DBRecord> r_mapQualKey2Rec) throws Exception

      public SMTJavaAIError queryQualityValueMap(ASTDBMap dbMap, SMTAIServerRequest tranReq, Map<String, DBRecord> r_mapQualKey2Rec) throws Exception

      {

         SQLXMLExecArg execArg = new SQLXMLExecArg();

         

@@ -209,6 +209,7 @@
            return error;

         

         SMTDatabase db = dbMap.getDatabase(_sqlxmlQueryQual._dsId);

         tranReq.traceLLMDebug(execArg._sbSQLText.toString());

         DBRecords recs = db.querySQL(execArg._sbSQLText.toString(), execArg._sqlParams.toArray(new Object[execArg._sqlParams.size()]));

         

         StringBuilder sbKey = new StringBuilder();

@@ -277,6 +278,7 @@
         

         // 查询所有设备

          SMTDatabase db = dbMap.getDatabase(_sqlxmlQueryDev._dsId);

          tranReq.traceLLMDebug(execArg._sbSQLText.toString());

          DBRecords recs = db.querySQL(execArg._sbSQLText.toString(), execArg._sqlParams.toArray(new Object[execArg._sqlParams.size()]));

          

          // 将设备加入列表

@@ -297,7 +299,7 @@
             Map<String, DBRecord> mapQualKey2Rec = new HashMap<>();



             // 查询当前指标下所有最新值

             if((error = qualInfo.queryQualityValueMap(dbMap, mapQualKey2Rec)) != null)

             if((error = qualInfo.queryQualityValueMap(dbMap, tranReq, mapQualKey2Rec)) != null)

                return error;

             

             // 遍历设备名称，把指标挂接上去