数据源构造修改

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

@@ -35,7 +35,7 @@ public class DataSetCalcUnit extends CalcUnit {
      * @param initContext 计算单元初始化参数
      */
     public DataSetCalcUnit(String calcCode, String calcName, Map<String, Object> initContext, DataSetConfigModel dataSetConfigModel) {
-        super(calcCode, calcName, CalcType.DATAITEM, initContext);
+        super(calcCode, calcName, CalcType.DATASET, initContext);
         this.dataSetConfigModel = dataSetConfigModel;
     }
 
@@ -93,7 +93,6 @@ public class DataSetCalcUnit extends CalcUnit {
 
 
         return  calcList;
-//        return ConfigImages.dataSetCalcUnitListMap.get(this);
     }
 
     /**
@@ -126,26 +125,6 @@ public class DataSetCalcUnit extends CalcUnit {
      */
     @Override
     public void calc(final CalcResult<String, Object> thisResult, String calculateInstanceNumber,Map<String, Object> context, Map<CalcUnit, CalcResult<String, Object>> sourceResults) {
-//        log.debug("模拟计算过程，计算参数为：【{}】，来源结果数据为：【{}】",context, sourceResults);
-//        List<User> userList = new ArrayList<>();
-//        List<Bussiness> bussinesseList = new ArrayList<>();
-//        Faker faker = Faker.instance(Locale.CHINA);
-//        thisResult.put(this.getCalcCode()+"-1", faker.number().randomNumber());
-//        thisResult.put(this.getCalcCode()+"-2", faker.number().randomNumber());
-//
-//        for (int i = 0; i < 1000; i++) {
-//            userList.add(new User(faker.number().randomDigitNotZero(),faker.name().fullName(),faker.number().numberBetween(1,90),faker.address().fullAddress(),faker.internet().emailAddress("sundatasoft.com"), faker.phoneNumber().cellPhone(),faker.date().birthday()));
-//        }
-//        for (int i = 0; i < 100_000; i++) {
-//            bussinesseList.add(new Bussiness(faker.number().randomDigitNotZero(),faker.name().fullName(),faker.number().randomDouble(6,100,1000000),faker.number().numberBetween(1,90)));
-//        }
-//        thisResult.put(this.getCalcCode()+"-user", userList);
-//        thisResult.put(this.getCalcCode()+"-buss", bussinesseList);
-//
-////        log.debug("模拟计算完成，结果对象为：【{}】",thisResult);
-//
-//        context.put(calculateInstanceNumber+"-"+this.getCalcCode(),thisResult);
-//        log.debug("对参数二次修改：{}",context);
 
         // TODO 实际的计算过程
         AtomicReference<CalcResult<String, Object>> resultMap = new AtomicReference<>();
@@ -154,11 +133,6 @@ public class DataSetCalcUnit extends CalcUnit {
             resultMap.setOpaque(result);
         });
         thisResult.put(this.getCalcCode(),resultMap);
-//        DataSourcesModel sourceModel = new DataSourcesModel();
-//        CalcTaskResult calc = CalcUtil.calc("INDEX"+System.currentTimeMillis(),
-//                new DataSourcesCalcUnit(sourceModel.getDataSourcesNo(),sourceModel.getDataSourcesName(),CalcType.DATASOURCES,Map.of(),sourceModel),Map.of());
-
-
 
     }