Merge branch 'develop' into develop-green

src/custom/service/AutoDockItemService.java

@@ -31,6 +31,11 @@ public class AutoDockItemService extends ServiceController {
             }
 
             String paramname = "AutoDockItemServiceTime" + "_" + siteid;
+            Rows parameterrows = new DBConnect().runSqlQuery("select * from sys_parameter where paramname='" + paramname + "'");
+            long sys_parameterid=0;
+            if(parameterrows.isNotEmpty()){
+                sys_parameterid=parameterrows.get(0).getLong("sys_parameterid");
+            }
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             simpleDateFormat.setTimeZone(TimeZone.getTimeZone("Etc/GMT-8"));
             String AutoDockItemServiceTime = getAutoDockItemServiceTime(paramname, simpleDateFormat);
@@ -284,7 +289,7 @@ public class AutoDockItemService extends ServiceController {
 
             dbConnect.runSqlUpdate(sqlList);
 
-            Parameter.create(new BaseClass(), paramname, simpleDateFormat.format(new Date()), "");
+            update(paramname, simpleDateFormat.format(new Date()), "",sys_parameterid);
         }
     }
 
@@ -294,12 +299,23 @@ public class AutoDockItemService extends ServiceController {
         String AutoDockItemServiceTime = simpleDateFormat.format(date);
         if (rows.isNotEmpty()) {
             AutoDockItemServiceTime = rows.get(0).getString("paramvalue");
-            dbConnect.runSqlUpdate("delete from sys_parameter where paramname='" + paramname + "'");
+            //dbConnect.runSqlUpdate("delete from sys_parameter where paramname='" + paramname + "'");
         } else {
-            Parameter.create(new BaseClass(), paramname, simpleDateFormat.format(date), "");
+            Parameter.create(new BaseClass(), paramname, AutoDockItemServiceTime, "");
         }
 
         return AutoDockItemServiceTime;
     }
 
+    public static void update(String paramname, String defaultvalue, String remarks,long sys_parameterid) throws YosException {
+        DBConnect dbConnect=new DBConnect();
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(dbConnect, "sys_parameter");
+        updateSQL.setValue("paramname", paramname);
+        updateSQL.setValue("paramvalue", defaultvalue);
+        updateSQL.setValue("remarks", remarks);
+        updateSQL.setUniqueid(sys_parameterid);
+        updateSQL.update();
+    }
+
+
 }