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

增加APP特征配置功能

Browse Source
This commit is contained in:
zhangwei
2018-06-23 17:29:14 +08:00
parent d630f20b17
commit 5bc4423076
19 changed files with 3131 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/domain/configuration/AppByteCfg.java
View File

@@ -33,6 +33,7 @@ public class AppByteCfg extends BaseCfg<AppByteCfg> {
private Integer specServiceId;
private String bytes;
private String cfgKeywords;
private String appName;
@Expose
@ExcelField(title="expression_type")
@@ -126,5 +127,13 @@ public class AppByteCfg extends BaseCfg<AppByteCfg> {
public void setCfgKeywords(String cfgKeywords) {
this.cfgKeywords = cfgKeywords;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
}

9
src/main/java/com/nis/domain/configuration/AppDomainCfg.java
View File

@@ -33,6 +33,7 @@ public class AppDomainCfg extends BaseCfg<AppDomainCfg> {
private Integer specServiceId;
private String domain;
private String cfgKeywords;
private String appName;
@Expose
@ExcelField(title="expression_type")
@SerializedName("exprType")
@@ -122,4 +123,12 @@ public class AppDomainCfg extends BaseCfg<AppDomainCfg> {
public void setCfgKeywords(String cfgKeywords) {
this.cfgKeywords = cfgKeywords;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
}

9
src/main/java/com/nis/domain/configuration/AppHttpCfg.java
View File

@@ -33,6 +33,7 @@ public class AppHttpCfg extends BaseCfg<AppHttpCfg> {
private Integer specServiceId;
private String district;
private String cfgKeywords;
private String appName;
@Expose
@ExcelField(title="expression_type")
@@ -126,5 +127,13 @@ public class AppHttpCfg extends BaseCfg<AppHttpCfg> {
public void setCfgKeywords(String cfgKeywords) {
this.cfgKeywords = cfgKeywords;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
}

7
src/main/java/com/nis/domain/configuration/AppIpCfg.java
View File

@@ -23,6 +23,7 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
private Integer ratelimit;
private String appCode;
private Integer specServiceId;
private String appName;
@Expose
@SerializedName("ipType")
protected Integer ipType;
@@ -230,5 +231,11 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
public void setSpecServiceId(Integer specServiceId) {
this.specServiceId = specServiceId;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
}

471
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -14,6 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.configuration.AppByteCfg;
import com.nis.domain.configuration.AppDomainCfg;
import com.nis.domain.configuration.AppHttpCfg;
import com.nis.domain.configuration.AppIpCfg;
import com.nis.domain.configuration.AppPolicyCfg;
import com.nis.domain.specific.SpecificServiceCfg;
import com.nis.exceptions.MaatConvertException;
@@ -36,8 +40,8 @@ public class AppCfgController extends BaseController {
* @param response
* @return
*/
@RequestMapping(value = {"policyList"})
public String policyList(Model model,@ModelAttribute("cfg")AppPolicyCfg cfg,HttpServletRequest request,HttpServletResponse response) {
@RequestMapping(value = {"policyCfgList"})
public String policyCfgList(Model model,@ModelAttribute("cfg")AppPolicyCfg cfg,HttpServletRequest request,HttpServletResponse response) {
Page<AppPolicyCfg> searchPage=new Page<AppPolicyCfg>(request,response,"r");
Page<AppPolicyCfg> page = appCfgService.findAppPolicyList(searchPage, cfg);
for(AppPolicyCfg entity:page.getList()){
@@ -48,9 +52,16 @@ public class AppCfgController extends BaseController {
initPageCondition(model,cfg);
return "/cfg/app/appPolicyCfgList";
}
@RequestMapping(value = {"policyForm"})
/**
* 策略配置表单
* @param model
* @param ids
* @param entity
* @return
*/
@RequestMapping(value = {"policyCfgForm"})
@RequiresPermissions(value={"app:policy:config"})
public String policyForm(Model model,String ids,AppPolicyCfg entity) {
public String policyCfgForm(Model model,String ids,AppPolicyCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids));
initUpdateFormCondition(model,entity);
@@ -60,6 +71,15 @@ public class AppCfgController extends BaseController {
model.addAttribute("_cfg", entity);
return "/cfg/app/appPolicyCfgForm";
}
/**
* 策略配置新增修改
* @param model
* @param request
* @param response
* @param entity
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"saveAppPolicyCfg"})
@RequiresPermissions(value={"app:policy:config"})
public String saveAppPolicyCfg(Model model,HttpServletRequest request,HttpServletResponse response,
@@ -71,8 +91,17 @@ public class AppCfgController extends BaseController {
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/policyList?function="+entity.getFunctionId();
return "redirect:" + adminPath +"/app/policyCfgList?function="+entity.getFunctionId();
}
/**
* 策略配置审核
* @param isAudit
* @param isValid
* @param ids
* @param functionId
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"auditAppPolicyCfg"})
@RequiresPermissions(value={"app:policy:audit"})
public String auditAppPolicyCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
@@ -93,12 +122,440 @@ public class AppCfgController extends BaseController {
addMessage(redirectAttributes, e.getMessage());
}
}
return "redirect:" + adminPath +"/app/policyList?functionId="+functionId;
return "redirect:" + adminPath +"/app/policyCfgList?functionId="+functionId;
}
/**
* 策略配置删除
* @param isValid
* @param ids
* @param functionId
* @return
*/
@RequestMapping(value = {"updateAppPolicyCfgValid"})
@RequiresPermissions(value={"app:policy:config"})
public String updateAppPolicyCfgValid(Integer isValid,String ids,Integer functionId) {
appCfgService.updateAppPolicyCfgValid(isValid,ids,functionId);
return "redirect:" + adminPath +"/app/policyList?functionId="+functionId;
return "redirect:" + adminPath +"/app/policyCfgList?functionId="+functionId;
}
/**
* app协议IP配置列表
* @param model
* @param cfg
* @param request
* @param response
* @return
*/
@RequestMapping(value = {"ipCfgList"})
public String ipCfgList(Model model,@ModelAttribute("cfg")AppIpCfg cfg,HttpServletRequest request,HttpServletResponse response) {
Page<AppIpCfg> searchPage=new Page<AppIpCfg>(request,response,"r");
Page<AppIpCfg> page = appCfgService.findAppIpList(searchPage, cfg);
for(AppIpCfg entity:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
entity.setAppName(app.getSpecServiceName());
}
model.addAttribute("page", page);
initPageCondition(model,cfg);
return "/cfg/app/appIpCfgList";
}
/**
* 协议IP配置表单
* @param model
* @param ids
* @param entity
* @return
*/
@RequestMapping(value = {"ipCfgForm"})
@RequiresPermissions(value={"app:ip:config"})
public String ipCfgForm(Model model,String ids,AppIpCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppIpCfg(Long.parseLong(ids));
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
}
model.addAttribute("_cfg", entity);
return "/cfg/app/appIpCfgForm";
}
/**
* 协议IP配置新增修改
* @param model
* @param request
* @param response
* @param entity
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"saveAppIpCfg"})
@RequiresPermissions(value={"app:ip:config"})
public String saveAppIpCfg(Model model,HttpServletRequest request,HttpServletResponse response,
AppIpCfg entity,RedirectAttributes redirectAttributes) {
try {
appCfgService.saveOrUpdateAppIpCfg(entity);
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/ipCfgList?function="+entity.getFunctionId();
}
/**
* 协议IP配置审核
* @param isAudit
* @param isValid
* @param ids
* @param functionId
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"auditAppIpCfg"})
@RequiresPermissions(value={"app:ip:audit"})
public String auditAppIpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
AppIpCfg entity = new AppIpCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = appCfgService.getAppIpCfg(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(new Date());
entity.setFunctionId(functionId);
try {
appCfgService.auditAppIpCfg(entity,isAudit);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("app协议IP配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
}
}
return "redirect:" + adminPath +"/app/ipCfgList?functionId="+functionId;
}
/**
* IP配置删除
* @param isValid
* @param ids
* @param functionId
* @return
*/
@RequestMapping(value = {"updateAppIpCfgValid"})
@RequiresPermissions(value={"app:ip:config"})
public String updateAppIpCfgValid(Integer isValid,String ids,Integer functionId) {
appCfgService.updateAppIpCfgValid(isValid,ids,functionId);
return "redirect:" + adminPath +"/app/ipCfgList?functionId="+functionId;
}
/**
* app协议http配置列表
* @param model
* @param cfg
* @param request
* @param response
* @return
*/
@RequestMapping(value = {"httpCfgList"})
public String httpCfgList(Model model,@ModelAttribute("cfg")AppHttpCfg cfg,HttpServletRequest request,HttpServletResponse response) {
Page<AppHttpCfg> searchPage=new Page<AppHttpCfg>(request,response,"r");
Page<AppHttpCfg> page = appCfgService.findAppHttpList(searchPage, cfg);
for(AppHttpCfg entity:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
entity.setAppName(app.getSpecServiceName());
}
model.addAttribute("page", page);
initPageCondition(model,cfg);
return "/cfg/app/appHttpCfgList";
}
/**
* 协议http配置表单
* @param model
* @param ids
* @param entity
* @return
*/
@RequestMapping(value = {"httpCfgForm"})
@RequiresPermissions(value={"app:http:config"})
public String httpCfgForm(Model model,String ids,AppHttpCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppHttpCfg(Long.parseLong(ids));
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
}
model.addAttribute("_cfg", entity);
return "/cfg/app/appHttpCfgForm";
}
/**
* http配置新增修改
* @param model
* @param request
* @param response
* @param entity
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"saveAppHttpCfg"})
@RequiresPermissions(value={"app:http:config"})
public String saveAppHttpCfg(Model model,HttpServletRequest request,HttpServletResponse response,
AppHttpCfg entity,RedirectAttributes redirectAttributes) {
try {
appCfgService.saveOrUpdateAppHttpCfg(entity);
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/httpCfgList?function="+entity.getFunctionId();
}
/**
* http配置审核
* @param isAudit
* @param isValid
* @param ids
* @param functionId
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"auditAppHttpCfg"})
// @RequiresPermissions(value={"app:http:audit"})
public String auditAppHttpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
AppHttpCfg entity = new AppHttpCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = appCfgService.getAppHttpCfg(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(new Date());
entity.setFunctionId(functionId);
try {
appCfgService.auditAppHttpCfg(entity,isAudit);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("app http配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
}
}
return "redirect:" + adminPath +"/app/httpCfgList?functionId="+functionId;
}
/**
* http配置删除
* @param isValid
* @param ids
* @param functionId
* @return
*/
@RequestMapping(value = {"updateAppHttpCfgValid"})
@RequiresPermissions(value={"app:http:config"})
public String updateAppHttpCfgValid(Integer isValid,String ids,Integer functionId) {
appCfgService.updateAppHttpCfgValid(isValid,ids,functionId);
return "redirect:" + adminPath +"/app/httpCfgList?functionId="+functionId;
}
/**
* app协议domain配置列表
* @param model
* @param cfg
* @param request
* @param response
* @return
*/
@RequestMapping(value = {"domainCfgList"})
public String domainCfgList(Model model,@ModelAttribute("cfg")AppDomainCfg cfg,HttpServletRequest request,HttpServletResponse response) {
Page<AppDomainCfg> searchPage=new Page<AppDomainCfg>(request,response,"r");
Page<AppDomainCfg> page = appCfgService.findAppDomainList(searchPage, cfg);
for(AppDomainCfg entity:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
entity.setAppName(app.getSpecServiceName());
}
model.addAttribute("page", page);
initPageCondition(model,cfg);
return "/cfg/app/appDomainCfgList";
}
/**
* 协议domain配置表单
* @param model
* @param ids
* @param entity
* @return
*/
@RequestMapping(value = {"domainCfgForm"})
@RequiresPermissions(value={"app:domain:config"})
public String domainCfgForm(Model model,String ids,AppDomainCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppDomainCfg(Long.parseLong(ids));
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
}
model.addAttribute("_cfg", entity);
return "/cfg/app/appDomainCfgForm";
}
/**
* domain配置新增修改
* @param model
* @param request
* @param response
* @param entity
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"saveAppDomainCfg"})
@RequiresPermissions(value={"app:domain:config"})
public String saveAppDomainCfg(Model model,HttpServletRequest request,HttpServletResponse response,
AppDomainCfg entity,RedirectAttributes redirectAttributes) {
try {
appCfgService.saveOrUpdateAppDomainCfg(entity);
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/domainCfgList?function="+entity.getFunctionId();
}
/**
* domain配置审核
* @param isAudit
* @param isValid
* @param ids
* @param functionId
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"auditAppDomainCfg"})
// @RequiresPermissions(value={"app:domain:audit"})
public String auditAppDomainCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
AppDomainCfg entity = new AppDomainCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = appCfgService.getAppDomainCfg(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(new Date());
entity.setFunctionId(functionId);
try {
appCfgService.auditAppDomainCfg(entity,isAudit);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("app协议domain配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
}
}
return "redirect:" + adminPath +"/app/domainCfgList?functionId="+functionId;
}
/**
* domain配置删除
* @param isValid
* @param ids
* @param functionId
* @return
*/
@RequestMapping(value = {"updateAppDomainCfgValid"})
@RequiresPermissions(value={"app:domain:config"})
public String updateAppDomainCfgValid(Integer isValid,String ids,Integer functionId) {
appCfgService.updateAppDomainCfgValid(isValid,ids,functionId);
return "redirect:" + adminPath +"/app/domainCfgList?functionId="+functionId;
}
/**
* app协议byte配置列表
* @param model
* @param cfg
* @param request
* @param response
* @return
*/
@RequestMapping(value = {"byteCfgList"})
public String byteCfgList(Model model,@ModelAttribute("cfg")AppByteCfg cfg,HttpServletRequest request,HttpServletResponse response) {
Page<AppByteCfg> searchPage=new Page<AppByteCfg>(request,response,"r");
Page<AppByteCfg> page = appCfgService.findAppByteList(searchPage, cfg);
for(AppByteCfg entity:page.getList()){
SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
entity.setAppName(app.getSpecServiceName());
}
model.addAttribute("page", page);
initPageCondition(model,cfg);
return "/cfg/app/appByteCfgList";
}
/**
* 协议byte配置表单
* @param model
* @param ids
* @param entity
* @return
*/
@RequestMapping(value = {"byteCfgForm"})
@RequiresPermissions(value={"app:byte:config"})
public String byteCfgForm(Model model,String ids,AppByteCfg entity) {
if(StringUtils.isNotBlank(ids)){
entity = appCfgService.getAppByteCfg(Long.parseLong(ids));
initUpdateFormCondition(model,entity);
}else{
initFormCondition(model,entity);
}
model.addAttribute("_cfg", entity);
return "/cfg/app/appByteCfgForm";
}
/**
* byte配置新增修改
* @param model
* @param request
* @param response
* @param entity
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"saveAppByteCfg"})
@RequiresPermissions(value={"app:byte:config"})
public String saveAppByteCfg(Model model,HttpServletRequest request,HttpServletResponse response,
AppByteCfg entity,RedirectAttributes redirectAttributes) {
try {
appCfgService.saveOrUpdateAppByteCfg(entity);
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, e.getMessage());
}
return "redirect:" + adminPath +"/app/byteCfgList?function="+entity.getFunctionId();
}
/**
* byte配置审核
* @param isAudit
* @param isValid
* @param ids
* @param functionId
* @param redirectAttributes
* @return
*/
@RequestMapping(value = {"auditAppByteCfg"})
// @RequiresPermissions(value={"app:byte:audit"})
public String auditAppByteCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
AppByteCfg entity = new AppByteCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = appCfgService.getAppByteCfg(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(new Date());
entity.setFunctionId(functionId);
try {
appCfgService.auditAppByteCfg(entity,isAudit);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("app协议byte配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
}
}
return "redirect:" + adminPath +"/app/byteCfgList?functionId="+functionId;
}
/**
* byte配置删除
* @param isValid
* @param ids
* @param functionId
* @return
*/
@RequestMapping(value = {"updateAppByteCfgValid"})
@RequiresPermissions(value={"app:byte:config"})
public String updateAppByteCfgValid(Integer isValid,String ids,Integer functionId) {
appCfgService.updateAppByteCfgValid(isValid,ids,functionId);
return "redirect:" + adminPath +"/app/byteCfgList?functionId="+functionId;
}
}

9
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -267,6 +267,8 @@ public abstract class BaseService {
}
/**
* 界面配置list转换为服务接口端的list
* @param <T>
* @param <T>
* @param dstList
* @param srcList
* @param cfgType，1为IP类型，2为字符串类型，3为增强字符串，4数值类型，5摘要类,6回调类[但字符串类域配置和增强字符串域配置在接口参数中同属于strRegionList]
@@ -274,13 +276,14 @@ public abstract class BaseService {
* @param groupRelationList 配置分组列表
* @return
*/
public static Map<String,List> cfgConvert(List dstList,List srcList,Integer cfgType,BaseCfg baseCfg,List groupRelationList){
public static <T> Map<String,List> cfgConvert(List dstList,List<T> srcList,Integer cfgType,BaseCfg baseCfg,List groupRelationList){
Map<String,List> map = new HashMap();
if(cfgType==1){
List numRegionList = new ArrayList();
Integer groupId = 0;
for(int i=0;i<srcList.size();i++){
BaseIpCfg baseIpCfg = (BaseIpCfg) srcList.get(i);
for(T srcCfg:srcList){
BaseIpCfg baseIpCfg = new BaseIpCfg();
BeanUtils.copyProperties(srcCfg, baseIpCfg);
IpCfg cfg = new IpCfg();
BeanUtils.copyProperties(baseIpCfg, cfg);
//区域IP配置，多条IP配置属于同一个分组，其他业务配置IP，一条配置一个分组

58
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -122,6 +122,8 @@ public class AppCfgService extends BaseService {
}else{
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.updateAppPolicyCfg(entity);
}
}
@@ -139,6 +141,8 @@ public class AppCfgService extends BaseService {
entity.setCompileId(compileId);
entity.setCreateTime(new Date());
entity.setCreatorId(entity.getCurrentUser().getId());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.insertAppIpCfg(entity);
}catch (Exception e) {
e.printStackTrace();
@@ -148,6 +152,8 @@ public class AppCfgService extends BaseService {
}else{
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.updateAppIpCfg(entity);
}
}
@@ -165,6 +171,8 @@ public class AppCfgService extends BaseService {
entity.setCompileId(compileId);
entity.setCreateTime(new Date());
entity.setCreatorId(entity.getCurrentUser().getId());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.insertAppHttpCfg(entity);
}catch (Exception e) {
e.printStackTrace();
@@ -174,6 +182,8 @@ public class AppCfgService extends BaseService {
}else{
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.updateAppHttpCfg(entity);
}
}
@@ -191,6 +201,8 @@ public class AppCfgService extends BaseService {
entity.setCompileId(compileId);
entity.setCreateTime(new Date());
entity.setCreatorId(entity.getCurrentUser().getId());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.insertAppDomainCfg(entity);
}catch (Exception e) {
e.printStackTrace();
@@ -200,6 +212,8 @@ public class AppCfgService extends BaseService {
}else{
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.updateAppDomainCfg(entity);
}
}
@@ -217,6 +231,8 @@ public class AppCfgService extends BaseService {
entity.setCompileId(compileId);
entity.setCreateTime(new Date());
entity.setCreatorId(entity.getCurrentUser().getId());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.insertAppByteCfg(entity);
}catch (Exception e) {
e.printStackTrace();
@@ -226,6 +242,8 @@ public class AppCfgService extends BaseService {
}else{
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
entity.setIsValid(0);
entity.setIsAudit(0);
return appCfgDao.updateAppByteCfg(entity);
}
}
@@ -238,11 +256,9 @@ public class AppCfgService extends BaseService {
List<StringCfg> strRegionList = new ArrayList();
List<NumBoundaryCfg> numRegionList = new ArrayList();
List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
entity.setTableName(AppPolicyCfg.getTablename());
appCfgDao.auditCfg(entity);
entity = this.getAppPolicyCfg(entity.getCfgId());
if(isAudit==1){
entity.setCfgKeywords(entity.getAppCode());
List<AppPolicyCfg> list = new ArrayList();
@@ -332,15 +348,14 @@ public class AppCfgService extends BaseService {
List<NumBoundaryCfg> numRegionList = new ArrayList();
List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
entity = this.getAppIpCfg(entity.getCfgId());
entity.setTableName(AppPolicyCfg.getTablename());
entity.setTableName(AppIpCfg.getTablename());
appCfgDao.auditCfg(entity);
if(isAudit==1){
List<AppIpCfg> list = new ArrayList();
list.add(entity);
Map<String,List> map = cfgConvert(strRegionList,list,2,entity,groupRelationList);
Map<String,List> map = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
groupRelationList=map.get("groupList");
strRegionList=map.get("dstList");
ipRegionList=map.get("dstList");
}
//保存区域IP信息
List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
@@ -373,9 +388,13 @@ public class AppCfgService extends BaseService {
String userRegion = "";
if(!StringUtil.isEmpty(entity.getAppCode())){
userRegion = userRegion+entity.getAppCode()+Constants.USER_REGION_SPLIT;
}else{
userRegion = userRegion+Constants.USER_REGION_SPLIT;
}
if(entity.getRatelimit()!=null){
userRegion = userRegion+entity.getRatelimit()+Constants.USER_REGION_SPLIT;
}else{
userRegion = userRegion+Constants.USER_REGION_SPLIT;
}
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
@@ -419,9 +438,9 @@ public class AppCfgService extends BaseService {
List<NumBoundaryCfg> numRegionList = new ArrayList();
List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
entity = this.getAppHttpCfg(entity.getCfgId());
entity.setTableName(AppPolicyCfg.getTablename());
entity.setTableName(AppHttpCfg.getTablename());
appCfgDao.auditCfg(entity);
if(isAudit==1){
List<AppHttpCfg> list = new ArrayList();
list.add(entity);
@@ -460,9 +479,13 @@ public class AppCfgService extends BaseService {
String userRegion = "";
if(!StringUtil.isEmpty(entity.getAppCode())){
userRegion = userRegion+entity.getAppCode()+Constants.USER_REGION_SPLIT;
}else{
userRegion = userRegion+Constants.USER_REGION_SPLIT;
}
if(entity.getRatelimit()!=null){
userRegion = userRegion+entity.getRatelimit()+Constants.USER_REGION_SPLIT;
}else{
userRegion = userRegion+Constants.USER_REGION_SPLIT;
}
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
@@ -506,10 +529,10 @@ public class AppCfgService extends BaseService {
List<NumBoundaryCfg> numRegionList = new ArrayList();
List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
entity = this.getAppDomainCfg(entity.getCfgId());
entity.setTableName(AppPolicyCfg.getTablename());
entity.setTableName(AppDomainCfg.getTablename());
appCfgDao.auditCfg(entity);
if(isAudit==1){
entity.setCfgKeywords(entity.getDomain());
List<AppDomainCfg> list = new ArrayList();
list.add(entity);
Map<String,List> map = cfgConvert(strRegionList,list,2,entity,groupRelationList);
@@ -547,9 +570,13 @@ public class AppCfgService extends BaseService {
String userRegion = "";
if(!StringUtil.isEmpty(entity.getAppCode())){
userRegion = userRegion+entity.getAppCode()+Constants.USER_REGION_SPLIT;
}else{
userRegion = userRegion+Constants.USER_REGION_SPLIT;
}
if(entity.getRatelimit()!=null){
userRegion = userRegion+entity.getRatelimit()+Constants.USER_REGION_SPLIT;
}else{
userRegion = userRegion+Constants.USER_REGION_SPLIT;
}
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
@@ -593,10 +620,11 @@ public class AppCfgService extends BaseService {
List<NumBoundaryCfg> numRegionList = new ArrayList();
List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
entity = this.getAppByteCfg(entity.getCfgId());
entity.setTableName(AppPolicyCfg.getTablename());
entity.setTableName(AppByteCfg.getTablename());
appCfgDao.auditCfg(entity);
if(isAudit==1){
entity.setCfgKeywords(entity.getBytes());
List<AppByteCfg> list = new ArrayList();
list.add(entity);
Map<String,List> map = cfgConvert(strRegionList,list,2,entity,groupRelationList);
@@ -634,9 +662,13 @@ public class AppCfgService extends BaseService {
String userRegion = "";
if(!StringUtil.isEmpty(entity.getAppCode())){
userRegion = userRegion+entity.getAppCode()+Constants.USER_REGION_SPLIT;
}else{
userRegion = userRegion+Constants.USER_REGION_SPLIT;
}
if(entity.getRatelimit()!=null){
userRegion = userRegion+entity.getRatelimit()+Constants.USER_REGION_SPLIT;
}else{
userRegion = userRegion+Constants.USER_REGION_SPLIT;
}
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);