feat(数据集): 数据集调整

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -37,6 +37,8 @@ public class DataSetTableService {
     private DatasourceMapper datasourceMapper;
     @Resource
     private DataSetTableFieldsService dataSetTableFieldsService;
+    @Resource
+    private DataSetTableTaskService dataSetTableTaskService;
 
     public void batchInsert(List<DatasetTable> datasetTable) throws Exception {
         for (DatasetTable table : datasetTable) {
@@ -67,11 +69,13 @@ public class DataSetTableService {
     public void delete(String id) {
         datasetTableMapper.deleteByPrimaryKey(id);
         dataSetTableFieldsService.deleteByTableId(id);
+        // 删除同步任务
+        dataSetTableTaskService.deleteByTableId(id);
     }
 
     public List<DatasetTable> list(DataSetTableRequest dataSetTableRequest) {
         DatasetTableExample datasetTableExample = new DatasetTableExample();
-        if(StringUtils.isNotEmpty(dataSetTableRequest.getSceneId())){
+        if (StringUtils.isNotEmpty(dataSetTableRequest.getSceneId())) {
             datasetTableExample.createCriteria().andSceneIdEqualTo(dataSetTableRequest.getSceneId());
         }
         if (StringUtils.isNotEmpty(dataSetTableRequest.getSort())) {
@@ -173,7 +177,7 @@ public class DataSetTableService {
         return map;
     }
 
-    public List<String[]> getDataSetData(String datasourceId, String table, List<DatasetTableField> fields){
+    public List<String[]> getDataSetData(String datasourceId, String table, List<DatasetTableField> fields) {
         List<String[]> data = new ArrayList<>();
         Datasource ds = datasourceMapper.selectByPrimaryKey(datasourceId);
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
@@ -188,7 +192,7 @@ public class DataSetTableService {
         return data;
     }
 
-    public Long getDataSetTotalData(String datasourceId, String table){
+    public Long getDataSetTotalData(String datasourceId, String table) {
         List<String[]> data = new ArrayList<>();
         Datasource ds = datasourceMapper.selectByPrimaryKey(datasourceId);
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
@@ -203,7 +207,7 @@ public class DataSetTableService {
         return 0l;
     }
 
-    public List<String[]> getDataSetPageData(String datasourceId, String table, List<DatasetTableField> fields, Long startPage, Long pageSize){
+    public List<String[]> getDataSetPageData(String datasourceId, String table, List<DatasetTableField> fields, Long startPage, Long pageSize) {
         List<String[]> data = new ArrayList<>();
         Datasource ds = datasourceMapper.selectByPrimaryKey(datasourceId);
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());

backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java

@@ -7,6 +7,7 @@ import io.dataease.service.ScheduleService;
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.CronExpression;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -17,6 +18,7 @@ import java.util.UUID;
  * @Date 2021/3/4 1:26 下午
  */
 @Service
+@Transactional
 public class DataSetTableTaskService {
     @Resource
     private DatasetTableTaskMapper datasetTableTaskMapper;
@@ -50,6 +52,20 @@ public class DataSetTableTaskService {
         dataSetTableTaskLogService.deleteByTaskId(id);
     }
 
+    public void delete(DatasetTableTask task) {
+        datasetTableTaskMapper.deleteByPrimaryKey(task.getId());
+        scheduleService.deleteSchedule(task);
+        dataSetTableTaskLogService.deleteByTaskId(task.getId());
+    }
+
+    public void deleteByTableId(String id) {
+        DatasetTableTaskExample datasetTableTaskExample = new DatasetTableTaskExample();
+        DatasetTableTaskExample.Criteria criteria = datasetTableTaskExample.createCriteria();
+        criteria.andTableIdEqualTo(id);
+        List<DatasetTableTask> datasetTableTasks = datasetTableTaskMapper.selectByExample(datasetTableTaskExample);
+        datasetTableTasks.forEach(this::delete);
+    }
+
     public DatasetTableTask get(String id) {
         return datasetTableTaskMapper.selectByPrimaryKey(id);
     }

frontend/src/views/dataset/data/ViewTable.vue

@@ -24,7 +24,7 @@
         <el-tab-pane :label="$t('dataset.join_view')" name="joinView">
           关联视图 TODO
         </el-tab-pane>
-        <el-tab-pane :label="$t('dataset.update_info')" name="updateInfo">
+        <el-tab-pane v-if="table.mode === 1" :label="$t('dataset.update_info')" name="updateInfo">
           <update-info :table="table"/>
         </el-tab-pane>
       </el-tabs>

frontend/src/views/dataset/group/Group.vue

@@ -215,10 +215,10 @@
           <el-form-item :label="$t('commons.name')" prop="name">
             <el-input v-model="tableForm.name"/>
           </el-form-item>
-          <el-form-item :label="$t('dataset.mode')" prop="mode">
-            <el-radio v-model="tableForm.mode" label="0">{{ $t('dataset.direct_connect') }}</el-radio>
-            <el-radio v-model="tableForm.mode" label="1">{{ $t('dataset.sync_data') }}</el-radio>
-          </el-form-item>
+<!--          <el-form-item :label="$t('dataset.mode')" prop="mode">-->
+<!--            <el-radio v-model="tableForm.mode" label="0">{{ $t('dataset.direct_connect') }}</el-radio>-->
+<!--            <el-radio v-model="tableForm.mode" label="1">{{ $t('dataset.sync_data') }}</el-radio>-->
+<!--          </el-form-item>-->
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button size="mini" @click="closeTable()">{{ $t('dataset.cancel') }}</el-button>