gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全量同步接口调用打开

Browse Source
This commit is contained in:
段冬梅
2019-03-20 11:32:24 +08:00
parent f284491963
commit dc1a75c9c9
4 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/util/ConfigServiceUtil.java
View File

@@ -831,7 +831,7 @@ public class ConfigServiceUtil {
String result = null; String result = null;
String url = DictUtils.getDictLabel("config_sync_url", "get_sync_status"); 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); logger.info("get_sync_status url:"+url);
//获取响应结果 //获取响应结果
Builder header = wt.request(MediaType.APPLICATION_JSON) Builder header = wt.request(MediaType.APPLICATION_JSON)
@@ -844,13 +844,13 @@ public class ConfigServiceUtil {
} catch (Exception e) { } catch (Exception e) {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>"); throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
} }
if(response != null && response.getStatus() == 200){*/ if(response != null && response.getStatus() == 200){
logger.info("get result success"); 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); bean= JSONObject.fromObject(result);
/*}else{ }else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result); throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
}*/ }
} catch (Exception e) { } catch (Exception e) {
throw e; throw e;
}finally { }finally {

12
src/main/java/com/nis/web/controller/configuration/ConfigSynchronizationController.java
View File

@@ -54,8 +54,8 @@ public class ConfigSynchronizationController extends BaseController {
public String configSync(Model model,Integer cmd,Integer serviceId,HttpServletRequest request,HttpServletResponse response){ public String configSync(Model model,Integer cmd,Integer serviceId,HttpServletRequest request,HttpServletResponse response){
Map<String,Integer> map = new HashMap(); Map<String,Integer> map = new HashMap();
map.put("syncStatus", cmd); map.put("syncStatus", cmd);
//TODO 联调时打开JSONObject result = ConfigServiceUtil.configSyncCmd(BaseService.gsonToJson(map)); 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=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(result.get("status").equals(201)){//响应成功
if(cmd.equals(1)){//同步 if(cmd.equals(1)){//同步
SysDataDictionaryName sysDictName = new SysDataDictionaryName(); SysDataDictionaryName sysDictName = new SysDataDictionaryName();
@@ -130,8 +130,8 @@ public class ConfigSynchronizationController extends BaseController {
}else{ }else{
boolean isFinished = true; boolean isFinished = true;
while(isFinished){ while(isFinished){
//TODO 联调时打开JSONObject result = ConfigServiceUtil.configSyncStatus();//获取同步状态 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 = 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)){ if(result.get("status").equals(200)){
List<Map<String,Object>> list = result.getJSONArray("data"); List<Map<String,Object>> list = result.getJSONArray("data");
if(!StringUtil.isEmpty(list)){ if(!StringUtil.isEmpty(list)){
@@ -183,8 +183,8 @@ public class ConfigSynchronizationController extends BaseController {
String failStatus = DictUtils.getDictCode("config_sync_status", "fail","-2"); String failStatus = DictUtils.getDictCode("config_sync_status", "fail","-2");
Map<String,Object> map = Maps.newHashMap(); Map<String,Object> map = Maps.newHashMap();
if(!currentStatus.equals(successStatus) && !currentStatus.equals(failStatus) && !currentStatus.equals(serverFailStatus)){ 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\"}]}"); //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 = ConfigServiceUtil.configSyncStatus();//获取同步状态
if(result.get("status").equals(200)){ if(result.get("status").equals(200)){
List<Map<String,Object>> list = result.getJSONArray("data"); List<Map<String,Object>> list = result.getJSONArray("data");
if(!StringUtil.isEmpty(list)){ if(!StringUtil.isEmpty(list)){

30
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -162,7 +162,8 @@ public class ConfigSynchronizationService extends BaseService{
}else{ }else{
json="[]"; 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(); long end = System.currentTimeMillis();
@@ -466,7 +467,8 @@ public class ConfigSynchronizationService extends BaseService{
//调用服务接口配置全量更新 //调用服务接口配置全量更新
isFinished = ((!hasData)&&lastServiceTag)?true:false; isFinished = ((!hasData)&&lastServiceTag)?true:false;
FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, 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; return hasData;
@@ -637,7 +639,8 @@ public class ConfigSynchronizationService extends BaseService{
//调用服务接口配置全量更新 //调用服务接口配置全量更新
isFinished = ((!hasData)&&lastServiceTag)?true:false; isFinished = ((!hasData)&&lastServiceTag)?true:false;
FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, 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; return hasData;
@@ -826,7 +829,8 @@ public class ConfigSynchronizationService extends BaseService{
//调用服务接口配置全量更新 //调用服务接口配置全量更新
isFinished = ((!hasData)&&lastServiceTag)?true:false; isFinished = ((!hasData)&&lastServiceTag)?true:false;
FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, 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; return hasData;
@@ -996,7 +1000,8 @@ public class ConfigSynchronizationService extends BaseService{
//调用服务接口配置全量更新 //调用服务接口配置全量更新
isFinished = ((!hasData)&&lastServiceTag)?true:false; isFinished = ((!hasData)&&lastServiceTag)?true:false;
FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, 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; return hasData;
@@ -1282,7 +1287,8 @@ public class ConfigSynchronizationService extends BaseService{
//调用服务接口配置全量更新 //调用服务接口配置全量更新
isFinished = ((!hasData)&&lastServiceTag)?true:false; isFinished = ((!hasData)&&lastServiceTag)?true:false;
FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, 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; isFinished = ((!hasData)&&lastServiceTag)?true:false;
FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, 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; 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); 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; 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); 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); FileUtils.writeToFile("/home/ceiec/configSync/"+DateUtils.getDate("yyyy-MM-dd")+"/"+entity.getServiceId()+"_"+page.getPageNo()+"_"+System.currentTimeMillis()+".json", json, false);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
isFinished = ((!hasData)&&lastServiceTag)?true: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());
} }
} }

2
src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp
View File

@@ -5,8 +5,8 @@
<title></title> <title></title>
<script type="text/javascript"> <script type="text/javascript">
$(document) .ready(function() { $(document) .ready(function() {
changeService();
top.$.jBox.closeTip(); top.$.jBox.closeTip();
changeService();
$("#cfgFrom").validate({ $("#cfgFrom").validate({
submitHandler : function(form) { submitHandler : function(form) {
top.$.jBox.tip("The system is being maintained and temporarily inaccessible.",'loading',{opacity:0.5,persistent:true}); top.$.jBox.tip("The system is being maintained and temporarily inaccessible.",'loading',{opacity:0.5,persistent:true});