From 8ed64c047f4369fa13e39da4bff4ed201f26f9e1 Mon Sep 17 00:00:00 2001
From: chenjingjing <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 15:30:33 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
index c56a222..90834a1 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_setparamService.java
@@ -106,7 +106,8 @@
 						}
 					}
 				}
-				long moment_time = c.getTimeInMillis();
+				Calendar cl = Calendar.getInstance(); 
+				long moment_time = cl.getTimeInMillis();
 				time=moment_time-now_time;
 			}while(time<=5*1000);
 			model.setData(list);
@@ -141,7 +142,8 @@
 						}
 					}
 				}
-				long moment_time = c.getTimeInMillis();
+				Calendar cl = Calendar.getInstance(); 
+				long moment_time = cl.getTimeInMillis();
 				time=moment_time-now_time;
 			}while(time<=5*1000);
 			model.setData(list);
@@ -263,12 +265,25 @@
 	public static void main(String[] args) {
 		Fbs9100_setparamService fs = new Fbs9100_setparamService();
 		//fs.searchAll();
-		Fbs9100_setparam f=new Fbs9100_setparam();
+		/*Fbs9100_setparam f=new Fbs9100_setparam();
 	    
 		f.setNum(41);
 		f.setDev_id(910000024);
 		ServiceModel model=fs.serchbyDev_id(f);
-		System.out.println(model);
+		System.out.println(model);*/
+		Calendar c = Calendar.getInstance(); 
+		long now_time = c.getTimeInMillis();
+		System.out.println("now_time:"+now_time);
+		try {
+			Thread.sleep(10*1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Calendar cl = Calendar.getInstance(); 
+		long moment_time = cl.getTimeInMillis();
+		System.out.println("moment_time:"+moment_time);
+		System.err.println((moment_time-now_time));
 	}
 
 }

--
Gitblit v1.9.1