From 5b79cca40ac53a5d92c3065f4f0164688e86a770 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.11>
Date: 星期一, 26 十一月 2018 15:26:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/User_infAction.java | 13 +++++++++++++
gx_tieta/WebRoot/Top.jsp | 30 ++++++++++++++++++++++++++++--
2 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index ed8a59f..458dcfe 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -132,6 +132,9 @@
</div>
<div class="cell-list control">
<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
+ </div>
+ <div class="cell-list server-time">
+ 2018-11-26 00:00:00
</div>
</div>
<div class="international">
@@ -334,8 +337,6 @@
}
-
-
$(function(){
$.ajax({
type: "post",
@@ -528,6 +529,31 @@
warnAlarmData = temp;
}
+ seachServerTime();
+ //鑾峰彇鏈嶅姟鍣ㄤ笂鐨勬椂闂�
+ function seachServerTime(){
+ $.ajax({
+ type:"post",
+ url: "User_infAction!searchServerTime",
+ async:true,
+ dataType:'text',
+ data:null,
+ success: function(data){
+ data = eval('('+data+')');
+ var model = eval('('+data.result+')');
+ if(model.code == 1){
+ $('.server-time').text(model.msg);
+ }else{
+
+ }
+ setTimeout(seachServerTime, 1000);
+ },
+ error:function() {
+ setTimeout(seachServerTime, 2000);
+ }
+ });
+ }
+
// 鐩戞祴褰撳墠鐨勫憡璀︿俊鎭槸鍚︿负鏈�鏂扮殑鍛婅
function checkWarnDataIsNew(warnData) {
var rs = 0;
diff --git a/gx_tieta/src/com/fgkj/actions/User_infAction.java b/gx_tieta/src/com/fgkj/actions/User_infAction.java
index 1b732d0..cb1ab3b 100644
--- a/gx_tieta/src/com/fgkj/actions/User_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/User_infAction.java
@@ -1,5 +1,7 @@
package com.fgkj.actions;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import com.fgkj.dao.UinfDaoFactory;
@@ -212,6 +214,17 @@
public String checkService(){
return SUCCESS;
}
+
+ //鑾峰彇鏈嶅姟鍣ㄧ殑鏃堕棿
+ public String searchServerTime(){
+ ServiceModel model = new ServiceModel();
+ model.setCode(1);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ model.setMsg(sdf.format(new Date()));
+ result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
+ return SUCCESS;
+ }
+
public String test(){
System.out.println(upjson);
System.out.println(uif);
--
Gitblit v1.9.1