Index: forgon-core/src/main/java/com/forgon/log/model/Log.java
===================================================================
diff -u -r17400 -r17550
--- forgon-core/src/main/java/com/forgon/log/model/Log.java	(.../Log.java)	(revision 17400)
+++ forgon-core/src/main/java/com/forgon/log/model/Log.java	(.../Log.java)	(revision 17550)
@@ -11,6 +11,8 @@
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
+import java.util.Date;
+
 @Entity
 @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 public class Log {
@@ -50,8 +52,6 @@
 	public static final String CLIENT_TYPE_PC = "clientForWebBrowser";
 	
 	private Long id;
-	private String logDate;
-	private String logTime;
 	private String userId;
 	private String userIP;
 	private String sessionID;
@@ -68,16 +68,17 @@
 	private String clientType;
 	private String clientVersion;
 
+	/**
+	 * 日志的时间
+	 */
+	private Date logDateTime;
+
 	@Id
 	@GeneratedValue(strategy=GenerationType.AUTO)
 	public Long getId() {
 		return id;
 	}
 
-	public String getLogDate() {
-		return logDate;
-	}
-
 	public String getSessionID() {
 		return sessionID;
 	}
@@ -86,18 +87,7 @@
 		this.sessionID = sessionID;
 	}
 
-	public void setLogDate(String logDate) {
-		this.logDate = logDate;
-	}
 
-	public String getLogTime() {
-		return logTime;
-	}
-
-	public void setLogTime(String logTime) {
-		this.logTime = logTime;
-	}
-
 	public void setId(Long id) {
 		this.id = id;
 	}
@@ -167,6 +157,12 @@
 	public void setModel(String model) {
 		this.model = model;
 	}
-	
 
+	public Date getLogDateTime() {
+		return logDateTime;
+	}
+
+	public void setLogDateTime(Date logDateTime) {
+		this.logDateTime = logDateTime;
+	}
 }
Index: forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java
===================================================================
diff -u -r16411 -r17550
--- forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java	(.../LogManagerImpl.java)	(revision 16411)
+++ forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java	(.../LogManagerImpl.java)	(revision 17550)
@@ -143,10 +143,7 @@
 		Log log = new Log();
 		log.setUserId(loginUserData.getUserName());
 		log.setUsername(userName);
-		log.setLogDate(FastDateFormat.getInstance("yyyy-MM-dd").format(
-				Calendar.getInstance()));
-		log.setLogTime(FastDateFormat.getInstance("HH:mm:ss").format(
-				Calendar.getInstance()));
+		log.setLogDateTime(new Date());
 
 		if( details != null)
 		{
@@ -167,14 +164,10 @@
 		Log log = new Log();
 		String userId = loginUser.getUserName();
 		String userIP = loginUser.getUserIP();
-		
-		String dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-				.format(new Date());
-		
+
 		String userFullName = loginUser.getUserFullName();
 		
-		log.setLogDate(dateTime.substring(0,10));
-		log.setLogTime(dateTime.substring(11,19));
+		log.setLogDateTime(new Date());
 		log.setUsername(userFullName);
 		log.setUserId(userId);
 		log.setUserIP(userIP);
@@ -206,10 +199,11 @@
 			Log log = (Log) objectDao.getBySql(Log.class.getSimpleName(), sql);
 			if( log != null)
 			{
-				String date = log.getLogDate() + " " +  log.getLogTime();
-				SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-				Date lastDate = sim.parse(date);
-				return lastDate;
+				return log.getLogDateTime();
+				// String date = log.getLogDate() + " " +  log.getLogTime();
+				// SimpleDateFormat sim=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+				// Date lastDate = sim.parse(date);
+				// return lastDate;
 			}
 		}catch(Exception e){
 			e.printStackTrace();
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java
===================================================================
diff -u -r16845 -r17550
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java	(.../WebServiceManagerImpl.java)	(revision 16845)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java	(.../WebServiceManagerImpl.java)	(revision 17550)
@@ -299,10 +299,7 @@
 		log.setUserId(userId);
 		log.setUsername(userName);
 		log.setUserIP(getRemoteAddr());
-		log.setLogDate(FastDateFormat.getInstance("yyyy-MM-dd").format(
-				Calendar.getInstance()));
-		log.setLogTime(FastDateFormat.getInstance("HH:mm:ss").format(
-				Calendar.getInstance()));
+		log.setLogDateTime(new Date());
 
 		log.setClientType(Log.CLIENT_TYPE_WIN_MOBILE);
 		log.setClientVersion(clientVersion);
@@ -319,8 +316,7 @@
 		log.setUsername(userName);
 		log.setUserIP(getRemoteAddr());
 		Calendar now = Calendar.getInstance();
-		log.setLogDate(FastDateFormat.getInstance("yyyy-MM-dd").format(now));
-		log.setLogTime(FastDateFormat.getInstance("HH:mm:ss").format(now));
+		log.setLogDateTime(new Date());
 		log.setOperationType(operationType);
 		log.setOperationDescription(operationDescription);
 
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.7.6_4.7.7_sqlserver.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.6_4.7.7_sqlserver.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.6_4.7.7_sqlserver.sql	(revision 17550)
@@ -0,0 +1,2 @@
+-- 新增记录日志时间字段logDateTime,把logDate和logTime整合到一起
+update Log set logDateTime = cast(logDate + ' ' + logTime as datetime);
\ No newline at end of file
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.7.6_4.7.7_oracle.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.6_4.7.7_oracle.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.6_4.7.7_oracle.sql	(revision 17550)
@@ -0,0 +1,2 @@
+-- 新增记录日志时间字段logDateTime,把logDate和logTime整合到一起
+update LOG set LOGDATETIME = TO_DATE(LOGDATE || ' ' ||LOGTIME, 'yyyy-mm-dd hh24:mi:ss');
\ No newline at end of file