Merge remote-tracking branch 'origin/master'

src/main/java/com/sundata/internalevaluation/calc/calcUnit/DateItemCalcUnit.java → src/main/java/com/sundata/internalevaluation/calc/calcUnit/DataItemCalcUnit.java

@@ -3,6 +3,7 @@ package com.sundata.internalevaluation.calc.calcUnit;
 import com.sundata.internalevaluation.calc.model.CalcResult;
 import com.sundata.internalevaluation.calc.model.CalcUnit;
 import com.sundata.internalevaluation.calc.model.finals.CalcType;
+import com.sundata.internalevaluation.configuration.model.DataItemConfigModel;
 
 import java.util.List;
 import java.util.Map;
@@ -14,7 +15,10 @@ import java.util.Map;
  * @date 2025-02-12 10:43:38
  * @description: 数据项计算单元
  */
-public class DateItemCalcUnit extends CalcUnit {
+public class DataItemCalcUnit extends CalcUnit {
+
+    final DataItemConfigModel dataItemConfigModel;
+
     /**
      * 创建数据单元的绝对对象，对象必须包含如下参数
      *
@@ -23,8 +27,9 @@ public class DateItemCalcUnit extends CalcUnit {
      * @param calcType    计算类型
      * @param initContext 计算单元初始化参数
      */
-    public DateItemCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext) {
+    public DataItemCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext, DataItemConfigModel dataItemConfigModel) {
         super(calcCode, calcName, calcType, initContext);
+        this.dataItemConfigModel= dataItemConfigModel;
     }
 
     /**

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

@@ -3,9 +3,12 @@ package com.sundata.internalevaluation.calc.calcUnit;
 import com.sundata.internalevaluation.calc.model.CalcResult;
 import com.sundata.internalevaluation.calc.model.CalcUnit;
 import com.sundata.internalevaluation.calc.model.finals.CalcType;
+import com.sundata.internalevaluation.configuration.model.DataSourcesModel;
+import com.sundata.internalevaluation.configuration.service.DataSourcesService;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Created by IntelliJ IDEA.
@@ -14,7 +17,14 @@ import java.util.Map;
  * @date 2025-02-12 10:46:08
  * @description: 数据来源计算单元
  */
+
 public class DataSourcesCalcUnit extends CalcUnit {
+
+    DataSourcesService dataSourcesService;
+
+    final DataSourcesModel dataSourcesModel;
+
+
     /**
     /**
      * 创建数据单元的绝对对象，对象必须包含如下参数
@@ -24,10 +34,18 @@ public class DataSourcesCalcUnit extends CalcUnit {
      * @param calcType    计算类型
      * @param initContext 计算单元初始化参数
      */
-    public DataSourcesCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext) {
+    public DataSourcesCalcUnit(String calcCode, String calcName,CalcType calcType, Map<String, Object> initContext,
+                               DataSourcesModel dataSourcesModel, DataSourcesService dataSourcesService) {
         super(calcCode, calcName, calcType, initContext);
+
+        // this.dataItemConfigModel = dataItemConfigModel;
+        this.dataSourcesModel = dataSourcesModel;
+        this.dataSourcesService= dataSourcesService;
+
     }
 
+
+
     /**
      * 判断是否已经计算过数据了
      *
@@ -57,6 +75,17 @@ public class DataSourcesCalcUnit extends CalcUnit {
      */
     @Override
     public List<CalcUnit> getSourceCalcUnits() {
+
+        // 取得个配置信息
+        List<DataSourcesModel> dataList = dataSourcesService.getDataList(new DataSourcesModel());
+        for (DataSourcesModel model : dataList) {
+            List<CalcUnit> inputList = model.getInputParam().stream().map(inputParam ->
+                    new InputParamCalcUnit(inputParam.getParamNo(),inputParam.getParamName(),CalcType.INPUTPARAM,Map.of(),inputParam)).collect(Collectors.toList());
+            List<CalcUnit> queryList = model.getQueryLogic().stream().map(queryParam -> new QueryLogicCalcUnit(queryParam.getQueryLogicNo(),queryParam.getScriptDescription(),CalcType.QUERYLOGIC,Map.of(),queryParam)).collect(Collectors.toList());;
+
+        }
+//        return dataList.stream().map(sourceModel -> new DataSourcesCalcUnit(sourceModel.getDataSourcesNo(),
+//                sourceModel.getDataSourcesName(),CalcType.DATASOURCES,Map.of(),sourceModel)).collect(Collectors.toList());
         return List.of();
     }
 
@@ -89,7 +118,28 @@ public class DataSourcesCalcUnit extends CalcUnit {
      * @param sourceResults           源头计算节点的结果
      */
     @Override
-    public void calc(CalcResult<String, Object> thisResult, String calculateInstanceNumber, Map<String, Object> context, Map<CalcUnit, CalcResult<String, Object>> sourceResults) {
+    public  void calc(CalcResult<String, Object> thisResult, String calculateInstanceNumber, Map<String, Object> context, Map<CalcUnit, CalcResult<String, Object>> sourceResults) {
+
+
+        if (dataSourcesModel.getDataSourcesType().equals("1")) {
+            // 数据来源类型为接口时处理逻辑
+        } else if (dataSourcesModel.getDataSourcesType().equals("2")) {
+            // 数据来源类型为jdbc时处理逻辑
+
+        }
+
+        // 调用所有源头节点
+        List<CalcUnit> unitList = this.getSourceCalcUnits();
 
+        for (CalcUnit unit : unitList) {
+
+        }
+
+        sourceResults.forEach((a,b)->{
+            if (a.getCalcCode().equals("")) {
+
+            }
+        });
     }
+
 }

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

@@ -1,19 +1,29 @@
 package com.sundata.internalevaluation.calc.calcUnit;
 
 import cn.hutool.core.util.StrUtil;
+import com.sundata.common.util.DBExecutor;
 import com.sundata.internalevaluation.calc.model.CalcException;
 import com.sundata.internalevaluation.calc.model.CalcResult;
 import com.sundata.internalevaluation.calc.model.CalcUnit;
 import com.sundata.internalevaluation.calc.model.finals.CalcType;
+import com.sundata.internalevaluation.configuration.model.IndexConfigModel;
+import com.sundata.internalevaluation.configuration.model.IndexSourceModel;
+import com.sundata.internalevaluation.configuration.service.IndexConfigService;
+import com.sundata.internalevaluation.script.ScriptUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class IndexCalcUnit extends CalcUnit {
 
+    private IndexConfigService indexConfigService;
+
+    private IndexConfigModel indexConfigModel;
+
     private static final Logger log = LoggerFactory.getLogger(IndexCalcUnit.class);
     /**
      * 创建数据单元的绝对对象，对象必须包含如下参数
@@ -22,8 +32,10 @@ public class IndexCalcUnit extends CalcUnit {
      * @param calcName    计算对象名称
      * @param initContext 计算单元初始化参数
      */
-    public IndexCalcUnit(String calcCode, String calcName, Map<String, Object> initContext) {
+    public IndexCalcUnit(String calcCode, String calcName, Map<String, Object> initContext, IndexConfigModel indexConfigModel,IndexConfigService indexConfigService) {
         super(calcCode, calcName, CalcType.INDEX, initContext);
+        this.indexConfigModel = indexConfigModel;
+        this.indexConfigService = indexConfigService;
     }
 
     /**
@@ -65,6 +77,9 @@ public class IndexCalcUnit extends CalcUnit {
     @Override
     public List<CalcUnit> getSourceCalcUnits() {
         // TODO 获取源头节点
+        List<IndexSourceModel> indexList = indexConfigService.getIndexSourceList(new IndexConfigModel());
+        indexList.stream().map(sourceModel -> new IndexSourceCalcUnit
+                (sourceModel.getIndexNo(),sourceModel.getIndexName(),CalcType.INDEX,Map.of(),sourceModel));
         return new ArrayList<>();
 //        return ConfigImages.indexCalcUnitListMap.get(this);
     }
@@ -103,6 +118,52 @@ public class IndexCalcUnit extends CalcUnit {
 
         // TODO 实际的计算过程
 
+        AtomicInteger i = new AtomicInteger();
+        AtomicInteger j = new AtomicInteger();
+        CalcResult<String, Object> indexResult = null;
+        CalcResult<String, Object> dataSetResult = null;
+        // List<IndexSourceModel> sourceModelList = indexConfigModel.getIndexSourceModel();
+        sourceResults.forEach((calcUnit,result) -> {
+            // 数据集
+            if ( calcUnit instanceof DataSetCalcUnit dataSetCalcUnit){
+                if(dataSetCalcUnit.getCalcType() == CalcType.DATASET){
+                    i.getAndIncrement();
+                    dataSetResult.putAll(result);
+                }
+            }
+            // 其他指标
+            if( calcUnit instanceof IndexCalcUnit indexCalcUnit){
+                if(indexCalcUnit.getCalcType() == CalcType.INDEX){
+                    j.getAndIncrement();
+                    indexResult.putAll(result);
+                }
+            }
+        });
+        StringBuffer sb = new StringBuffer();
+        sourceResults.forEach((calcUnit,result) -> {
+            if (i.get() > 0 && j.get() == 0){
+                // 如果数据集的数量大于0
+                String logic = indexConfigModel.getIndexLogic();
+                // 执行sql，并放进结果集内
+                thisResult.put(this.getCalcCode(),DBExecutor.doQueryMap(logic));
+            }
+            if(j.get() > 0 && i.get() == 0){
+                // 如果指标的数量大于0
+                String logic = indexConfigModel.getIndexLogic();
+                // 执行模板，结果放入结果集
+                ScriptUtil.executeScript(indexConfigModel.getIndexNo(),logic,result);
+            }
+
+        });
+        if (i.get() > 0 && j.get() >0) {
+            // 同时具有指标和数据集
+            String logic = indexConfigModel.getIndexLogic();
+            // 先将sql作为一个模板进行处理，将指标的结果作为参数带入模板成为一个新模板，后在将数据集的参数带入
+            String editSql = (String) ScriptUtil.executeScript(indexConfigModel.getIndexNo(),logic,indexResult);
+            thisResult.put(this.getCalcCode(),DBExecutor.doQueryMap(logic,dataSetResult));
+        }
+
+
 
 //        Map<CalcUnit, CalcResult<String, Object>> dataMap = new HashMap<>();
 //

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

@@ -3,6 +3,8 @@ package com.sundata.internalevaluation.calc.calcUnit;
 import com.sundata.internalevaluation.calc.model.CalcResult;
 import com.sundata.internalevaluation.calc.model.CalcUnit;
 import com.sundata.internalevaluation.calc.model.finals.CalcType;
+import com.sundata.internalevaluation.configuration.model.IndexConfigModel;
+import com.sundata.internalevaluation.configuration.service.IndexConfigService;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +17,8 @@ import java.util.Map;
  * @description: 指标清单计算单元
  */
 public class IndexListCalcUnit extends CalcUnit {
+
+    final IndexConfigService indexConfigService;
     /**
      * 创建数据单元的绝对对象，对象必须包含如下参数
      *
@@ -23,8 +27,9 @@ public class IndexListCalcUnit extends CalcUnit {
      * @param calcType    计算类型
      * @param initContext 计算单元初始化参数
      */
-    public IndexListCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext) {
+    public IndexListCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext, IndexConfigService indexConfigService) {
         super(calcCode, calcName, calcType, initContext);
+        this.indexConfigService = indexConfigService;
     }
 
     /**
@@ -56,6 +61,8 @@ public class IndexListCalcUnit extends CalcUnit {
      */
     @Override
     public List<CalcUnit> getSourceCalcUnits() {
+//        List<IndexConfigModel> indexList = indexConfigService.getDataList(new IndexConfigModel());
+//        indexList.stream().map(indexModel -> new IndexCalcUnit(indexModel.getIndexNo(),indexModel.getIndexName(),Map.of(),indexModel));
         return List.of();
     }
 

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

@@ -0,0 +1,57 @@
+package com.sundata.internalevaluation.calc.calcUnit;
+
+import com.sundata.internalevaluation.calc.model.CalcResult;
+import com.sundata.internalevaluation.calc.model.CalcUnit;
+import com.sundata.internalevaluation.calc.model.finals.CalcType;
+import com.sundata.internalevaluation.configuration.model.IndexConfigModel;
+import com.sundata.internalevaluation.configuration.model.IndexSourceModel;
+
+import java.util.List;
+import java.util.Map;
+
+public class IndexSourceCalcUnit extends CalcUnit {
+
+    IndexSourceModel indexSourceModel;
+    /**
+     * 创建数据单元的绝对对象，对象必须包含如下参数
+     *
+     * @param calcCode    计算对象编号
+     * @param calcName    计算对象名称
+     * @param calcType    计算类型
+     * @param initContext 计算单元初始化参数
+     */
+    public IndexSourceCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext,IndexSourceModel indexSourceModel) {
+        super(calcCode, calcName, calcType, initContext);
+        this.indexSourceModel = indexSourceModel;
+    }
+
+    @Override
+    public boolean isCalcFinished(String calculateInstanceNumber) {
+        return false;
+    }
+
+    @Override
+    public void initResultContext(String calculateInstanceNumber) {
+
+    }
+
+    @Override
+    public List<CalcUnit> getSourceCalcUnits() {
+        return List.of();
+    }
+
+    @Override
+    public void afterCalc(Map<String, Object> context) {
+
+    }
+
+    @Override
+    public void beforeCalc(Map<String, Object> context) {
+
+    }
+
+    @Override
+    public void calc(CalcResult<String, Object> thisResult, String calculateInstanceNumber, Map<String, Object> context, Map<CalcUnit, CalcResult<String, Object>> sourceResults) {
+
+    }
+}

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

@@ -3,6 +3,7 @@ package com.sundata.internalevaluation.calc.calcUnit;
 import com.sundata.internalevaluation.calc.model.CalcResult;
 import com.sundata.internalevaluation.calc.model.CalcUnit;
 import com.sundata.internalevaluation.calc.model.finals.CalcType;
+import com.sundata.internalevaluation.configuration.model.InputParamModel;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +16,9 @@ import java.util.Map;
  * @description: 输入参数计算单元
  */
 public class InputParamCalcUnit extends CalcUnit {
+
+    final InputParamModel inputParamModel;
+
     /**
      * 创建数据单元的绝对对象，对象必须包含如下参数
      *
@@ -23,8 +27,9 @@ public class InputParamCalcUnit extends CalcUnit {
      * @param calcType    计算类型
      * @param initContext 计算单元初始化参数
      */
-    public InputParamCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext) {
+    public InputParamCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext, InputParamModel inputParamModel) {
         super(calcCode, calcName, calcType, initContext);
+        this.inputParamModel = inputParamModel;
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.sundata.internalevaluation.calc.calcUnit;
 import com.sundata.internalevaluation.calc.model.CalcResult;
 import com.sundata.internalevaluation.calc.model.CalcUnit;
 import com.sundata.internalevaluation.calc.model.finals.CalcType;
+import com.sundata.internalevaluation.configuration.model.QueryLogicModel;
 
 import java.util.List;
 import java.util.Map;
@@ -15,6 +16,8 @@ import java.util.Map;
  * @description: 查询逻辑计算单元
  */
 public class QueryLogicCalcUnit extends CalcUnit {
+
+    final QueryLogicModel queryLogicModel;
     /**
      * 创建数据单元的绝对对象，对象必须包含如下参数
      *
@@ -23,8 +26,9 @@ public class QueryLogicCalcUnit extends CalcUnit {
      * @param calcType    计算类型
      * @param initContext 计算单元初始化参数
      */
-    public QueryLogicCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext) {
+    public QueryLogicCalcUnit(String calcCode, String calcName, CalcType calcType, Map<String, Object> initContext, QueryLogicModel queryLogicModel) {
         super(calcCode, calcName, calcType, initContext);
+        this.queryLogicModel = queryLogicModel;
     }
 
     /**

src/main/java/com/sundata/internalevaluation/configuration/controller/IndexConfigAction.java

@@ -1,6 +1,9 @@
 package com.sundata.internalevaluation.configuration.controller;
 
 import com.sundata.common.base.BaseAction;
+import com.sundata.internalevaluation.calc.calcUnit.IndexCalcUnit;
+import com.sundata.internalevaluation.calc.running.threads.CalcTaskResult;
+import com.sundata.internalevaluation.calc.util.CalcUtil;
 import com.sundata.internalevaluation.configuration.model.DataSetConfigModel;
 import com.sundata.internalevaluation.configuration.model.DataSourcesModel;
 import com.sundata.internalevaluation.configuration.model.IndexConfigModel;
@@ -13,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/internalevaluation/configuration/IndexConfigAction")
@@ -89,6 +93,16 @@ public class IndexConfigAction extends BaseAction {
     @RequestMapping({"selectDetailData"})
     public IndexConfigModel selectDetailData(HttpServletRequest request, HttpServletResponse response,
                                                @RequestBody IndexConfigModel model) {
+
+        System.out.println("****** 计算开始 *******");
+        IndexConfigModel configModel = new IndexConfigModel();
+        configModel.setIndexNo("001");
+        configModel.setIndexName("测试");
+        CalcTaskResult calc = CalcUtil.calc("INDEX"+System.currentTimeMillis(),
+                new IndexCalcUnit(configModel.getIndexNo(),configModel.getIndexName(), Map.of(),configModel,indexConfigService),Map.of());
+
+        System.out.println("结果："+calc);
+
         return indexConfigService.selectDetailData(model);
     }
 }

src/main/java/com/sundata/internalevaluation/configuration/mapper/IndexConfigMapper.java

@@ -1,6 +1,7 @@
 package com.sundata.internalevaluation.configuration.mapper;
 
 import com.sundata.internalevaluation.configuration.model.IndexConfigModel;
+import com.sundata.internalevaluation.configuration.model.IndexSourceModel;
 
 import java.util.List;
 
@@ -14,4 +15,6 @@ public interface IndexConfigMapper {
     void updateExistData(IndexConfigModel model);
 
     IndexConfigModel selectDetailData(IndexConfigModel model);
+
+    List<IndexSourceModel> getIndexSourceList(IndexConfigModel indexConfigModel);
 }

src/main/java/com/sundata/internalevaluation/configuration/model/IndexConfigModel.java

@@ -16,6 +16,8 @@ public class IndexConfigModel {
     private String dataSet;
     // 数据集
     private List<String> dataSets;
+    // 指标数据来源
+    private List<IndexSourceModel> indexSourceModel;
 
     public String getIndexNo() {
         return indexNo;
@@ -64,4 +66,12 @@ public class IndexConfigModel {
     public void setDataSets(List<String> dataSets) {
         this.dataSets = dataSets;
     }
+
+    public List<IndexSourceModel> getIndexSourceModel() {
+        return indexSourceModel;
+    }
+
+    public void setIndexSourceModel(List<IndexSourceModel> indexSourceModel) {
+        this.indexSourceModel = indexSourceModel;
+    }
 }

src/main/java/com/sundata/internalevaluation/configuration/model/IndexSourceModel.java

@@ -0,0 +1,64 @@
+package com.sundata.internalevaluation.configuration.model;
+
+public class IndexSourceModel {
+    // 指标数据来源编号
+    private String indesSourceNo;
+    // 数据集编号
+    private String dataSetNo;
+    // 数据集名称
+    private String dataSetName;
+    // 指标编号
+    private String indexNo;
+    // 指标名称
+    private String indexName;
+    // 数据来源类型
+    private String dataSourceType;
+
+    public String getIndesSourceNo() {
+        return indesSourceNo;
+    }
+
+    public void setIndesSourceNo(String indesSourceNo) {
+        this.indesSourceNo = indesSourceNo;
+    }
+
+    public String getDataSetNo() {
+        return dataSetNo;
+    }
+
+    public void setDataSetNo(String dataSetNo) {
+        this.dataSetNo = dataSetNo;
+    }
+
+    public String getDataSetName() {
+        return dataSetName;
+    }
+
+    public void setDataSetName(String dataSetName) {
+        this.dataSetName = dataSetName;
+    }
+
+    public String getIndexNo() {
+        return indexNo;
+    }
+
+    public void setIndexNo(String indexNo) {
+        this.indexNo = indexNo;
+    }
+
+    public String getIndexName() {
+        return indexName;
+    }
+
+    public void setIndexName(String indexName) {
+        this.indexName = indexName;
+    }
+
+    public String getDataSourceType() {
+        return dataSourceType;
+    }
+
+    public void setDataSourceType(String dataSourceType) {
+        this.dataSourceType = dataSourceType;
+    }
+}

src/main/java/com/sundata/internalevaluation/configuration/mybatis/IndexConfigMapper.xml

@@ -22,6 +22,26 @@
         </where>
     </select>
 
+    <!-- 数据集配置页面初始化 -->
+    <select id="getIndexSourceList" resultType="com.sundata.internalevaluation.configuration.model.IndexSourceModel">
+        SELECT
+        INDEXSOURCENO              AS    indesSourceNo,
+        DATASETNO                  AS    dataSetNo,
+        DATASETNAME                AS    dataSetName,
+        INDEXNO                    AS    indexNo,
+        INDEXNAME                  AS    indexName,
+        DATASOURCETYPE             AS    dataSourceType
+        FROM SYS_INDEX
+        <where>
+            <if test="indexNo != null and indexNo !=''">
+                INDEXNO like concat(concat('%',#{indexNo}),'%')
+            </if>
+            <if test="indexName != null and indexName !=''">
+                and INDEXNAME like concat(concat('%', #{indexName}),'%')
+            </if>
+        </where>
+    </select>
+
     <!-- 数据集配置页面新增 -->
     <insert id="createData" parameterType="com.sundata.internalevaluation.configuration.model.IndexConfigModel">
         INSERT INTO SYS_INDEX

src/main/java/com/sundata/internalevaluation/configuration/service/IndexConfigService.java

@@ -4,6 +4,7 @@ import com.sundata.common.util.JsonUtil;
 import com.sundata.internalevaluation.configuration.mapper.IndexConfigMapper;
 import com.sundata.internalevaluation.configuration.model.DataSetConfigModel;
 import com.sundata.internalevaluation.configuration.model.IndexConfigModel;
+import com.sundata.internalevaluation.configuration.model.IndexSourceModel;
 import net.sf.json.util.JSONUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -80,4 +81,8 @@ public class IndexConfigService {
         selectDataSet.setDataSets(dataset);
         return selectDataSet;
     }
+
+    public List<IndexSourceModel> getIndexSourceList(IndexConfigModel indexConfigModel) {
+        return indexConfigMapper.getIndexSourceList(indexConfigModel);
+    }
 }