diff --git a/app/src/components/AssetGroup.vue b/app/src/components/AssetGroup.vue
index 21fa843..148e27d 100644
--- a/app/src/components/AssetGroup.vue
+++ b/app/src/components/AssetGroup.vue
@@ -1,6 +1,24 @@
-
+
+
+
+ 查詢中...
+
+
+
+
-
diff --git a/src/main/java/com/moze/rms/config/JdbiFactory.java b/src/main/java/com/moze/rms/config/JdbiFactory.java
index b3c9630..c44f60f 100644
--- a/src/main/java/com/moze/rms/config/JdbiFactory.java
+++ b/src/main/java/com/moze/rms/config/JdbiFactory.java
@@ -75,5 +75,9 @@ public class JdbiFactory {
return jdbi.onDemand(AssertDAO.class);
}
+ @Bean
+ public SearchDAO searchDAO(Jdbi jdbi) {
+ return jdbi.onDemand(SearchDAO.class);
+ }
}
diff --git a/src/main/java/com/moze/rms/controller/InventoryController.java b/src/main/java/com/moze/rms/controller/InventoryController.java
index df45d35..d7855a0 100644
--- a/src/main/java/com/moze/rms/controller/InventoryController.java
+++ b/src/main/java/com/moze/rms/controller/InventoryController.java
@@ -4,13 +4,18 @@ package com.moze.rms.controller;
import com.moze.rms.dao.InventoryDAO;
import com.moze.rms.dao.MappingColDAO;
import com.moze.rms.dao.MappingTableDAO;
+import com.moze.rms.dao.SearchDAO;
import com.moze.rms.entity.dto.SelectItemDTO;
+import com.moze.rms.entity.model.MappingCol;
+import com.moze.rms.utils.ExcelExpoter;
import com.moze.rms.utils.ExcelImporter;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.util.function.Function;
@@ -29,6 +34,9 @@ public class InventoryController {
@Autowired
InventoryDAO inventoryDAO;
+ @Autowired
+ SearchDAO searchDAO;
+
@GetMapping("/routes")
public JsonResult getRoutes() {
@@ -56,6 +64,8 @@ public class InventoryController {
public JsonResult insertInventory(@RequestBody Map data) {
System.out.println(data);
inventoryDAO.insertOne(data);
+ Integer id = inventoryDAO.findId(data);
+ searchDAO.insertSearch(id, data);
return new JsonResult(StatusCode.SUCCESS, null);
}
@@ -63,6 +73,7 @@ public class InventoryController {
public JsonResult modifyInventory(@RequestBody Map data) {
try {
inventoryDAO.modifyInventory(data);
+ searchDAO.modifySearch(data);
return new JsonResult(StatusCode.SUCCESS, null);
} catch (Exception e) {
return new JsonResult(StatusCode.SYS_ERROR, e.getMessage());
@@ -81,6 +92,7 @@ public class InventoryController {
System.out.println(tablename);
System.out.println(id);
inventoryDAO.deleteByTablenameAndId(tablename, id);
+ searchDAO.deleteFromSearch(tablename, id);
return new JsonResult(StatusCode.SUCCESS, null);
}
@@ -93,22 +105,52 @@ public class InventoryController {
}
@PostMapping("/importFile")
- public JsonResult importFile(@RequestParam(required = false) MultipartFile file) throws IOException, InvalidFormatException {
+ public JsonResult importFile(String tablename, @RequestParam(required = false) MultipartFile file) throws IOException, InvalidFormatException {
File f = File.createTempFile(file.getOriginalFilename().split("\\.")[0], file.getOriginalFilename().split("\\.")[1]);
- System.out.println(f.getName());
file.transferTo(f);
+ ExcelImporter excelImporter = new ExcelImporter(f);
+ List