diff --git a/app/src/components/FileAndData.vue b/app/src/components/FileAndData.vue
deleted file mode 100644
index 3c5c7d7..0000000
--- a/app/src/components/FileAndData.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/app/src/components/Hardware.vue b/app/src/components/Hardware.vue
deleted file mode 100644
index 2038360..0000000
--- a/app/src/components/Hardware.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
-
-
-
-
-
- mdi-plus-circle
- 新增
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/components/Home.vue b/app/src/components/Home.vue
index a7f349a..291a2e3 100644
--- a/app/src/components/Home.vue
+++ b/app/src/components/Home.vue
@@ -1,7 +1,8 @@
-
+
@@ -41,13 +42,15 @@
v-else
:key="item.text"
link
+ dense
:to="item.route"
+ class="px-0 pl-5"
>
-
- {{ item.icon }}
-
+
+
+
-
+
{{ item.text }}
@@ -60,6 +63,7 @@
app
color="blue darken-3"
dark
+ dense
>
-
-
{{ message }}
@@ -116,6 +118,7 @@
drawer: null,
error: false,
message: "",
+ items: [{ text: '資訊資產群組', route: '/asset_group' }],
}),
created(){
this.$root.$on('showError', (message) => {
@@ -128,27 +131,25 @@
let roles = localStorage.getItem('roles');
return (roles != null && roles.indexOf('ADMIN') >= 0 );
},
- items() {
- let ret = [
- { icon: 'mdi-history', text: '資訊資產群組', route: '/asset_group' },
- { icon: 'mdi-history', text: '硬體', route: '/hardware' },
- { icon: 'mdi-history', text: '軟體', route: '/software' },
- { icon: 'mdi-history', text: '資料與文件', route: '/fileAndData' },
- { icon: 'mdi-history', text: '人員', route: '/person' },
- ];
- // if (this.isAdmin) {
- // ret.push({ icon: 'mdi-account', text: '帳號權限管理', route: '/account' });
- // ret.push({ icon: 'mdi-poll-box', text: '報表組態管理', route: '/report_conf' });
- // ret.push({ icon: 'mdi-message', text: '通知信管理', route: '/notice' });
- // ret.push({ icon: 'mdi-account-details', text: '收信人管理', route: '/receiver' });
- // }
- return ret;
- }
+ },
+ mounted() {
+ this.getRoutes();
},
methods: {
logout(){
this.$emit("authenticated", null);
},
+ async getRoutes() {
+ this.$axios.get('/routes').then((resp) => {
+ resp.data.data.forEach((item) => {
+ let route = {'text': '', 'route': ''};
+ route.text = item.descript;
+ route.route = `/inventory/${item.tablename}`;
+ this.items.push(route);
+ });
+ console.log(this.items);
+ });
+ },
}
}
diff --git a/app/src/components/Inventory.vue b/app/src/components/Inventory.vue
new file mode 100644
index 0000000..41a88c6
--- /dev/null
+++ b/app/src/components/Inventory.vue
@@ -0,0 +1,280 @@
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+ mdi-plus
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+ mdi-pencil
+
+
+
+
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+
+ 修改
+
+
+
+
+
+ mdi-delete
+
+
+
+
+
+
diff --git a/app/src/components/Person.vue b/app/src/components/Person.vue
deleted file mode 100644
index 3c5c7d7..0000000
--- a/app/src/components/Person.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/app/src/components/Software.vue b/app/src/components/Software.vue
deleted file mode 100644
index 3c5c7d7..0000000
--- a/app/src/components/Software.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
diff --git a/app/src/router/index.js b/app/src/router/index.js
index 04e9b55..f303177 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -1,12 +1,9 @@
import Vue from 'vue'
import Router from 'vue-router'
import Login from '@/components/Login'
-import Home from "../components/Home";
-import AssetGroup from "../components/AssetGroup";
-import Hardware from "../components/Hardware";
-import Software from "../components/Software";
-import FileAndData from "../components/FileAndData";
-import Person from "../components/Person";
+import Home from '../components/Home';
+import AssetGroup from '../components/AssetGroup';
+import Inventory from '../components/Inventory';
Vue.use(Router);
@@ -27,24 +24,9 @@ export const constantRoutes = [
component: AssetGroup
},
{
- path: '/hardware',
- name: 'hardware',
- component: Hardware
- },
- {
- path: '/software',
- name: 'software',
- component: Software
- },
- {
- path: '/fileAndData',
- name: 'fileAndData',
- component: FileAndData
- },
- {
- path: '/person',
- name: 'person',
- component: Person
+ path: '/inventory/:tablename',
+ name: 'inventory',
+ component: Inventory
},
]
}
diff --git a/pom.xml b/pom.xml
index 11c0e84..a5f4939 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,16 +97,6 @@
true
-
- org.slf4j
- slf4j-api
- 1.7.30
-
-
- org.slf4j
- slf4j-simple
- 1.7.30
-
diff --git a/src/main/java/com/moze/rms/config/JdbiFactory.java b/src/main/java/com/moze/rms/config/JdbiFactory.java
index 0bb8443..608f789 100644
--- a/src/main/java/com/moze/rms/config/JdbiFactory.java
+++ b/src/main/java/com/moze/rms/config/JdbiFactory.java
@@ -1,6 +1,8 @@
package com.moze.rms.config;
-import com.moze.rms.dao.HardwareDAO;
+import com.moze.rms.dao.InventoryDAO;
+import com.moze.rms.dao.MappingColDAO;
+import com.moze.rms.dao.MappingTableDAO;
import org.jdbi.v3.core.Jdbi;
import org.jdbi.v3.core.statement.SqlLogger;
import org.jdbi.v3.core.statement.StatementContext;
@@ -12,6 +14,7 @@ import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
import javax.sql.DataSource;
+
@Configuration
public class JdbiFactory {
@@ -48,8 +51,19 @@ public class JdbiFactory {
// return jdbi;
// }
+
+ @Bean
+ public MappingTableDAO mappingTableDAO(Jdbi jdbi) {
+ return jdbi.onDemand(MappingTableDAO.class);
+ }
+
+ @Bean
+ public MappingColDAO mappingColDAO(Jdbi jdbi) {
+ return jdbi.onDemand(MappingColDAO.class);
+ }
+
@Bean
- public HardwareDAO hardwareDAO(Jdbi jdbi) {
- return jdbi.onDemand(HardwareDAO.class);
+ public InventoryDAO inventoryDAO(Jdbi jdbi) {
+ return jdbi.onDemand(InventoryDAO.class);
}
}
diff --git a/src/main/java/com/moze/rms/controller/AccountController.java b/src/main/java/com/moze/rms/controller/AccountController.java
new file mode 100644
index 0000000..f9d7187
--- /dev/null
+++ b/src/main/java/com/moze/rms/controller/AccountController.java
@@ -0,0 +1,10 @@
+package com.moze.rms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/account")
+public class AccountController {
+}
diff --git a/src/main/java/com/moze/rms/controller/HardwareController.java b/src/main/java/com/moze/rms/controller/HardwareController.java
deleted file mode 100644
index 73b78c3..0000000
--- a/src/main/java/com/moze/rms/controller/HardwareController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.moze.rms.controller;
-
-import com.moze.rms.dao.HardwareDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/hardware")
-public class HardwareController {
-
- @Autowired
- HardwareDAO hardwareDAO;
-
- @GetMapping("/hardwares")
- public JsonResult getHardwares() {
-
- return new JsonResult(StatusCode.SUCCESS, hardwareDAO.findAll());
- }
-
-
-}
diff --git a/src/main/java/com/moze/rms/controller/InventoryController.java b/src/main/java/com/moze/rms/controller/InventoryController.java
new file mode 100644
index 0000000..1d612e1
--- /dev/null
+++ b/src/main/java/com/moze/rms/controller/InventoryController.java
@@ -0,0 +1,60 @@
+package com.moze.rms.controller;
+
+
+import com.moze.rms.dao.InventoryDAO;
+import com.moze.rms.dao.MappingColDAO;
+import com.moze.rms.dao.MappingTableDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class InventoryController {
+
+ @Autowired
+ MappingTableDAO mappingTableDAO;
+
+ @Autowired
+ MappingColDAO mappingColDAO;
+
+ @Autowired
+ InventoryDAO inventoryDAO;
+
+
+ @GetMapping("/routes")
+ public JsonResult getRoutes() {
+
+ return new JsonResult(StatusCode.SUCCESS, mappingTableDAO.findAll());
+ }
+
+ @GetMapping("/title")
+ public JsonResult getTitle(@RequestParam String tablename) {
+
+ return new JsonResult(StatusCode.SUCCESS, mappingTableDAO.findTitle(tablename));
+ }
+
+
+ @GetMapping("/headers")
+ public JsonResult getHeaders(@RequestParam String tablename) {
+
+ return new JsonResult(StatusCode.SUCCESS, mappingColDAO.findByTable(tablename));
+ }
+ @GetMapping("/inventory")
+ public JsonResult getInventorys(@RequestParam String tablename) {
+ return new JsonResult(StatusCode.SUCCESS, inventoryDAO.getInventoryByTablename(tablename));
+ }
+
+ @PutMapping("/inventory")
+ public JsonResult modifyInventory(@RequestBody Map data) {
+ try {
+ inventoryDAO.modifyInventory(data);
+ return new JsonResult(StatusCode.SUCCESS, null);
+ } catch (Exception e) {
+ return new JsonResult(StatusCode.SYS_ERROR, e.getMessage());
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/moze/rms/dao/HardwareDAO.java b/src/main/java/com/moze/rms/dao/HardwareDAO.java
deleted file mode 100644
index 53b7739..0000000
--- a/src/main/java/com/moze/rms/dao/HardwareDAO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.moze.rms.dao;
-
-
-import com.moze.rms.entity.model.Hardware;
-import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
-import org.jdbi.v3.sqlobject.statement.SqlQuery;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@RegisterBeanMapper(Hardware.class)
-public interface HardwareDAO {
-
- @SqlQuery("select * from hardware;")
- List findAll();
-
-
-}
diff --git a/src/main/java/com/moze/rms/dao/InventoryDAO.java b/src/main/java/com/moze/rms/dao/InventoryDAO.java
new file mode 100644
index 0000000..edd7c8e
--- /dev/null
+++ b/src/main/java/com/moze/rms/dao/InventoryDAO.java
@@ -0,0 +1,35 @@
+package com.moze.rms.dao;
+
+
+import org.jdbi.v3.core.Handle;
+import org.jdbi.v3.sqlobject.SqlObject;
+import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
+import org.jdbi.v3.sqlobject.statement.SqlUpdate;
+
+import java.util.List;
+import java.util.Map;
+
+public interface InventoryDAO extends SqlObject {
+
+
+ @RegisterBeanMapper(Object.class)
+ default List> getInventoryByTablename(String tablename) {
+ Handle handle = this.getHandle();
+ String sql = "select * from " + tablename;
+ return handle.createQuery(sql).mapToMap().list();
+ }
+
+ default void modifyInventory(Map data) {
+
+ Handle handle = this.getHandle();
+ String sql = "update " + data.get("tablename") + " set ";
+ for (Map.Entry entry : data.entrySet()) {
+ if (!entry.getKey().equals("id") && !entry.getKey().equals("tablename"))
+ sql += entry.getKey() + " = " + entry.getValue() + ",";
+ }
+ sql = sql.substring(0, sql.length()-1);
+ sql += "where id = " + data.get("id");
+ handle.createUpdate(sql).execute();
+ }
+}
diff --git a/src/main/java/com/moze/rms/dao/MappingColDAO.java b/src/main/java/com/moze/rms/dao/MappingColDAO.java
new file mode 100644
index 0000000..f0e937a
--- /dev/null
+++ b/src/main/java/com/moze/rms/dao/MappingColDAO.java
@@ -0,0 +1,16 @@
+package com.moze.rms.dao;
+
+
+import com.moze.rms.entity.model.MappingCol;
+import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
+
+import java.util.List;
+
+@RegisterBeanMapper(MappingCol.class)
+public interface MappingColDAO {
+
+
+ @SqlQuery("select * from mapping.mapping_col where tablename = ? order by index;")
+ List findByTable(String tablename);
+}
diff --git a/src/main/java/com/moze/rms/dao/MappingTableDAO.java b/src/main/java/com/moze/rms/dao/MappingTableDAO.java
new file mode 100644
index 0000000..0131b5a
--- /dev/null
+++ b/src/main/java/com/moze/rms/dao/MappingTableDAO.java
@@ -0,0 +1,18 @@
+package com.moze.rms.dao;
+
+
+import com.moze.rms.entity.model.MappingTable;
+import org.jdbi.v3.sqlobject.config.RegisterBeanMapper;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
+
+import java.util.List;
+
+@RegisterBeanMapper(MappingTable.class)
+public interface MappingTableDAO {
+
+ @SqlQuery("select * from mapping.mapping_table;")
+ List findAll();
+
+ @SqlQuery("select descript from mapping.mapping_table where tablename = ?;")
+ String findTitle(String tablename);
+}
diff --git a/src/main/java/com/moze/rms/entity/model/Hardware.java b/src/main/java/com/moze/rms/entity/model/Hardware.java
deleted file mode 100644
index 5ffd728..0000000
--- a/src/main/java/com/moze/rms/entity/model/Hardware.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.moze.rms.entity.model;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class Hardware {
- private String hostname;
- private String type;
- private String descript;
- private String ip1;
- private String ip2;
- private String model;
- private String environment;
- private String position;
- private String position_number;
- private Integer amount;
- private String owner_department;
- private String keep_department;
- private String keeper;
- private String remark;
-}
diff --git a/src/main/java/com/moze/rms/entity/model/MappingCol.java b/src/main/java/com/moze/rms/entity/model/MappingCol.java
new file mode 100644
index 0000000..0f8e847
--- /dev/null
+++ b/src/main/java/com/moze/rms/entity/model/MappingCol.java
@@ -0,0 +1,15 @@
+package com.moze.rms.entity.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class MappingCol {
+
+ private String tablename;
+ private String colname;
+ private Integer level;
+ private String descript;
+ private String type;
+}
diff --git a/src/main/java/com/moze/rms/entity/model/MappingTable.java b/src/main/java/com/moze/rms/entity/model/MappingTable.java
new file mode 100644
index 0000000..0140fd5
--- /dev/null
+++ b/src/main/java/com/moze/rms/entity/model/MappingTable.java
@@ -0,0 +1,13 @@
+package com.moze.rms.entity.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class MappingTable {
+
+ private String tablename;
+ private String descript;
+
+}