接口计算过程调用修改、配置修改

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

@@ -8,9 +8,12 @@ import com.sundata.internalevaluation.calc.model.CalcUnit;
 import com.sundata.internalevaluation.calc.model.finals.CalcType;
 import com.sundata.internalevaluation.conf.JsonToCalciteExample;
 import com.sundata.internalevaluation.configuration.model.DataSourcesModel;
+import com.sundata.internalevaluation.configuration.model.SysInterface;
 import com.sundata.internalevaluation.configuration.service.DataSourcesService;
+import com.sundata.internalevaluation.configuration.service.SysInterfaceService;
 import com.sundata.internalevaluation.script.ScriptUtil;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -75,21 +78,25 @@ public class DataSourcesCalcUnit extends CalcUnit {
     @Override
     public List<CalcUnit> getSourceCalcUnits() {
         // 通过bean获取对象
-        DataSourcesService sourcesService = SpringUtil.getBean("DataSourcesService");
+        DataSourcesService sourcesService = SpringUtil.getBean(DataSourcesService.class);
+        SysInterfaceService sysInterfaceService = SpringUtil.getBean(SysInterfaceService.class);
+        DataSourcesModel selectModel = sourcesService.selectDetailData(this.dataSourcesModel.getDataSourcesNo());
+        List<String> interfaceNos = selectModel.getRequestInterfaces();
+        List<SysInterface> sysInterfaceModelList = new ArrayList<>();
+        for ( String s : interfaceNos) {
+            sysInterfaceModelList.add(sysInterfaceService.getById(s));
+        }
+        return sysInterfaceModelList.stream().map(interfaceModel -> new InterfaceCalcUnit(interfaceModel.getId(),interfaceModel.getInterfaceName(),CalcType.INTERFACE,Map.of(),interfaceModel)).collect(Collectors.toList());
+
         // 取得个配置信息
-        List<DataSourcesModel> dataList = sourcesService.getDataList(new DataSourcesModel());
-        //for (DataSourcesModel model : dataList) {
-            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 inputList;
-//        return dataList.stream().map(sourceModel -> new DataSourcesCalcUnit(sourceModel.getDataSourcesNo(),
-//                sourceModel.getDataSourcesName(),CalcType.DATASOURCES,Map.of(),sourceModel)).collect(Collectors.toList());
-        return List.of();
+//        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();
     }
 
     /**

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

@@ -10,7 +10,9 @@ public class DataSourcesModel {
     // 数据来源类型
     private String dataSourcesType;
     // 数据源（请求接口）
-    private String dataSources;
+    private String requestInterface;
+    // 数据源（请求接口）
+    private List<String> requestInterfaces;
     // 输入参数
     private List<InputParamModel> inputParam;
     // 查询逻辑
@@ -42,14 +44,6 @@ public class DataSourcesModel {
         this.dataSourcesType = dataSourcesType;
     }
 
-    public String getDataSources() {
-        return dataSources;
-    }
-
-    public void setDataSources(String dataSources) {
-        this.dataSources = dataSources;
-    }
-
     public List<InputParamModel> getInputParam() {
         return inputParam;
     }
@@ -73,4 +67,20 @@ public class DataSourcesModel {
     public void setDataItemConfig(List<DataItemConfigModel> dataItemConfig) {
         this.dataItemConfig = dataItemConfig;
     }
+
+    public String getRequestInterface() {
+        return requestInterface;
+    }
+
+    public void setRequestInterface(String requestInterface) {
+        this.requestInterface = requestInterface;
+    }
+
+    public List<String> getRequestInterfaces() {
+        return requestInterfaces;
+    }
+
+    public void setRequestInterfaces(List<String> requestInterfaces) {
+        this.requestInterfaces = requestInterfaces;
+    }
 }

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

@@ -51,9 +51,6 @@
         UPDATE SYS_DATASET_CONFIG
         <trim suffixOverrides=",">
             <set>
-                <if test="dataSetNo != null and dataSetNo !=''">
-                    DATASETNO = #{dataSetNo},
-                </if>
                 <if test="dataSetName != null and dataSetName !=''">
                     DATASETNAME = #{dataSetName},
                 </if>
@@ -62,6 +59,11 @@
                 </if>
             </set>
         </trim>
+        <where>
+            <if test="dataSetNo != null and dataSetNo !=''">
+                DATASETNO = #{dataSetNo}
+            </if>
+        </where>
     </update>
 
     <!-- 数据集配置查询当前行 -->

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

@@ -9,7 +9,7 @@
         DATASOURCESNAME               AS    dataSourcesName,
         DATASOURCESNO                 AS    dataSourcesNo,
         DATASOURCESTYPE               AS    dataSourcesType,
-        DATASOURCES                   AS    dataSources
+        REQUESTINTERFACE              AS    requestInterface
         FROM SYS_DATA_SOURCES
         <where>
             <if test="dataSourcesName != null and dataSourcesName !=''">
@@ -76,14 +76,14 @@
         DATASOURCESNAME,
         DATASOURCESNO,
         DATASOURCESTYPE,
-        DATASOURCES
+        REQUESTINTERFACE
         )
         VALUES
         (
         #{dataSourcesName},
         #{dataSourcesNo},
         #{dataSourcesType},
-        #{dataSources}
+        #{requestInterface}
         )
     </insert>
 
@@ -205,17 +205,19 @@
                 <if test="dataSourcesName != null and dataSourcesName !=''">
                     DATASOURCESNAME = #{dataSourcesName},
                 </if>
-                <if test="dataSourcesNo != null and dataSourcesNo !=''">
-                    DATASOURCESNO = #{dataSourcesNo},
-                </if>
                 <if test="dataSourcesType != null and dataSourcesType !=''">
                     DATASOURCESTYPE = #{dataSourcesType},
                 </if>
-                <if test="dataSources != null and dataSources !=''">
-                    DATASOURCES = #{dataSources},
+                <if test="requestInterface != null and requestInterface !=''">
+                    REQUESTINTERFACE = #{requestInterface},
                 </if>
             </set>
         </trim>
+        <where>
+            <if test="dataSourcesNo != null and dataSourcesNo !=''">
+                DATASOURCESNO = #{dataSourcesNo}
+            </if>
+        </where>
     </update>
 
     <!-- 数据集配置查询当前行 -->
@@ -224,7 +226,7 @@
         DATASOURCESNAME               AS    dataSourcesName,
         DATASOURCESNO                 AS    dataSourcesNo,
         DATASOURCESTYPE               AS    dataSourcesType,
-        DATASOURCES                   AS    dataSources
+        REQUESTINTERFACE              AS    requestInterface
         FROM SYS_DATA_SOURCES
         <where>
             <if test="dataSourcesNo != null and dataSourcesNo !=''">

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

@@ -168,9 +168,6 @@
         UPDATE SYS_MODEL
         <trim suffixOverrides=",">
             <set>
-                <if test="modelNo != null and modelNo !=''">
-                    MODELNO = #{modelNo},
-                </if>
                 <if test="modelName != null and modelName !=''">
                     MODELNAME = #{modelName},
                 </if>
@@ -188,6 +185,11 @@
                 </if>
             </set>
         </trim>
+        <where>
+            <if test="modelNo != null and modelNo !=''">
+                MODELNO = #{modelNo}
+            </if>
+        </where>
     </update>
 
 

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

@@ -1,5 +1,6 @@
 package com.sundata.internalevaluation.configuration.service;
 
+import com.sundata.common.util.JsonUtil;
 import com.sundata.internalevaluation.configuration.mapper.DataSourcesMapper;
 import com.sundata.internalevaluation.configuration.model.DataItemConfigModel;
 import com.sundata.internalevaluation.configuration.model.DataSourcesModel;
@@ -39,6 +40,7 @@ public class DataSourcesService {
      * @throws:
      */
     public void createData(DataSourcesModel model) {
+        model.setRequestInterface(JsonUtil.toJSONString(model.getRequestInterfaces()));
         dataSourcesMapper.createData(model);
 
         if (null != model.getInputParam() && model.getInputParam().size()>0) {
@@ -82,6 +84,7 @@ public class DataSourcesService {
      * @throws:
      */
     public void updateExistData(DataSourcesModel model) {
+        model.setRequestInterface(JsonUtil.toJSONString(model.getRequestInterfaces()));
         dataSourcesMapper.updateExistData(model);
         dataSourcesMapper.deleteInputParamRows();
         dataSourcesMapper.deleteDataSourceRows(model);
@@ -117,7 +120,8 @@ public class DataSourcesService {
      * @throws:
      */
     public DataSourcesModel selectDetailData(String dataSourcesNo) {
-        DataSourcesModel model = dataSourcesMapper.selectDetailData(dataSourcesNo);;
+        DataSourcesModel model = dataSourcesMapper.selectDetailData(dataSourcesNo);
+        model.setRequestInterfaces(JsonUtil.jsonToList(model.getRequestInterface()));
         List<InputParamModel> inputList = dataSourcesMapper.getInputParamList(dataSourcesNo);
         List<DataItemConfigModel> dataItemList = dataSourcesMapper.getDataItemConfigList(dataSourcesNo);
         List<QueryLogicModel> queryLogicList = dataSourcesMapper.getQueryLogicList(dataSourcesNo);