(1)ip导入调整,子类的同名字段覆盖父类的,用于某些字段的注解重写

(2)新建package template,将IP的template入
(3)IP复用策略配置导入模板调整,由于界面只有IP,端口,所以模板的注解进行了响应调整
(4)配置文件加入了IP和端口的默认值设置
(5)导入IP加入了IP复用策略和限速比例的验证
This commit is contained in:
wangxin
2018-07-27 10:16:32 +08:00
parent 86cf92faac
commit 90de79f408
13 changed files with 401 additions and 28 deletions

View File

@@ -27,6 +27,7 @@ import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.template.IpMultiplexPolicyTemplate;
import com.nis.util.DictUtils;
import com.nis.web.controller.configuration.CommonController;
@@ -93,7 +94,7 @@ public class IpMultiplexController extends CommonController {
@RequestMapping(value = "/import", method=RequestMethod.POST)
public String importIp(String cfgName,RedirectAttributes redirectAttributes,
@RequestParam("file") MultipartFile file,IpPortCfg cfg) {
this._importIp(cfgName,redirectAttributes, file,cfg);
this._importIp(cfgName,redirectAttributes, file,cfg,IpMultiplexPolicyTemplate.class);
redirectAttributes.addAttribute("urlPrefix","/manipulation/ipmulitiplex");
redirectAttributes.addAttribute("requiresPermissionPrefix","ip:mulitiplex");
return "redirect:" + adminPath +"/manipulation/ipmulitiplex/list?functionId="+cfg.getFunctionId();
@@ -102,7 +103,7 @@ public class IpMultiplexController extends CommonController {
@RequestMapping(value = "import/template")
public void importFileTemplate(HttpServletRequest request,HttpServletResponse response,
RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpMultiplexPolicyTemplate.class);
}
//ip配置导出
@RequestMapping(value = "export")