Parcourir la source

个配置crud修改

ZhangYanJie il y a 2 mois
Parent
commit
d43d8aa07d

+ 2 - 0
src/main/java/com/sundata/internalevaluation/configuration/mapper/DataSourcesMapper.java

@@ -36,4 +36,6 @@ public interface DataSourcesMapper {
     void deleteDataSourceRows(DataSourcesModel model);
 
     void deleteQueryLogicRows(DataSourcesModel model);
+
+    DataSourcesModel selectDetailData(String dataSourcesNo);
 }

+ 15 - 0
src/main/java/com/sundata/internalevaluation/configuration/mybatis/DataSourcesMapper.xml

@@ -218,6 +218,21 @@
         </trim>
     </update>
 
+    <!-- 数据集配置查询当前行 -->
+    <select id="selectDetailData" resultType="com.sundata.internalevaluation.configuration.model.DataSourcesModel">
+        SELECT
+        DATASOURCESNAME               AS    dataSourcesName,
+        DATASOURCESNO                 AS    dataSourcesNo,
+        DATASOURCESTYPE               AS    dataSourcesType,
+        DATASOURCES                   AS    dataSources
+        FROM SYS_DATA_SOURCES
+        <where>
+            <if test="dataSourcesNo != null and dataSourcesNo !=''">
+                and DATASOURCESNO = #{dataSourcesNo}
+            </if>
+        </where>
+    </select>
+
     <!-- 接口字典 -->
     <select id="selectInterFaceData" resultType="com.sundata.admin.nounmanage.model.DictContent">
         select  ID as id, INTERFACENAME as text from SYS_REQ_INTERFACE

+ 6 - 4
src/main/java/com/sundata/internalevaluation/configuration/service/DataSetConfigService.java

@@ -42,7 +42,7 @@ public class DataSetConfigService {
      */
     public void createData(DataSetConfigModel model) {
         String dataSourceNo = JsonUtil.toJSONString(model.getDataSourcesNos());
-        model.setDataSetNo(dataSourceNo);
+        model.setDataSourcesNo(dataSourceNo);
         dataSetConfigMapper.createData(model);
     }
 
@@ -68,7 +68,7 @@ public class DataSetConfigService {
      */
     public void updateExistData(DataSetConfigModel model) {
         String dataSourceNo = JsonUtil.toJSONString(model.getDataSourcesNos());
-        model.setDataSetNo(dataSourceNo);
+        model.setDataSourcesNo(dataSourceNo);
         dataSetConfigMapper.updateExistData(model);
     }
 
@@ -82,7 +82,9 @@ public class DataSetConfigService {
      */
     public DataSetConfigModel selectDetailData(DataSetConfigModel model) {
         DataSetConfigModel configModel = dataSetConfigMapper.selectDetailData(model);
-        model.setDataSourcesNos(JsonUtil.jsonToList(configModel.getDataSetNo()));
-        return dataSetConfigMapper.selectDetailData(model);
+        String dataSourcesNo = configModel.getDataSourcesNo();
+        List<String> dataSourcesNos = JsonUtil.jsonToList(dataSourcesNo);
+        configModel.setDataSourcesNos(dataSourcesNos);
+        return configModel;
     }
 }

+ 1 - 1
src/main/java/com/sundata/internalevaluation/configuration/service/DataSourcesService.java

@@ -117,7 +117,7 @@ public class DataSourcesService {
      * @throws:
      */
     public DataSourcesModel selectDetailData(String dataSourcesNo) {
-        DataSourcesModel model = new DataSourcesModel();
+        DataSourcesModel model = dataSourcesMapper.selectDetailData(dataSourcesNo);;
         List<InputParamModel> inputList = dataSourcesMapper.getInputParamList(dataSourcesNo);
         List<DataItemConfigModel> dataItemList = dataSourcesMapper.getDataItemConfigList(dataSourcesNo);
         List<QueryLogicModel> queryLogicList = dataSourcesMapper.getQueryLogicList(dataSourcesNo);

+ 1 - 5
src/main/java/com/sundata/internalevaluation/configuration/service/IndexConfigService.java

@@ -38,8 +38,6 @@ public class IndexConfigService {
      * @throws:
      */
     public void createData(IndexConfigModel model) {
-//        String dataSet = JsonUtil.toJSONString(model.getDataSets());
-////        model.setDataSet(dataSet);
         indexConfigMapper.createData(model);
         if (null != model.getIndexDataSource() && model.getIndexDataSource().size() >0) {
             indexConfigMapper.deleteIndexSource(model.getIndexNo());
@@ -61,6 +59,7 @@ public class IndexConfigService {
      */
     public void deleteRows(IndexConfigModel model) {
         indexConfigMapper.deleteRows(model);
+        indexConfigMapper.deleteIndexSource(model.getIndexNo());
     }
 
     /**
@@ -96,9 +95,6 @@ public class IndexConfigService {
 
         List<IndexSourceModel> sourceList = indexConfigMapper.getIndexSourceList(selectDataSource);
         selectDataSource.setIndexDataSource(sourceList);
-
-//        List<String> dataset = JsonUtil.jsonToList(selectDataSet.getDataSet());
-//        selectDataSet.setDataSets(dataset);
         return selectDataSource;
     }