注释及相应log追加

src/main/java/com/sundata/internalevaluation/calc/calcUnit/DataSetCalcUnit.java

@@ -78,20 +78,19 @@ public class DataSetCalcUnit extends CalcUnit {
     @Override
     public List<CalcUnit> getSourceCalcUnits() {
         // TODO 获取源头节点
-        //DataSetConfigService dataSetService = SpringUtil.getBean(DataSetConfigService.class);
+        // 获取数据来源service对象
         DataSourcesService sourcesService = SpringUtil.getBean(DataSourcesService.class);
-        //dataSetService.getDataList(new DataSetConfigModel());
+        // 放入该数据集下的所有数据源对象
         List<DataSourcesModel> sourceList = new ArrayList<>();
         for (String s :dataSetConfigModel.getDataSourcesNos()) {
-            // sourceModel.setDataSourcesNo();
             DataSourcesModel model = sourcesService.selectDetailData(s);
             sourceList.add(model);
         }
 
+        // 所有源头节点
         List<CalcUnit> calcList = sourceList.stream().map(model ->
                 new DataSourcesCalcUnit(model.getDataSourcesNo(),model.getDataSourcesName(),CalcType.DATASOURCES,Map.of(),model)).collect(Collectors.toList());
-
-
+        // 返回结果
         return  calcList;
     }
 
@@ -127,12 +126,14 @@ public class DataSetCalcUnit extends CalcUnit {
     public void calc(final CalcResult<String, Object> thisResult, String calculateInstanceNumber,Map<String, Object> context, Map<CalcUnit, CalcResult<String, Object>> sourceResults) {
 
         // TODO 实际的计算过程
-        // AtomicReference<CalcResult<String, Object>> resultMap = new AtomicReference<>();
+        // 合并后结果集
         Map<String,Object> resultMap = new HashMap<>();
         // 合并数据集
         sourceResults.forEach((calcUnit,result)-> {
             resultMap.putAll(result);
         });
+        log.debug("合并后结果集结构：{}",resultMap);
+        // 合并数据集结果集放入
         thisResult.put(this.getCalcCode(),resultMap);
 
     }

src/main/java/com/sundata/internalevaluation/calc/calcUnit/DataSourcesCalcUnit.java

@@ -103,16 +103,6 @@ public class DataSourcesCalcUnit extends CalcUnit {
             allUnitList.addAll(queryList);
         }
         return allUnitList;
-
-        // 取得个配置信息
-//        List<DataSourcesModel> dataList = sourcesService.getDataList(new DataSourcesModel());
-//        List<CalcUnit> inputList = dataSourcesModel.getInputParam().stream().map(inputParam -> new InputParamCalcUnit(inputParam.getParamNo(),inputParam.getParamName(),CalcType.INPUTPARAM,Map.of(),inputParam)).collect(Collectors.toList());
-//        List<CalcUnit> queryList = dataSourcesModel.getQueryLogic().stream().map(queryParam -> new QueryLogicCalcUnit(queryParam.getDataItemName(),queryParam.getScriptDescription(),CalcType.QUERYLOGIC,Map.of(),queryParam)).collect(Collectors.toList());;
-//        List<CalcUnit> itemList = dataSourcesModel.getDataItemConfig().stream().map(itemParam -> new DataItemCalcUnit(itemParam.getDataItemNo(),itemParam.getDataItemName(),CalcType.DATAITEM,Map.of(),itemParam)).collect(Collectors.toList());
-//        inputList.addAll(queryList);
-//        inputList.addAll(itemList);
-
-        // return List.of();
     }
 
     /**
@@ -154,9 +144,6 @@ public class DataSourcesCalcUnit extends CalcUnit {
                     // 获取json
                     String json = result.get(calcUnit.getCalcCode()) instanceof String ? (String) result.get(calcUnit.getCalcCode()) : "";
                     List<Object>  parseList = JsonUtil.jsonToList(json);
-                    Map<Object, Object> objectObjectMap = new HashMap<>();
-//                    Map<Object, Object> objectObjectMap = objectObjectMap1
-//                            .entrySet().stream().collect(Collectors.toMap(entry ->"interface_"+entry.getKey(), Map.Entry::getValue));
                     // 结果封装
                     thisResult.put(this.getCalcCode(), parseList);
                 }

src/main/java/com/sundata/internalevaluation/calc/calcUnit/QueryLogicCalcUnit.java

@@ -6,6 +6,8 @@ import com.sundata.internalevaluation.calc.model.CalcUnit;
 import com.sundata.internalevaluation.calc.model.finals.CalcType;
 import com.sundata.internalevaluation.configuration.model.QueryLogicModel;
 import com.sundata.internalevaluation.script.TemplateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Map;
@@ -19,6 +21,8 @@ import java.util.Map;
  */
 public class QueryLogicCalcUnit extends CalcUnit {
 
+    private static final Logger log = LoggerFactory.getLogger(QueryLogicCalcUnit.class);
+
     final QueryLogicModel queryLogicModel;
     /**
      * 创建数据单元的绝对对象，对象必须包含如下参数
@@ -99,6 +103,7 @@ public class QueryLogicCalcUnit extends CalcUnit {
         String sqlTemplate = this.queryLogicModel.getSelectSqlScript();
         // 执行模板
         String sql = TemplateUtil.execute(this.getCalcCode(), sqlTemplate, context);
+        log.debug("替换模板后sql：",sql);
         // 查询本地数据库
         List<Map<String, Object>> maps = DBExecutor.doQueryMapList(sql);
         // 结果封装，数据项名做key