From 1ec2f7ad973f8d24d1e45e2308bef37d3b76bed4 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 2 Nov 2018 20:36:51 +0800 Subject: [PATCH] =?UTF-8?q?app=20http=E7=89=B9=E5=BE=81=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/BaseController.java | 25 +++++++++++++------ .../service/configuration/AppCfgService.java | 10 +++++++- .../resources/sql/20181030/update_region.sql | 5 +++- .../WEB-INF/views/cfg/app/appHttpCfgList.jsp | 21 +++++++++++++++- 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 4e965100e..faaa39ad7 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3305,8 +3305,9 @@ public class BaseController { || serviceDict.getServiceId().intValue() == 147 || serviceDict.getServiceId().intValue() == 36 || serviceDict.getServiceId().intValue() == 148 - || serviceDict.getServiceId().intValue() == 1028)// app ip - ) { + || serviceDict.getServiceId().intValue() == 1028// app ip + || serviceDict.getServiceId().intValue() == 1024//app http + )) { if (StringUtils.isNotBlank(specServiceId)) { specificServiceCfg = specificServiceCfgService .getBySpecServiceId(Integer.parseInt(specServiceId)); @@ -3473,7 +3474,9 @@ public class BaseController { cfg.setLable("0"); cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); cfg.setServiceId(serviceDict.getServiceId()); - cfg.setCompileId(compileIds.get(i)); + if(compileIds!=null&&compileIds.size()==stringCfgs.size()) { + cfg.setCompileId(compileIds.get(i)); + } if(specificServiceCfg!=null) { cfg.setAppCode(specificServiceCfg.getSpecServiceCode()); cfg.setSpecServiceId(specificServiceCfg.getSpecServiceId()); @@ -3572,7 +3575,9 @@ public class BaseController { cfg.setLable("0"); cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); cfg.setServiceId(serviceDict.getServiceId()); - cfg.setCompileId(compileIds.get(ind)); + if(compileIds!=null&&compileIds.size()==complexkeywordCfgs.size()) { + cfg.setCompileId(compileIds.get(ind)); + } if(specificServiceCfg!=null) { cfg.setAppCode(specificServiceCfg.getSpecServiceCode()); cfg.setSpecServiceId(specificServiceCfg.getSpecServiceId()); @@ -3603,9 +3608,12 @@ public class BaseController { appPolicyCfgs.add(appPolicyCfg); } } else { - CfgIndexInfo cfgIndexInfo = new CfgIndexInfo(); - BeanUtils.copyProperties(cfg, cfgIndexInfo); - cfgIndexInfos.add(cfgIndexInfo); + if(!regionDict.getFunctionId().equals(402)) { + CfgIndexInfo cfgIndexInfo = new CfgIndexInfo(); + BeanUtils.copyProperties(cfg, cfgIndexInfo); + cfgIndexInfos.add(cfgIndexInfo); + } + } ind++; } @@ -3621,6 +3629,9 @@ public class BaseController { if(regionDict.getDictId().intValue()==11) { websiteCfgService.saveHttpResHeadCfg(complexkeywordCfgs); } + if(regionDict.getDictId().intValue()==63) { + appCfgService.saveAppHttpCfg(complexkeywordCfgs); + } }else if(regionDict.getRegionType().equals(6)) { if(regionDict.getFunctionId().equals(400)) { List compileIds=Lists.newArrayList(); diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index 5201746e2..930be64a0 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -25,6 +25,7 @@ import com.nis.domain.configuration.AppTcpCfg; import com.nis.domain.configuration.AppTopicDomainCfg; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.domain.configuration.WebsiteDomainTopic; @@ -445,7 +446,14 @@ public class AppCfgService extends BaseService { } } } - + public void saveAppHttpCfg(List cfgs) { + for(ComplexkeywordCfg cfg:cfgs) { + AppHttpCfg appHttpCfg=new AppHttpCfg(); + BeanUtils.copyProperties(cfg, appHttpCfg); + appCfgDao.insertAppHttpCfg(appHttpCfg); + } + + } @Transactional(readOnly = false, rollbackFor = RuntimeException.class) public void saveOrUpdateAppHttpCfg(AppHttpCfg entity) throws Exception { // 设置区域运营商信息 diff --git a/src/main/resources/sql/20181030/update_region.sql b/src/main/resources/sql/20181030/update_region.sql index dba5d8df3..5aa4d4522 100644 --- a/src/main/resources/sql/20181030/update_region.sql +++ b/src/main/resources/sql/20181030/update_region.sql @@ -32,4 +32,7 @@ UPDATE function_region_dict SET is_import=1 WHERE function_id=400; UPDATE function_service_dict SET is_import=1 WHERE function_id=400; #app ip UPDATE function_region_dict SET is_import=1 WHERE function_id=405; -UPDATE function_service_dict SET is_import=1 WHERE function_id=405; \ No newline at end of file +UPDATE function_service_dict SET is_import=1 WHERE function_id=405; +#app http +UPDATE function_region_dict SET is_import=1 WHERE function_id=402 AND is_valid=1; +UPDATE function_service_dict SET is_import=1 WHERE function_id=402 AND is_valid=1; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp index 9a4143833..0beae209e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp @@ -53,6 +53,23 @@ onClick="javascript:window.location='${ctx}/app/httpCfgForm?functionId=${cfg.functionId}'"> + + + + + + + + + + + + + + + @@ -446,6 +463,8 @@ - + + +<%@include file="/WEB-INF/include/excel/importModal.jsp" %> \ No newline at end of file