diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index 914766f21..057d51181 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -831,7 +831,7 @@ public class ConfigServiceUtil { String result = null; String url = DictUtils.getDictLabel("config_sync_url", "get_sync_status"); //创建连接 - /*WebTarget wt = ClientUtil.getWebTarger(url); + WebTarget wt = ClientUtil.getWebTarger(url); logger.info("get_sync_status url:"+url); //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON) @@ -844,13 +844,13 @@ public class ConfigServiceUtil { } catch (Exception e) { throw new MaatConvertException(""); } - if(response != null && response.getStatus() == 200){*/ + if(response != null && response.getStatus() == 200){ logger.info("get result success"); - result="{\"status\": 201,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"; + //result="{\"status\": 201,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"; bean= JSONObject.fromObject(result); - /*}else{ + }else{ throw new MaatConvertException(":"+result); - }*/ + } } catch (Exception e) { throw e; }finally { 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 5d6a8d3c3..6659d014c 100644 --- a/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java +++ b/src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java @@ -54,8 +54,8 @@ public class ConfigSynchronizationController extends BaseController { public String configSync(Model model,Integer cmd,Integer serviceId,HttpServletRequest request,HttpServletResponse response){ Map map = new HashMap(); map.put("syncStatus", cmd); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSyncCmd(BaseService.gsonToJson(map)); - JSONObject result=JSONObject.fromObject("{\"status\": 201,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"); + JSONObject result = ConfigServiceUtil.configSyncCmd(BaseService.gsonToJson(map)); + //JSONObject result=JSONObject.fromObject("{\"status\": 201,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"); if(result.get("status").equals(201)){//响应成功 if(cmd.equals(1)){//同步 SysDataDictionaryName sysDictName = new SysDataDictionaryName(); @@ -130,8 +130,8 @@ public class ConfigSynchronizationController extends BaseController { }else{ boolean isFinished = true; while(isFinished){ - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 - JSONObject result = JSONObject.fromObject("{\"status\": 200,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":3,\"opTime\":\"2016-11-22 08:31:27\"}]}"); + JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 + //JSONObject result = JSONObject.fromObject("{\"status\": 200,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":3,\"opTime\":\"2016-11-22 08:31:27\"}]}"); if(result.get("status").equals(200)){ List> list = result.getJSONArray("data"); if(!StringUtil.isEmpty(list)){ @@ -183,8 +183,8 @@ public class ConfigSynchronizationController extends BaseController { String failStatus = DictUtils.getDictCode("config_sync_status", "fail","-2"); Map map = Maps.newHashMap(); if(!currentStatus.equals(successStatus) && !currentStatus.equals(failStatus) && !currentStatus.equals(serverFailStatus)){ - JSONObject result = JSONObject.fromObject("{\"status\": 200,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 + //JSONObject result = JSONObject.fromObject("{\"status\": 200,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}"); + JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 if(result.get("status").equals(200)){ List> list = result.getJSONArray("data"); if(!StringUtil.isEmpty(list)){ diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java index 76466a7e5..40667c966 100644 --- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java +++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java @@ -162,7 +162,8 @@ public class ConfigSynchronizationService extends BaseService{ }else{ json="[]"; }*/ - //JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED"); + JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED"); + logger.info("全量下发响应信息:"+result.toString()); } } long end = System.currentTimeMillis(); @@ -466,7 +467,8 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true:false; FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } return hasData; @@ -637,7 +639,8 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true:false; FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } return hasData; @@ -826,7 +829,8 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true:false; FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); -//TODO 联调时打开 JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } return hasData; @@ -996,7 +1000,8 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true:false; FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } return hasData; @@ -1282,7 +1287,8 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true:false; FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } @@ -1490,7 +1496,8 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true:false; FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } @@ -1644,7 +1651,8 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true:false; FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+compileId+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } @@ -1799,7 +1807,8 @@ public class ConfigSynchronizationService extends BaseService{ //调用服务接口配置全量更新 isFinished = ((!hasData)&&lastServiceTag)?true:false; FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+compileId+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } @@ -1951,7 +1960,8 @@ public class ConfigSynchronizationService extends BaseService{ FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false); //调用服务接口同步回调类配置 isFinished = ((!hasData)&&lastServiceTag)?true:false; - //TODO 联调时打开JSONObject result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),isFinished?"FINISHED":null); + JSONObject result = ConfigServiceUtil.configSync(json,2,entity.getServiceId(),entity.getTableName(),isFinished?"FINISHED":null); + logger.info("全量下发响应信息:"+result.toString()); } } diff --git a/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp b/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp index 061ed5be5..4a17c21fb 100644 --- a/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp +++ b/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp @@ -5,8 +5,8 @@