From e24097527f36dae2ba94d3906398a6dadd503781 Mon Sep 17 00:00:00 2001 From: teddyhuang Date: Wed, 24 Mar 2021 09:37:09 +0800 Subject: [PATCH] 202103240936 --- pom.xml | 7 +++++++ src/main/java/com/moze/rms/dao/AssertDAO.java | 24 ++++++++++++++--------- src/main/java/com/moze/rms/dao/InventoryDAO.java | 8 ++++---- src/main/java/com/moze/rms/dao/MappingColDAO.java | 2 +- src/main/resources/application-dev.properties | 6 +++--- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index a5f4939..82fded7 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,13 @@ 1.18.16 true + + + com.microsoft.sqlserver + mssql-jdbc + 9.2.1.jre8 + + diff --git a/src/main/java/com/moze/rms/dao/AssertDAO.java b/src/main/java/com/moze/rms/dao/AssertDAO.java index b2a789f..e0db8be 100644 --- a/src/main/java/com/moze/rms/dao/AssertDAO.java +++ b/src/main/java/com/moze/rms/dao/AssertDAO.java @@ -35,14 +35,20 @@ public interface AssertDAO extends SqlObject { } @RegisterBeanMapper(MappingCol.class) - @SqlQuery("select * from mapping.mapping_col order by index;") + @SqlQuery("select * from mapping.mapping_col order by [index];") List findAllCols(); //新增類別 default void insertAssertGroup(Map data) { Handle handle = this.getHandle(); - String sql = "CREATE TABLE " + data.get("assertGroupTablename") + "()"; + String sql = "create table " + data.get("assertGroupTablename") + + "(" + + " id int not null" + + " constraint " + data.get("assertGroupTablename") + "_pk" + + " primary key nonclustered," + + " type nvarchar(256)," + + ")"; handle.createUpdate(sql).execute(); } @@ -94,7 +100,7 @@ public interface AssertDAO extends SqlObject { } - @SqlQuery("select item from mapping.\"selectItem\" where tablename = ? and colname = ? order by index;") + @SqlQuery("select item from mapping.\"selectItem\" where tablename = ? and colname = ? order by [index];") @RegisterBeanMapper(SelectItemDTO.class) List getSelectItemsByCol(String tablename, String colname); @@ -117,7 +123,7 @@ public interface AssertDAO extends SqlObject { String name = fields[i].getName(); String type = fields[i].getGenericType().toString(); if (type.equals("class java.lang.String") && i < fields.length - 1) { - cols += name; + cols += "[" + name + "]"; if (i < fields.length - 1) { cols += ","; } @@ -174,7 +180,7 @@ public interface AssertDAO extends SqlObject { String name2 = name.substring(0, 1).toUpperCase() + name.substring(1); Method method = m.getClass().getMethod("get" + name2); String value = (String) method.invoke(m); - sql += " " + name + " = '" + value + "',"; + sql += " [" + name + "] = '" + value + "',"; } } if (sql.endsWith(",")) { @@ -191,7 +197,7 @@ public interface AssertDAO extends SqlObject { if (m.getInsertSelectItems() != null) { for (int i = 1; i <= m.getInsertSelectItems().size(); i++) { String sql = "update mapping.\"selectItem\" set "; - sql += "index = '" + i + "'"; + sql += "[index] = '" + i + "'"; sql += "where tablename = '" + m.getTablename() + "'"; sql += "and colname = '" + m.getColname() + "'"; @@ -222,12 +228,12 @@ public interface AssertDAO extends SqlObject { handle.createUpdate(sql).execute(); } - @SqlUpdate("update mapping.mapping_col set index = index + 1 where index < ?::numeric and index >= ?::numeric where tablename = ?") + @SqlUpdate("update mapping.mapping_col set [index] = [index] + 1 where [index] < CAST(? as int) and [index] >= CAST(? as int) and tablename = ?") void sortCol1(String oldIndex ,String index, String tablename); - @SqlUpdate("update mapping.mapping_col set index = index - 1 where index > ?::numeric and index <= ?::numeric where tablename = ?") + @SqlUpdate("update mapping.mapping_col set [index] = [index] - 1 where [index] > CAST(? as int) and [index] <= CAST(? as int) and tablename = ?") void sortCol2(String oldIndex ,String index, String tablename); - @SqlUpdate("select index from mapping.mapping_col where tablename = ? order by index desc limit 1;") + @SqlUpdate("select [index] from mapping.mapping_col where tablename = ? order by [index] desc limit 1;") Integer getLastIndex(String tablename); } diff --git a/src/main/java/com/moze/rms/dao/InventoryDAO.java b/src/main/java/com/moze/rms/dao/InventoryDAO.java index b1e59d5..c1c6ec1 100644 --- a/src/main/java/com/moze/rms/dao/InventoryDAO.java +++ b/src/main/java/com/moze/rms/dao/InventoryDAO.java @@ -29,9 +29,9 @@ public interface InventoryDAO extends SqlObject { for (Map.Entry entry : data.entrySet()) { if (!entry.getKey().equals("id") && !entry.getKey().equals("tablename")) if (entry.getValue() != null) { - sql += entry.getKey() + " = '" + entry.getValue() + "',"; + sql += "[" + entry.getKey() + "] = '" + entry.getValue() + "',"; } else { - sql += entry.getKey() + " = " + entry.getValue() + ","; + sql += "[" + entry.getKey() + "] = " + entry.getValue() + ","; } } sql = sql.substring(0, sql.length() - 1); @@ -39,7 +39,7 @@ public interface InventoryDAO extends SqlObject { handle.createUpdate(sql).execute(); } - @SqlQuery("select colname, item from mapping.\"selectItem\" where tablename = ? order by index;") + @SqlQuery("select colname, item from mapping.\"selectItem\" where tablename = ? order by [index];") @RegisterBeanMapper(SelectItemDTO.class) List getSelectItemByTable(String tablename); @@ -60,7 +60,7 @@ public interface InventoryDAO extends SqlObject { Object value = next.getValue(); System.out.println(key); if (key != "tablename" && key != "id") { - cols += key + ", "; + cols += "[" + key + "], "; values += "'" + value + "', "; } } diff --git a/src/main/java/com/moze/rms/dao/MappingColDAO.java b/src/main/java/com/moze/rms/dao/MappingColDAO.java index f0e937a..c4507d7 100644 --- a/src/main/java/com/moze/rms/dao/MappingColDAO.java +++ b/src/main/java/com/moze/rms/dao/MappingColDAO.java @@ -11,6 +11,6 @@ import java.util.List; public interface MappingColDAO { - @SqlQuery("select * from mapping.mapping_col where tablename = ? order by index;") + @SqlQuery("select * from mapping.mapping_col where tablename = ? order by [index];") List findByTable(String tablename); } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 26742da..e3d201a 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,8 +1,8 @@ server.servlet.context-path=/ -spring.datasource.url=jdbc:postgresql://172.105.222.191:54132/rms -spring.datasource.username=moze -spring.datasource.password=moze794064,! +spring.datasource.url=jdbc:sqlserver://172.105.222.191:1433;databaseName=rms; +spring.datasource.username=sa +spring.datasource.password=Moze794064,! server.port=8081