Browse Source

数据源多选后台代码修改

ZhangYanJie 2 months ago
parent
commit
b1893bd7e0

+ 1 - 1
src/main/java/com/sundata/internalevaluation/calc/calcUnit/DataSetCalcUnit.java

@@ -84,7 +84,7 @@ public class DataSetCalcUnit extends CalcUnit {
         DataSourcesService sourcesService = SpringUtil.getBean(DataSourcesService.class);
         //dataSetService.getDataList(new DataSetConfigModel());
         List<DataSourcesModel> sourceList =null;
-        for (String s :dataSetConfigModel.getDataSourcesNo()) {
+        for (String s :dataSetConfigModel.getDataSourcesNos()) {
             DataSourcesModel sourceModel = new DataSourcesModel();
             sourceModel.setDataSourcesNo(s);
             // sourceModel.setDataSourcesNo();

+ 13 - 3
src/main/java/com/sundata/internalevaluation/configuration/model/DataSetConfigModel.java

@@ -9,7 +9,9 @@ public class DataSetConfigModel {
     // 数据集名称
     private String dataSetName;
     // 数据源编号
-    private List<String> dataSourcesNo;
+    private String dataSourcesNo;
+    // 数据源编号
+    private List<String> dataSourcesNos;
 
     public String getDataSetNo() {
         return dataSetNo;
@@ -27,11 +29,19 @@ public class DataSetConfigModel {
         this.dataSetName = dataSetName;
     }
 
-    public List<String> getDataSourcesNo() {
+    public String getDataSourcesNo() {
         return dataSourcesNo;
     }
 
-    public void setDataSourcesNo(List<String> dataSourcesNo) {
+    public void setDataSourcesNo(String dataSourcesNo) {
         this.dataSourcesNo = dataSourcesNo;
     }
+
+    public List<String> getDataSourcesNos() {
+        return dataSourcesNos;
+    }
+
+    public void setDataSourcesNos(List<String> dataSourcesNos) {
+        this.dataSourcesNos = dataSourcesNos;
+    }
 }

+ 9 - 0
src/main/java/com/sundata/internalevaluation/configuration/service/DataSetConfigService.java

@@ -1,6 +1,7 @@
 package com.sundata.internalevaluation.configuration.service;
 
 import com.sundata.common.exception.BusinessException;
+import com.sundata.common.util.JsonUtil;
 import com.sundata.internalevaluation.configuration.controller.DataSetConfigAction;
 import com.sundata.internalevaluation.configuration.mapper.DataSetConfigMapper;
 import com.sundata.internalevaluation.configuration.model.DataSetConfigModel;
@@ -28,6 +29,8 @@ public class DataSetConfigService {
      * @throws:
      */
     public List<DataSetConfigModel> getDataList(DataSetConfigModel model) {
+        String dataSourceNo = JsonUtil.toJSONString(model.getDataSourcesNos());
+        model.setDataSetNo(dataSourceNo);
         return dataSetConfigMapper.getDataList(model);
     }
 
@@ -40,6 +43,8 @@ public class DataSetConfigService {
      * @throws:
      */
     public void createData(DataSetConfigModel model) {
+        String dataSourceNo = JsonUtil.toJSONString(model.getDataSourcesNos());
+        model.setDataSetNo(dataSourceNo);
         dataSetConfigMapper.createData(model);
     }
 
@@ -64,6 +69,8 @@ public class DataSetConfigService {
      * @throws:
      */
     public void updateExistData(DataSetConfigModel model) {
+        String dataSourceNo = JsonUtil.toJSONString(model.getDataSourcesNos());
+        model.setDataSetNo(dataSourceNo);
         dataSetConfigMapper.updateExistData(model);
     }
 
@@ -76,6 +83,8 @@ public class DataSetConfigService {
      * @throws:
      */
     public DataSetConfigModel selectDetailData(DataSetConfigModel model) {
+        DataSetConfigModel configModel = dataSetConfigMapper.selectDetailData(model);
+        model.setDataSourcesNos(JsonUtil.jsonToList(configModel.getDataSetNo()));
         return dataSetConfigMapper.selectDetailData(model);
     }
 }