指标源头节点条件修改

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

@@ -125,7 +125,7 @@ public class DataSourcesCalcUnit extends CalcUnit {
 
         sourceResults.forEach((calcUnit,result)->{
 
-            if (dataSourcesModel.getDataSourcesType().equals("interface")) {
+            if (dataSourcesModel.getDataSourcesType().equals("INTERFACE")) {
                 // 数据来源类型为接口时处理逻辑
                 if (calcUnit instanceof QueryLogicCalcUnit queryLogicCalcUnit) {
                     // 获取json
@@ -133,7 +133,7 @@ public class DataSourcesCalcUnit extends CalcUnit {
                     Map<Object, Object> objectObjectMap = JsonUtil.jsonToMap(json);
                     thisResult.put(this.getCalcCode(), objectObjectMap);
                 }
-            } else if (dataSourcesModel.getDataSourcesType().equals("jdbc")) {
+            } else if (dataSourcesModel.getDataSourcesType().equals("JDBC")) {
                 // 数据来源类型为jdbc时处理逻辑
                 if (calcUnit instanceof QueryLogicCalcUnit queryLogicCalcUnit) {
                     String sqlTemplate = queryLogicCalcUnit.queryLogicModel.getSelectSqlScript();

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

@@ -89,10 +89,14 @@ public class IndexCalcUnit extends CalcUnit {
         // 查询个指标编号和数据集对应的数据
         for ( IndexSourceModel m : selectList) {
             if (m.getDataSourceType().equals("DATASET")) {
-                DataSetConfigModel datasetModel =  dataSetService.selectDetailData(new DataSetConfigModel());
+                DataSetConfigModel conditionModel = new DataSetConfigModel();
+                conditionModel.setDataSetNo(m.getDataSetNo());
+                DataSetConfigModel datasetModel =  dataSetService.selectDetailData(conditionModel);
                 dataSetList.add(datasetModel);
             } else if (m.getDataSourceType().equals("INDEX")) {
-                IndexConfigModel indexConfigModel = indexConfigService.selectDetailData(new IndexConfigModel());
+                IndexConfigModel conditionModel = new IndexConfigModel();
+                conditionModel.setIndexNo(m.getOtherIndexNo());
+                IndexConfigModel indexConfigModel = indexConfigService.selectDetailData(conditionModel);
                 indexList.add(indexConfigModel);
             }
         }

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

@@ -77,6 +77,9 @@
             <if test="dataSetNo != null and dataSetNo !=''">
                 DATASETNO = #{dataSetNo}
             </if>
+            <if test="dataSourcesNo != null and dataSourcesNo !=''">
+                DATASOURCESNO = #{dataSourcesNo}
+            </if>
         </where>
     </select>
 

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

@@ -40,16 +40,25 @@ public class DataSourcesService {
      */
     public void createData(DataSourcesModel model) {
         dataSourcesMapper.createData(model);
-        dataSourcesMapper.createInputParamData(model.getInputParam());
 
-        for (DataItemConfigModel m : model.getDataItemConfig()) {
-            m.setDataSourcesNo(model.getDataSourcesNo());
+        if (null != model.getInputParam() && model.getInputParam().size()>0) {
+            dataSourcesMapper.createInputParamData(model.getInputParam());
         }
-        dataSourcesMapper.createDataItemConfigData(model.getDataItemConfig());
-        for ( QueryLogicModel m : model.getQueryLogic()) {
-            m.setDataSourcesNo(model.getDataSourcesNo());
+
+        if (null != model.getDataItemConfig() && model.getDataItemConfig().size()>0) {
+            for (DataItemConfigModel m : model.getDataItemConfig()) {
+                m.setDataSourcesNo(model.getDataSourcesNo());
+            }
+            dataSourcesMapper.createDataItemConfigData(model.getDataItemConfig());
+        }
+
+        if (null != model.getQueryLogic() && model.getQueryLogic().size()>0) {
+            for ( QueryLogicModel m : model.getQueryLogic()) {
+                m.setDataSourcesNo(model.getDataSourcesNo());
+            }
+            dataSourcesMapper.createQueryLogicData(model.getQueryLogic());
         }
-        dataSourcesMapper.createQueryLogicData(model.getQueryLogic());
+
     }
 
     /**
@@ -77,15 +86,26 @@ public class DataSourcesService {
         dataSourcesMapper.deleteInputParamRows();
         dataSourcesMapper.deleteDataSourceRows(model);
         dataSourcesMapper.deleteQueryLogicRows(model);
-        dataSourcesMapper.createInputParamData(model.getInputParam());
-        for (DataItemConfigModel m : model.getDataItemConfig()) {
-            m.setDataSourcesNo(model.getDataSourcesNo());
+
+        if (null != model.getInputParam() && model.getInputParam().size()>0) {
+            dataSourcesMapper.createInputParamData(model.getInputParam());
         }
-        dataSourcesMapper.createDataItemConfigData(model.getDataItemConfig());
-        for ( QueryLogicModel m : model.getQueryLogic()) {
-            m.setDataSourcesNo(model.getDataSourcesNo());
+
+        if (null != model.getDataItemConfig() && model.getDataItemConfig().size()>0) {
+            for (DataItemConfigModel m : model.getDataItemConfig()) {
+                m.setDataSourcesNo(model.getDataSourcesNo());
+            }
+            dataSourcesMapper.createDataItemConfigData(model.getDataItemConfig());
+        }
+
+        if (null != model.getQueryLogic() && model.getQueryLogic().size()>0) {
+            for ( QueryLogicModel m : model.getQueryLogic()) {
+                m.setDataSourcesNo(model.getDataSourcesNo());
+            }
+            dataSourcesMapper.createQueryLogicData(model.getQueryLogic());
         }
-        dataSourcesMapper.createQueryLogicData(model.getQueryLogic());
+
+
     }
 
     /**