From 489d4271b5e99f9d6c735b8912591c4da8459198 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Wed, 5 Dec 2018 17:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=9C=A8=E6=9C=AA=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9C=80=E7=BB=88=E7=8A=B6=E6=80=81=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=EF=BC=8C=E4=B8=80=E5=88=86=E9=92=9F=E8=BD=AE?=
 =?UTF-8?q?=E8=AF=A2=E4=B8=80=E6=AC=A1=E7=9B=B4=E8=87=B3=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigSynchronizationController.java      | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java b/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
index fb5af666f..118f56fc1 100644
--- a/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
@@ -126,6 +126,44 @@ public class ConfigSynchronizationController  extends BaseController {
 				map.put("syncStatus", 0);
 				JSONObject result = ConfigServiceUtil.configSyncCmd(BaseService.gsonToJson(map));//取消同步
 			}else{
+				boolean isFinished = true;
+				while(isFinished){
+					JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态
+					if(result.get("status").equals(200)){
+						List<Map<String,Object>> list = result.getJSONArray("data");
+						if(!StringUtil.isEmpty(list)){
+							Map<String,Object> map = list.get(0);
+							String serverStatus = map.get("status").toString();
+							if(serverStatus.equals("-1")||serverStatus.equals("3")){
+								isFinished = false;
+								SysDataDictionaryName sysDictName = new SysDataDictionaryName();
+								sysDictName.setMark("currrent_sync_status");
+								List<SysDataDictionaryName> dictList = dictService.findDicByName(sysDictName);
+								if(!StringUtil.isEmpty(dictList)){
+									SysDataDictionaryName dict = dictList.get(0);
+									List<SysDataDictionaryItem> itemList =dict.getDictItemList();
+									if(!StringUtil.isEmpty(itemList)){
+										SysDataDictionaryItem item =  itemList.get(0);
+										if(!serverStatus.equals(item.getItemValue())){//如果状态不同，则更新状态
+											item.setDictionaryId(dict.getId().intValue());
+											item.setItemValue(serverStatus);
+											dictService.updateDictItem(item);
+											//删除字典缓存
+											CacheUtils.remove(Constants.CACHE_DICT_MAP);
+										}
+										
+									}
+								}
+							}
+							
+						}
+					}
+					try{
+			            Thread.sleep(60000);
+			        } catch (InterruptedException e) {
+			            e.printStackTrace(); 
+			        }
+				}
 				
 			}
 		}