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

Merge branch 'develop' of https://wangxin:QFDZ1534WxzN@git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
wangxin
2018-12-18 12:56:12 +06:00
parent 54f47663c3 96fdd8772d
commit dafa40a3af
5 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -1222,9 +1222,11 @@ public class BaseController {
* @param serviceDictId * @param serviceDictId
* @param regionDictIds * @param regionDictIds
* @param requestId * @param requestId
* @param classify
* @param attribute
*/ */
public void _import(HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes, public void _import(HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes,
MultipartFile[] files, Integer serviceDictId, String regionDictIds, Integer requestId) { MultipartFile[] files, Integer serviceDictId, String regionDictIds, Integer requestId, String attribute, String classify) {
logger.warn("import start..."); logger.warn("import start...");
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
ImportBigExcel ei=null; ImportBigExcel ei=null;
@@ -1484,10 +1486,10 @@ public class BaseController {
_cfg.setIsValid(Constants.VALID_NO); _cfg.setIsValid(Constants.VALID_NO);
} }
_cfg.setIsAreaEffective(0); _cfg.setIsAreaEffective(0);
_cfg.setAttribute("0");
_cfg.setClassify("0");
_cfg.setLable("0"); _cfg.setLable("0");
_cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); _cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
_cfg.setAttribute(attribute);
_cfg.setClassify(classify);
_cfg.setServiceId(0); _cfg.setServiceId(0);
//设置region id //设置region id
if(regionIds!=null&&regionIds.size()==_ipPortCfgs.size()) { if(regionIds!=null&&regionIds.size()==_ipPortCfgs.size()) {
@@ -1584,10 +1586,10 @@ public class BaseController {
cfg.setIsValid(Constants.VALID_NO); cfg.setIsValid(Constants.VALID_NO);
} }
cfg.setIsAreaEffective(0); cfg.setIsAreaEffective(0);
cfg.setAttribute("0");
cfg.setClassify("0");
cfg.setLable("0"); cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
cfg.setAttribute(attribute);
cfg.setClassify(classify);
cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId());
cfg.setTableName("ip_port_cfg"); cfg.setTableName("ip_port_cfg");
if(compileIds.size()==_ipPortCfgs.size()) { if(compileIds.size()==_ipPortCfgs.size()) {
@@ -1711,10 +1713,10 @@ public class BaseController {
cfg.setIsValid(Constants.VALID_NO); cfg.setIsValid(Constants.VALID_NO);
} }
cfg.setIsAreaEffective(0); cfg.setIsAreaEffective(0);
cfg.setAttribute("0");
cfg.setClassify("0");
cfg.setLable("0"); cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
cfg.setAttribute(attribute);
cfg.setClassify(classify);
cfg.setServiceId(serviceDict.getServiceId()); cfg.setServiceId(serviceDict.getServiceId());
if(compileIds!=null&&compileIds.size()==_stringCfgs.size()) { if(compileIds!=null&&compileIds.size()==_stringCfgs.size()) {
cfg.setCompileId(compileIds.get(ind)); cfg.setCompileId(compileIds.get(ind));
@@ -1793,10 +1795,10 @@ public class BaseController {
cfg.setIsAudit(0); cfg.setIsAudit(0);
cfg.setIsValid(0); cfg.setIsValid(0);
cfg.setIsAreaEffective(0); cfg.setIsAreaEffective(0);
cfg.setAttribute("0");
cfg.setClassify("0");
cfg.setLable("0"); cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
cfg.setAttribute(attribute);
cfg.setClassify(classify);
cfg.setServiceId(serviceDict.getServiceId()); cfg.setServiceId(serviceDict.getServiceId());
if(compileIds!=null&&compileIds.size()==_complexkeywordCfgs.size()) { if(compileIds!=null&&compileIds.size()==_complexkeywordCfgs.size()) {
cfg.setCompileId(compileIds.get(ind)); cfg.setCompileId(compileIds.get(ind));
@@ -1872,10 +1874,10 @@ public class BaseController {
cfg.setIsAudit(0); cfg.setIsAudit(0);
cfg.setIsValid(0); cfg.setIsValid(0);
cfg.setIsAreaEffective(0); cfg.setIsAreaEffective(0);
cfg.setAttribute("0");
cfg.setClassify("0");
cfg.setLable("0"); cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
cfg.setAttribute(attribute);
cfg.setClassify(classify);
cfg.setServiceId(serviceDict.getServiceId()); cfg.setServiceId(serviceDict.getServiceId());
cfg.setCompileId(compileIds.get(ind)); cfg.setCompileId(compileIds.get(ind));
ind++; ind++;

4
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -418,9 +418,11 @@ public class IpController extends BaseController{
@RequestParam("files") MultipartFile[] files @RequestParam("files") MultipartFile[] files
,Integer serviceDictId ,Integer serviceDictId
,Integer requestId ,Integer requestId
,String attribute
,String classify
,String regionDictIds ,String regionDictIds
,String importPath) { ,String importPath) {
this._import(request,response,redirectAttributes, files,serviceDictId,regionDictIds,requestId); this._import(request,response,redirectAttributes, files,serviceDictId,regionDictIds,requestId,attribute,classify);
return "redirect:" + adminPath+ importPath; return "redirect:" + adminPath+ importPath;
} }
//ip配置导出 //ip配置导出

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

@@ -429,7 +429,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList.add(maatCfg); configCompileList.add(maatCfg);
} }
page.setList(list); page.setList(list);
if(page.isLastPage()){ if(page.getLast()==page.getPageNo()){
hasData = false; hasData = false;
} }
if(!StringUtil.isEmpty(configCompileList.size())){ if(!StringUtil.isEmpty(configCompileList.size())){
@@ -441,7 +441,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
//调用服务接口下发配置数据 //调用服务接口下发配置数据
if(isUpdateCfg) { if(isUpdateCfg) {
logger.info("配置批量下发："+json); // logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){ if(result!=null){
@@ -600,7 +600,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList.add(maatCfg); configCompileList.add(maatCfg);
} }
page.setList(list); page.setList(list);
if(page.isLastPage()){ if(page.getLast()==page.getPageNo()){
hasData = false; hasData = false;
} }
if(!StringUtil.isEmpty(configCompileList.size())){ if(!StringUtil.isEmpty(configCompileList.size())){
@@ -612,7 +612,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
//调用服务接口下发配置数据 //调用服务接口下发配置数据
if(isUpdateCfg) { if(isUpdateCfg) {
logger.info("配置批量下发："+json); // logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){ if(result!=null){
@@ -789,7 +789,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList.add(maatCfg); configCompileList.add(maatCfg);
} }
page.setList(list); page.setList(list);
if(page.isLastPage()){ if(page.getLast()==page.getPageNo()){
hasData = false; hasData = false;
} }
if(!StringUtil.isEmpty(configCompileList.size())){ if(!StringUtil.isEmpty(configCompileList.size())){
@@ -801,7 +801,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
//调用服务接口下发配置数据 //调用服务接口下发配置数据
if(isUpdateCfg) { if(isUpdateCfg) {
logger.info("配置批量下发："+json); // logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){ if(result!=null){
@@ -959,7 +959,7 @@ public class ConfigSynchronizationService extends BaseService{
configCompileList.add(maatCfg); configCompileList.add(maatCfg);
} }
page.setList(list); page.setList(list);
if(page.isLastPage()){ if(page.getLast()==page.getPageNo()){
hasData = false; hasData = false;
} }
if(!StringUtil.isEmpty(configCompileList.size())){ if(!StringUtil.isEmpty(configCompileList.size())){
@@ -971,7 +971,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
//调用服务接口下发配置数据 //调用服务接口下发配置数据
if(isUpdateCfg) { if(isUpdateCfg) {
logger.info("配置批量下发："+json); // logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){ if(result!=null){
@@ -1188,7 +1188,7 @@ public class ConfigSynchronizationService extends BaseService{
} }
} }
page.setList(list); page.setList(list);
if(page.isLastPage()){ if(page.getLast()==page.getPageNo()){
hasData = false; hasData = false;
} }
if(!StringUtil.isEmpty(configCompileList.size())){ if(!StringUtil.isEmpty(configCompileList.size())){
@@ -1200,7 +1200,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
//调用服务接口下发配置数据 //调用服务接口下发配置数据
if(isUpdateCfg) { if(isUpdateCfg) {
logger.info("配置批量下发："+json); // logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){ if(result!=null){
@@ -1396,7 +1396,7 @@ public class ConfigSynchronizationService extends BaseService{
} }
} }
page.setList(list); page.setList(list);
if(page.isLastPage()){ if(page.getLast()==page.getPageNo()){
hasData = false; hasData = false;
} }
if(!StringUtil.isEmpty(configCompileList.size())){ if(!StringUtil.isEmpty(configCompileList.size())){
@@ -1408,7 +1408,7 @@ public class ConfigSynchronizationService extends BaseService{
String json=gsonToJson(maatBean); String json=gsonToJson(maatBean);
//调用服务接口下发配置数据 //调用服务接口下发配置数据
if(isUpdateCfg) { if(isUpdateCfg) {
logger.info("配置批量下发："+json); // logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){ if(result!=null){
@@ -1571,7 +1571,7 @@ public class ConfigSynchronizationService extends BaseService{
} }
} }
page.setList(list); page.setList(list);
if(page.isLastPage()){ if(page.getLast()==page.getPageNo()){
hasData = false; hasData = false;
} }
if(!StringUtil.isEmpty(configCompileList.size())){ if(!StringUtil.isEmpty(configCompileList.size())){
@@ -1598,7 +1598,7 @@ public class ConfigSynchronizationService extends BaseService{
} }
}else {//未下发过的compile直接走正常maat配置接口 }else {//未下发过的compile直接走正常maat配置接口
logger.info("配置批量下发："+json); // logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){ if(result!=null){
@@ -1741,14 +1741,14 @@ public class ConfigSynchronizationService extends BaseService{
} }
page.setList(list); page.setList(list);
if(page.isLastPage()){ if(page.getLast()==page.getPageNo()){
hasData = false; hasData = false;
} }
if(newList.size()>0){ if(newList.size()>0){
//调用服务接口下发配置数据 //调用服务接口下发配置数据
String json=gsonToJson(newList); String json=gsonToJson(newList);
if(isUpdateCfg) { if(isUpdateCfg) {
logger.info("配置批量下发："+json); // logger.info("配置批量下发："+json);
//调用服务接口同步回调类配置 //调用服务接口同步回调类配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
if(result!=null){ if(result!=null){

20
src/main/webapp/WEB-INF/include/excel/importModal.jsp
View File

@@ -114,6 +114,26 @@
</select> </select>
</div> </div>
<div for="requestId"></div> <div for="requestId"></div>
</div>
</br>
<div class="row">
<label class="control-label col-md-3"><spring:message code="attribute"/></label>
<div class="col-md-6">
<sys:treeselect id="attribute" name="attribute" value="0" labelName="attributeName" extId="0"
labelValue="" labelEmptyValue="0"
title="attribute" url="/basics/serviceDictInfo/treeData?itType=2&isShowLeaf=true" notAllowSelectRoot="false" allowClear="true" notAllowSelectParent="false"
checked="true" cssClass="form-control" checkedPS="ps" unCheckedPS="s" />
</div>
</div>
</br>
<div class="row">
<label class="control-label col-md-3"><spring:message code="classification"/></label>
<div class="col-md-6">
<sys:treeselect id="classify" name="classify" value="0" labelName="classifyName" extId="0"
labelValue="" labelEmptyValue="0"
title="classification" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="false" allowClear="true" notAllowSelectParent="false"
checked="true" cssClass="form-control" checkedPS="ps" unCheckedPS="s"/>
</div>
</div> </div>
</br> </br>
<!-- 63 app --> <!-- 63 app -->

11
src/main/webapp/WEB-INF/views/report/asnRecordList.jsp
View File

@@ -34,7 +34,16 @@
// }); // });
// ajaxConnPercent(); // ajaxConnPercent();
}); });
/** 打印预览，弹出新页面 **/
function printPreview(path, title, content){
var options = {
popTitle : title+'打印预览',
mode : 'popup',
popClose : false,
extraCss : path+'/css/table.css'
};
$("div#"+content+"").printArea(options);
}
</script> </script>
</head> </head>
<body> <body>