fix: source schema sync

Author: xiaohuangdou666

core/src/main/java/datart/core/mappers/ext/SourceSchemasMapperExt.java

@@ -19,6 +19,7 @@
 
 import datart.core.entity.SourceSchemas;
 import datart.core.mappers.SourceSchemasMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
@@ -33,4 +34,7 @@ public interface SourceSchemasMapperExt extends SourceSchemasMapper {
     @Select("SELECT update_time FROM source_schemas where source_id = #{sourceId}")
     Date selectUpdateDateBySource(String sourceId);
 
+    @Delete("DELETE FROM source_schemas where source_id = #{sourceId}")
+    int deleteBySource(String sourceId);
+
 }

data-providers/src/main/java/datart/data/provider/DefaultDataProvider.java

@@ -189,7 +189,7 @@ public boolean validateFunction(DataProviderSource source, String snippet) {
     @Override
     public void resetSource(DataProviderSource source) {
         try {
-            LocalDB.clearCache(source.getSourceId());
+            LocalDB.clearCache("DB" + source.getSourceId());
         } catch (Exception e) {
             log.error("reset datasource error ", e);
         }

server/src/main/java/datart/server/controller/SourceController.java

@@ -69,14 +69,14 @@ public ResponseData<Source> getSourceDetail(@PathVariable String sourceId) {
     @ApiOperation(value = "create source")
     @PostMapping()
     public ResponseData<Source> createSource(@Validated @RequestBody SourceCreateParam createParam) {
-        return ResponseData.success(sourceService.create(createParam));
+        return ResponseData.success(sourceService.createSource(createParam));
     }
 
     @ApiOperation(value = "update a source")
     @PutMapping(value = "/{sourceId}")
     public ResponseData<Boolean> updateSource(@PathVariable String sourceId,
                                               @Validated @RequestBody SourceUpdateParam updateParam) {
-        return ResponseData.success(sourceService.update(updateParam));
+        return ResponseData.success(sourceService.updateSource(updateParam));
     }
 
     @ApiOperation(value = "delete a source")

server/src/main/java/datart/server/service/SourceService.java

@@ -21,6 +21,8 @@
 import datart.core.data.provider.SchemaInfo;
 import datart.core.entity.Source;
 import datart.core.mappers.ext.SourceMapperExt;
+import datart.server.base.params.SourceCreateParam;
+import datart.server.base.params.SourceUpdateParam;
 import datart.server.base.transfer.model.SourceTransferModel;
 
 import java.util.List;
@@ -33,4 +35,8 @@ public interface SourceService extends BaseCRUDService<Source, SourceMapperExt>,
 
     SchemaInfo syncSourceSchema(String sourceId) throws Exception;
 
+    Source createSource(SourceCreateParam createParam);
+
+    boolean updateSource(SourceUpdateParam updateParam);
+
 }

server/src/main/java/datart/server/service/impl/DataProviderServiceImpl.java

@@ -145,7 +145,10 @@ public DataProviderSource parseDataProviderConfig(Source source) {
             providerSource.setSourceId(source.getId());
             providerSource.setType(source.getType());
             providerSource.setName(source.getName());
-            Map<String, Object> properties = objectMapper.readValue(source.getConfig(), HashMap.class);
+            Map<String, Object> properties = new HashMap<>();
+            if (StringUtils.isNotBlank(source.getConfig())) {
+                properties = objectMapper.readValue(source.getConfig(), HashMap.class);
+            }
             // decrypt values
             for (String key : properties.keySet()) {
                 Object val = properties.get(key);

server/src/main/java/datart/server/service/impl/SourceServiceImpl.java

@@ -249,6 +249,13 @@ private boolean hasPermission(Role role, Source source, int permission) {
         }
     }
 
+    @Override
+    public Source createSource(SourceCreateParam createParam) {
+        Source source = create(createParam);
+        updateJdbcSourceSyncJob(source);
+        return source;
+    }
+
     @Override
     @Transactional
     public Source create(BaseCreateParam createParam) {
@@ -263,11 +270,21 @@ public Source create(BaseCreateParam createParam) {
         Source source = SourceService.super.create(createParam);
 
         grantDefaultPermission(source);
-        updateJdbcSourceSyncJob(source);
         return source;
 
     }
 
+    @Override
+    public boolean updateSource(SourceUpdateParam updateParam) {
+        boolean success = update(updateParam);
+        if (success) {
+            Source source = retrieve(updateParam.getId());
+            getDataProviderService().updateSource(source);
+            updateJdbcSourceSyncJob(source);
+        }
+        return false;
+    }
+
     @Override
     @Transactional
     public boolean update(BaseUpdateParam updateParam) {
@@ -278,13 +295,7 @@ public boolean update(BaseUpdateParam updateParam) {
         } catch (Exception e) {
             Exceptions.e(e);
         }
-        boolean success = SourceService.super.update(updateParam);
-        if (success) {
-            Source source = retrieve(updateParam.getId());
-            getDataProviderService().updateSource(source);
-            updateJdbcSourceSyncJob(source);
-        }
-        return success;
+        return SourceService.super.update(updateParam);
     }
 
     @Override
@@ -337,6 +348,7 @@ public Source retrieve(String id) {
     @Override
     public void deleteReference(Source source) {
         deleteJdbcSourceSyncJob(source);
+        sourceSchemasMapper.deleteBySource(source.getId());
     }
 
     @Override