Merge remote-tracking branch 'moze/master'

src/main/java/com/moze/rms/RequestInterceptor.java

@@ -19,6 +19,9 @@ public class RequestInterceptor implements HandlerInterceptor {
         if (uri.startsWith("/api/")) {
             return true;
         } else {
+            if (uri.contains("rms.war")) {
+                return true;
+            }
             if (uri.equals("/index.html")) {
                 return true;
             } else if (uri.startsWith("/js/") || uri.startsWith("/manifest") || uri.startsWith("/img") || uri.startsWith("/fonts") || uri.startsWith("/css")) {

src/main/java/com/moze/rms/dao/AssertDAO.java

@@ -14,6 +14,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public interface AssertDAO extends SqlObject {
@@ -167,7 +168,7 @@ public interface AssertDAO extends SqlObject {
     //新增欄位sql
     default void addColToTable(MappingCol m) {
         Handle handle = this.getHandle();
-        String sql = "ALTER TABLE " + m.getTablename() + " ADD " + m.getColname() + " " + "nvarchar(256)";
+        String sql = "ALTER TABLE " + m.getTablename() + " ADD " + m.getColname().toLowerCase() + " " + "nvarchar(256)";
         handle.createUpdate(sql).execute();
 
     }
@@ -193,7 +194,7 @@ public interface AssertDAO extends SqlObject {
                 if (value == null) {
                     value = "";
                 }
-                values += "'" + value + "'";
+                values += "'" + value.toLowerCase() + "'";
                 if (i < fields.length - 1) {
                     values += ",";
                 }
@@ -216,7 +217,7 @@ public interface AssertDAO extends SqlObject {
         for (int i = 1; i <= m.getInsertSelectItems().size(); i++) {
             String sql = "insert into mapping.\"selectItem\" values(";
             sql += "'" + m.getTablename() + "',";
-            sql += "'" + m.getColname() + "',";
+            sql += "'" + m.getColname().toLowerCase() + "',";
             sql += "'" + m.getInsertSelectItems().get(i - 1) + "',";
             sql += "'" + i + "')";
 
@@ -243,14 +244,14 @@ 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.toLowerCase() + "',";
             }
         }
         if (sql.endsWith(",")) {
             sql = sql.substring(0, sql.length() - 1);
         }
         sql += " where tablename = '" + m.getTablename() + "'";
-        sql += " and colname = '" + m.getColname() + "'";
+        sql += " and colname = '" + m.getColname().toLowerCase() + "'";
         handle.createUpdate(sql).execute();
     }
 
@@ -259,14 +260,14 @@ public interface AssertDAO extends SqlObject {
         Handle handle = this.getHandle();
 
 
-        String sqlDelete = "delete from mapping.selectItem where tablename = '" + m.getTablename() + "' and colname = '" + m.getColname() + "'" ;
+        String sqlDelete = "delete from mapping.selectItem where tablename = '" + m.getTablename() + "' and colname = '" + m.getColname().toLowerCase() + "'" ;
         handle.createUpdate(sqlDelete).execute();
 
         if (m.getModifySelectItems() != null) {
             for (int i = 1; i <= m.getModifySelectItems().size(); i++) {
                 String sql = "insert into mapping.selectItem values(";
                 sql += "'" + m.getTablename() + "',";
-                sql += "'" + m.getColname() + "',";
+                sql += "'" + m.getColname().toLowerCase() + "',";
                 sql += "'" + m.getModifySelectItems().get(i - 1) + "',";
                 sql += "'" + i + "')";
                 handle.createUpdate(sql).execute();

src/main/java/com/moze/rms/dao/InventoryDAO.java

@@ -37,7 +37,7 @@ public interface InventoryDAO extends SqlObject {
                 }
         }
         sql = sql.substring(0, sql.length() - 1);
-        sql += " where id = '" + data.get("id") + "'";
+        sql += " where id = " + data.get("id") + "";
         System.out.println(sql);
         handle.createUpdate(sql).execute();
     }