Browse Source

update

main
wangshaoping 10 months ago
parent
commit
cd2f1e3930
  1. 1
      io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue
  2. 4
      io.sc.platform.developer.frontend/src/views/backend/ImportLiquibase.vue
  3. 8
      io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcDataWebController.java
  4. 7
      io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataImportConfigure.java

1
io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue

@ -37,7 +37,6 @@
<q-select <q-select
v-model="valueReactive.tables" v-model="valueReactive.tables"
:label="$t('developer.backend.export.liquibase.tables')" :label="$t('developer.backend.export.liquibase.tables')"
input-class="bg-red-200"
outlined outlined
dense dense
emit-value emit-value

4
io.sc.platform.developer.frontend/src/views/backend/ImportLiquibase.vue

@ -15,7 +15,7 @@
<div class="row py-1"> <div class="row py-1">
<div class="col-3"></div> <div class="col-3"></div>
<div class="col-6"> <div class="col-6">
<q-file ref="fileRef" v-model="formDataRef.file" :label="$t('file.multiple.tip')" dense outlined clearable counter accept=".csv"> <q-file ref="fileRef" v-model="formDataRef.file" :label="$t('file.multiple.tip')" multiple dense outlined clearable counter accept=".csv">
<template #prepend> <template #prepend>
<q-icon name="cloud_upload" /> <q-icon name="cloud_upload" />
</template> </template>
@ -69,7 +69,7 @@ const importData = () => {
{ {
datasource: formDataRef.datasource, datasource: formDataRef.datasource,
deleteFirst: formDataRef.deleteFirst, deleteFirst: formDataRef.deleteFirst,
files: fileRef.value.nativeEl.files[0], files: fileRef.value.nativeEl.files,
}, },
{ {
headers: { headers: {

8
io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcDataWebController.java

@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.util.Locale; import java.util.Locale;
@RestController @RestController
@ -21,15 +22,16 @@ public class JdbcDataWebController {
@PostMapping("importData") @PostMapping("importData")
public void importData( public void importData(
HttpServletRequest request,
Locale locale,
@RequestParam(name="datasource",required = false) String datasource, @RequestParam(name="datasource",required = false) String datasource,
@RequestParam(name="deleteFirst", required = false) boolean deleteFirst, @RequestParam(name="deleteFirst", required = false) boolean deleteFirst,
@RequestPart(name="files",required = false) MultipartFile multipartFile, @RequestPart(name="files[]") MultipartFile[] multipartFiles) throws Exception
Locale locale) throws Exception
{ {
DataImportConfigure configure =new DataImportConfigure(); DataImportConfigure configure =new DataImportConfigure();
configure.setDatasource(datasource); configure.setDatasource(datasource);
configure.setDeleteFirst(deleteFirst); configure.setDeleteFirst(deleteFirst);
configure.addFile(multipartFile); configure.addFile(multipartFiles);
ImporterThread thread =new ImporterThread(jdbcDataService,configure,locale); ImporterThread thread =new ImporterThread(jdbcDataService,configure,locale);
progressableThreadService.start(thread); progressableThreadService.start(thread);

7
io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataImportConfigure.java

@ -10,12 +10,15 @@ public class DataImportConfigure {
private boolean deleteFirst; private boolean deleteFirst;
private List<MultipartFile> files =new ArrayList<>(); private List<MultipartFile> files =new ArrayList<>();
public DataImportConfigure addFile(MultipartFile file){ public DataImportConfigure addFile(MultipartFile... files){
if(files!=null && files.length>0){
for(MultipartFile file : files){
this.files.add(file); this.files.add(file);
}
}
return this; return this;
} }
public String getDatasource() { public String getDatasource() {
return datasource; return datasource;
} }

Loading…
Cancel
Save