diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index f89173a85..de9af5d99 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -22,6 +22,7 @@ import com.nis.domain.BaseEntity; * @version V1.0 */ public class BaseCfg extends BaseEntity { + protected String showName;//表在界面上展示的名称 protected String seltype;//选中类型,页面搜索用 protected String tableName; /** @@ -663,5 +664,4 @@ public class BaseCfg extends BaseEntity { public void setCompileId(Integer compileId) { this.compileId = compileId; } - } diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 586c01a3c..dea1199df 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -24,7 +24,6 @@ public class BaseIpCfg extends BaseCfg { * * @since 1.0.0 */ - private static final long serialVersionUID = -1939538118388300002L; /** * ip类型 diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index b5f99ee4c..6cfe201e0 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -33,6 +33,7 @@ public class BaseStringCfg extends BaseCfg { @Expose @SerializedName("keywords") protected String cfgKeywords; + protected String cfgKeywordsShowName; /** * cfgKeywords * @return cfgKeywords @@ -116,5 +117,19 @@ public class BaseStringCfg extends BaseCfg { super.initDefaultValue(); this.isHexbin = 0; } + /** + * cfgKeywordsShowName + * @return cfgKeywordsShowName + */ + + public String getCfgKeywordsShowName() { + return cfgKeywordsShowName; + } + /** + * @param cfgKeywordsShowName the cfgKeywordsShowName to set + */ + public void setCfgKeywordsShowName(String cfgKeywordsShowName) { + this.cfgKeywordsShowName = cfgKeywordsShowName; + } } diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index 22435b107..f2568dcbb 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -8,6 +8,8 @@ */ package com.nis.domain.configuration; +import org.apache.commons.lang3.StringUtils; + import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/com/nis/domain/maat/ToMaatResult.java b/src/main/java/com/nis/domain/maat/ToMaatResult.java new file mode 100644 index 000000000..5b407fbd0 --- /dev/null +++ b/src/main/java/com/nis/domain/maat/ToMaatResult.java @@ -0,0 +1,104 @@ +/** + *@Title: ToMaatResult.java + *@Package com.nis.domain.maat + *@Description TODO + *@author dell + *@date 2018年3月27日 下午5:10:01 + *@version 版本号 + */ +package com.nis.domain.maat; + +import java.io.Serializable; + +/** + * @ClassName: ToMaatResult.java + * @Description: TODO + * @author (dell) + * @date 2018年3月27日 下午5:10:01 + * @version V1.0 + */ +public class ToMaatResult implements Serializable{ + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = 4244178887886507606L; + private Integer status; + private Integer businessCode; + private String reason; + private String msg; + private String fromuri; + /** + * status + * @return status + */ + + public Integer getStatus() { + return status; + } + /** + * @param status the status to set + */ + public void setStatus(Integer status) { + this.status = status; + } + /** + * businessCode + * @return businessCode + */ + + public Integer getBusinessCode() { + return businessCode; + } + /** + * @param businessCode the businessCode to set + */ + public void setBusinessCode(Integer businessCode) { + this.businessCode = businessCode; + } + /** + * reason + * @return reason + */ + + public String getReason() { + return reason; + } + /** + * @param reason the reason to set + */ + public void setReason(String reason) { + this.reason = reason; + } + /** + * msg + * @return msg + */ + + public String getMsg() { + return msg; + } + /** + * @param msg the msg to set + */ + public void setMsg(String msg) { + this.msg = msg; + } + /** + * fromuri + * @return fromuri + */ + + public String getFromuri() { + return fromuri; + } + /** + * @param fromuri the fromuri to set + */ + public void setFromuri(String fromuri) { + this.fromuri = fromuri; + } + +} diff --git a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java index bf46b696b..399f075a8 100644 --- a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; import com.nis.domain.basics.ServiceDictInfo; +import com.nis.domain.basics.SysDictInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; @@ -85,18 +86,18 @@ public class MultipleCfgController extends BaseController{ List serviceConfigInfos=serviceConfigInfoService.findList(serviceId); List resultList=new ArrayList(); resultPage.setList(resultList); - List mainList=null; //查询主表，将主表中的数据set到结果中 for(ServiceConfigInfo info:serviceConfigInfos){ int type=info.getTableType(); String tableName=info.getTableName(); if(mainTable.equals(tableName)){ + model.addAttribute("mainTableType", String.valueOf(info.getTableType())); cfg.setMainTableType(String.valueOf(type)); if(Constants.TABLE_TYPE_COMPLEX==type){//增强字符串类型 ComplexkeywordCfg _cfg=cfg.getComplexCfg()==null?new ComplexkeywordCfg():cfg.getComplexCfg(); _cfg.setTableName(mainTable); - this.setProperties(cfg, null, null, null, _cfg); + this.setProperties(cfg,_cfg); Page mainPage=complexStringCfgService.findPage(new Page(request,response,"r"), _cfg); setPageProps(mainPage,resultPage); mainList=mainPage.getList();//主表结果 @@ -120,7 +121,7 @@ public class MultipleCfgController extends BaseController{ }else if(Constants.TABLE_TYPE_STRING==type){//字符串类型 BaseStringCfg _cfg=cfg.getStringCfg()==null?new BaseStringCfg():cfg.getStringCfg(); _cfg.setTableName(mainTable); - this.setProperties(cfg, null, _cfg, null,null); + this.setProperties(cfg,_cfg); Page mainPage=stringCfgService.findPage(new Page(request,response,"r"), _cfg); mainList=mainPage.getList();//主表结果 setPageProps(mainPage,resultPage); @@ -143,7 +144,7 @@ public class MultipleCfgController extends BaseController{ }else if(Constants.TABLE_TYPE_IP==type){//字符串类型 BaseIpCfg _cfg=cfg.getIpCfg()==null?new BaseIpCfg():cfg.getIpCfg(); _cfg.setTableName(mainTable); - this.setProperties(cfg, _cfg,null,null,null); + this.setProperties(cfg, _cfg); Page mainPage=ipCfgService.findPage(new Page(request,response,"r"), _cfg); mainList=mainPage.getList();//主表结果 setPageProps(mainPage,resultPage); @@ -166,7 +167,7 @@ public class MultipleCfgController extends BaseController{ }else if(Constants.TABLE_TYPE_NUMBER==type){ NumBoundaryCfg _cfg=cfg.getNumCfg()==null?new NumBoundaryCfg():cfg.getNumCfg(); _cfg.setTableName(mainTable); - this.setProperties(cfg, null,null,_cfg,null); + this.setProperties(cfg,_cfg); Page mainPage=numCfgService.findPage(new Page(request,response,"r"), _cfg); mainList=mainPage.getList();//主表结果 setPageProps(mainPage,resultPage); @@ -214,7 +215,7 @@ public class MultipleCfgController extends BaseController{ if(Constants.TABLE_TYPE_COMPLEX==type){//增强字符串类型 ComplexkeywordCfg _cfg=cfg.getComplexCfg()==null?new ComplexkeywordCfg():cfg.getComplexCfg(); _cfg.setTableName(info.getTableName()); - this.setProperties(cfg, null, null, null, _cfg); + this.setProperties(cfg,_cfg); List list=complexStringCfgService .findPage(page, _cfg) .getList(); @@ -246,7 +247,7 @@ public class MultipleCfgController extends BaseController{ }else if(Constants.TABLE_TYPE_STRING==type){//字符串类型 BaseStringCfg _cfg=cfg.getStringCfg()==null?new BaseStringCfg():cfg.getStringCfg(); _cfg.setTableName(info.getTableName()); - this.setProperties(cfg, null, _cfg, null,null); + this.setProperties(cfg,_cfg); List list=stringCfgService .findPage(page, _cfg) .getList(); @@ -279,7 +280,7 @@ public class MultipleCfgController extends BaseController{ tableBean.setCanEmpty(true); BaseIpCfg _cfg=cfg.getIpCfg()==null?new BaseIpCfg():cfg.getIpCfg(); _cfg.setTableName(info.getTableName()); - this.setProperties(cfg, _cfg,null,null,null); + this.setProperties(cfg, _cfg); List list=ipCfgService .findPage(page, _cfg) .getList(); @@ -311,7 +312,7 @@ public class MultipleCfgController extends BaseController{ }else if(Constants.TABLE_TYPE_NUMBER==type){ NumBoundaryCfg _cfg=cfg.getNumCfg()==null?new NumBoundaryCfg():cfg.getNumCfg(); _cfg.setTableName(info.getTableName()); - this.setProperties(cfg, null,null,_cfg,null); + this.setProperties(cfg,_cfg); List list=numCfgService .findPage(page, _cfg) .getList(); @@ -435,7 +436,8 @@ public class MultipleCfgController extends BaseController{ Map map=cfg.getComplexCfg(); map.put(tableName,complexCfg); } - + List districts=sysDictInfoService.getDistrictDict(tableName); + model.addAttribute("districts", districts); } } cfg.setAction(action); @@ -501,6 +503,21 @@ public class MultipleCfgController extends BaseController{ if(mainTable.equals(info.getTableName())){ this.setPropertiesToMultipleCfg(resultCfg, resultIpCfg,"update"); } + }else{ + resultIpCfg=(BaseIpCfg)this.getClassBean(info.getTableName(), true); + resultIpCfg.initDefaultValue(); + resultIpCfg.setCompileId(compileId); + if(resultCfg.getIpCfg()==null){ + Map map=new HashMap(); + map.put(info.getTableName(), resultIpCfg); + resultCfg.setIpCfg(map); + }else{ + Map map=resultCfg.getIpCfg(); + map.put(info.getTableName(), resultIpCfg); + } + if(mainTable.equals(info.getTableName())){ + this.setPropertiesToMultipleCfg(resultCfg, resultIpCfg,"update"); + } } }else if(Constants.TABLE_TYPE_STRING==type){ BaseStringCfg searchStringCfg=new BaseStringCfg(); @@ -709,7 +726,7 @@ public class MultipleCfgController extends BaseController{ ipCfg.getValue().setIsValid(Constants.VALID_NO); ipCfg.getValue().setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.getValue().setCompileId(compileId); - setProperties(cfg,ipCfg.getValue(),null,null,null); + setProperties(cfg,ipCfg.getValue()); if(ipCfg.getValue().getCfgId()==null){ ipCfg.getValue().setCreatorId(cfg.getCurrentUser().getId()); ipCfg.getValue().setCreateTime(date); @@ -728,7 +745,7 @@ public class MultipleCfgController extends BaseController{ stringCfg.getValue().setIsValid(Constants.VALID_NO); stringCfg.getValue().setIsAudit(Constants.AUDIT_NOT_YET); stringCfg.getValue().setCompileId(compileId); - setProperties(cfg,null,stringCfg.getValue(),null,null); + setProperties(cfg,stringCfg.getValue()); if(stringCfg.getValue().getCfgId()==null){ stringCfg.getValue().setCreatorId(cfg.getCurrentUser().getId()); stringCfg.getValue().setCreateTime(date); @@ -747,7 +764,7 @@ public class MultipleCfgController extends BaseController{ numCfg.getValue().setIsValid(Constants.VALID_NO); numCfg.getValue().setIsAudit(Constants.AUDIT_NOT_YET); numCfg.getValue().setCompileId(compileId); - setProperties(cfg,null,null,numCfg.getValue(),null); + setProperties(cfg,numCfg.getValue()); if(numCfg.getValue().getCfgId()==null){ numCfg.getValue().setCreatorId(cfg.getCurrentUser().getId()); numCfg.getValue().setCreateTime(date); @@ -757,7 +774,6 @@ public class MultipleCfgController extends BaseController{ } } } - } }else if(Constants.TABLE_TYPE_COMPLEX==info.getTableType()){ if(cfg.getComplexCfg()!=null){ @@ -767,7 +783,7 @@ public class MultipleCfgController extends BaseController{ complexCfg.getValue().setIsValid(Constants.VALID_NO); complexCfg.getValue().setIsAudit(Constants.AUDIT_NOT_YET); complexCfg.getValue().setCompileId(compileId); - setProperties(cfg,null,null,null,complexCfg.getValue()); + setProperties(cfg,complexCfg.getValue()); if(complexCfg.getValue().getCfgId()==null){ complexCfg.getValue().setCreatorId(cfg.getCurrentUser().getId()); complexCfg.getValue().setCreateTime(date); @@ -808,28 +824,46 @@ public class MultipleCfgController extends BaseController{ public String auditCfg(String cfgName,MultipleCfg cfg,Model model) { model.addAttribute("cfgName", cfgName); model.addAttribute("audit", Constants.AUDIT_PAGE); + model.addAttribute("cfgType", "multiple"); model.addAttribute("serviceId", cfg.getServiceId()); model.addAttribute("action", cfg.getAction()); model.addAttribute("mainTable", cfg.getMainTable()); int compileId=cfg.getCompileId().intValue(); int audit=cfg.getIsAudit(); + try{ + MultipleCfg resultCfg=new MultipleCfg(); MultipleCfg searchCfg=new MultipleCfg(); + searchCfg.setIsAudit(cfg.getIsAudit()); List serviceConfigInfos=serviceConfigInfoService.findList(cfg.getServiceId()); Date date=new Date(); for(ServiceConfigInfo info:serviceConfigInfos){ int type=info.getTableType(); String tableName=info.getTableName(); + if(cfg.getMainTable().equals(tableName)){ + model.addAttribute("mainTableType", String.valueOf(type)); + } if(Constants.TABLE_TYPE_IP==type){ BaseIpCfg searchIpCfg=new BaseIpCfg(); searchIpCfg.setTableName(tableName); searchIpCfg.setCompileId(compileId); + //根据表名，编译ID查询唯一结果 + BaseIpCfg resultIpCfg=ipCfgService.get(searchIpCfg); searchIpCfg.setAuditorId(searchIpCfg.getCurrentUser().getId()); searchIpCfg.setAuditTime(date); if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 searchIpCfg.setIsValid(Constants.VALID_NO); + if(resultIpCfg!=null){ + resultIpCfg.setIsValid(Constants.VALID_NO); + resultIpCfg.setMaatTable(info.getMaatTable()); + } }else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1 searchIpCfg.setIsValid(Constants.VALID_YES); + if(resultIpCfg!=null){ + resultIpCfg.setIsValid(Constants.VALID_YES); + resultIpCfg.setMaatTable(info.getMaatTable()); + } } + //更新gwall库表数据 if(searchCfg.getIpCfg()==null){ Map map=new HashMap(); map.put(tableName, searchIpCfg); @@ -838,17 +872,40 @@ public class MultipleCfgController extends BaseController{ Map map=searchCfg.getIpCfg(); map.put(tableName, searchIpCfg); } + //传入maat数据 + if(resultIpCfg!=null){ + if(resultCfg.getIpCfg()==null){ + Map map=new HashMap(); + map.put(tableName, resultIpCfg); + resultCfg.setIpCfg(map); + }else{ + Map map=resultCfg.getIpCfg(); + map.put(tableName, resultIpCfg); + } + } + }else if(Constants.TABLE_TYPE_STRING==type){ BaseStringCfg searchStringCfg=new BaseStringCfg(); searchStringCfg.setTableName(tableName); searchStringCfg.setCompileId(compileId); + //根据表名，编译ID查询唯一结果 + BaseStringCfg resultStringCfg=stringCfgService.get(searchStringCfg); searchStringCfg.setAuditorId(searchStringCfg.getCurrentUser().getId()); searchStringCfg.setAuditTime(date); if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 searchStringCfg.setIsValid(Constants.VALID_NO); + if(resultStringCfg!=null){ + resultStringCfg.setIsValid(Constants.VALID_NO); + resultStringCfg.setMaatTable(info.getMaatTable()); + } }else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1 searchStringCfg.setIsValid(Constants.VALID_YES); + if(resultStringCfg!=null){ + resultStringCfg.setIsValid(Constants.VALID_YES); + resultStringCfg.setMaatTable(info.getMaatTable()); + } } + //更新gwall库表数据 if(searchCfg.getStringCfg()==null){ Map map=new HashMap(); map.put(tableName, searchStringCfg); @@ -857,17 +914,38 @@ public class MultipleCfgController extends BaseController{ Map map=searchCfg.getStringCfg(); map.put(tableName, searchStringCfg); } + //传入maat数据 + if(resultStringCfg!=null){ + if(resultCfg.getStringCfg()==null){ + Map map=new HashMap(); + map.put(tableName, resultStringCfg); + resultCfg.setStringCfg(map); + }else{ + Map map=resultCfg.getStringCfg(); + map.put(tableName, resultStringCfg); + } + } }else if(Constants.TABLE_TYPE_NUMBER==type){ NumBoundaryCfg searchNumCfg=new NumBoundaryCfg(); searchNumCfg.setTableName(tableName); searchNumCfg.setCompileId(compileId); + NumBoundaryCfg resultNumCfg=numCfgService.get(searchNumCfg); searchNumCfg.setAuditorId(searchNumCfg.getCurrentUser().getId()); searchNumCfg.setAuditTime(date); if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 searchNumCfg.setIsValid(Constants.VALID_NO); + if(resultNumCfg!=null){ + resultNumCfg.setIsValid(Constants.VALID_NO); + resultNumCfg.setMaatTable(info.getMaatTable()); + } }else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1 searchNumCfg.setIsValid(Constants.VALID_YES); + if(resultNumCfg!=null){ + resultNumCfg.setIsValid(Constants.VALID_YES); + resultNumCfg.setMaatTable(info.getMaatTable()); + } } + //更新gwall库表数据 if(searchCfg.getNumCfg()==null){ Map map=new HashMap(); map.put(tableName, searchNumCfg); @@ -876,17 +954,38 @@ public class MultipleCfgController extends BaseController{ Map map=searchCfg.getNumCfg(); map.put(tableName, searchNumCfg); } + //传入maat数据 + if(resultNumCfg!=null){ + if(resultCfg.getNumCfg()==null){ + Map map=new HashMap(); + map.put(tableName, resultNumCfg); + resultCfg.setNumCfg(map); + }else{ + Map map=resultCfg.getNumCfg(); + map.put(tableName, resultNumCfg); + } + } }else if(Constants.TABLE_TYPE_COMPLEX==type){ ComplexkeywordCfg searchComplexCfg=new ComplexkeywordCfg(); searchComplexCfg.setTableName(tableName); searchComplexCfg.setCompileId(compileId); + ComplexkeywordCfg resultComplexCfg=complexStringCfgService.get(searchComplexCfg); searchComplexCfg.setAuditorId(searchComplexCfg.getCurrentUser().getId()); searchComplexCfg.setAuditTime(date); if(audit==Constants.AUDIT_NOT_YES){//取消审核通过，设置有效标志为0 searchComplexCfg.setIsValid(Constants.VALID_NO); + if(resultComplexCfg!=null){ + resultComplexCfg.setIsValid(Constants.VALID_NO); + resultComplexCfg.setMaatTable(info.getMaatTable()); + } }else if(audit==Constants.AUDIT_YES){//审核通过，设置有效标志为1 searchComplexCfg.setIsValid(Constants.VALID_YES); + if(resultComplexCfg!=null){ + resultComplexCfg.setIsValid(Constants.VALID_YES); + resultComplexCfg.setMaatTable(info.getMaatTable()); + } } + //更新gwall库表数据 if(searchCfg.getComplexCfg()==null){ Map map=new HashMap(); map.put(tableName, searchComplexCfg); @@ -895,11 +994,30 @@ public class MultipleCfgController extends BaseController{ Map map=searchCfg.getComplexCfg(); map.put(tableName, searchComplexCfg); } + //传入maat数据 + if(resultComplexCfg!=null){ + if(resultCfg.getComplexCfg()==null){ + Map map=new HashMap(); + map.put(tableName, resultComplexCfg); + resultCfg.setComplexCfg(map); + }else{ + Map map=resultCfg.getComplexCfg(); + map.put(tableName, resultComplexCfg); + } + } } } - multipleCfgService.auditCfg(searchCfg); - - return "redirect:" + adminPath + "/cfg/multiple/list"; + int result=multipleCfgService.auditCfg(resultCfg,searchCfg); + if(result==0){ + addMessage(model,"审核失败"); + }else{ + addMessage(model,"审核成功,正在为您跳转页面..."); + } + }catch (Exception e) { + logger.error("审核失败",e); + addMessage(model,"审核失败"); + } + return "/cfg/resultPage"; } /** * @@ -942,7 +1060,8 @@ public class MultipleCfgController extends BaseController{ Field[] fieldArray=cfg.getClass().getDeclaredFields(); for(Field field:fieldArray){ field.setAccessible(true); - if(field.get(cfg)!=null&&!"serialVersionUID".equals(field.getName())){ + if(field.get(cfg)!=null&&!"serialVersionUID".equals(field.getName()) + &&!field.getName().endsWith("ShowName")&&!field.getName().endsWith("cfgDesc")){ return false; } } @@ -965,6 +1084,7 @@ public class MultipleCfgController extends BaseController{ resultCfg.setIsValid(_cfg.getIsValid()); resultCfg.setRequestId(_cfg.getRequestId()); resultCfg.setServiceId(_cfg.getServiceId()); + resultCfg.setRequestName(_cfg.getRequestName()); if("select".equals(option)){//列表时设置以下属性 resultCfg.setCreatorId(_cfg.getCreatorId()); resultCfg.setCreatorName(_cfg.getCreatorName()); @@ -977,126 +1097,51 @@ public class MultipleCfgController extends BaseController{ resultCfg.setAuditTime(_cfg.getAuditTime()); } } - protected void setProperties(MultipleSearchCfg source,BaseIpCfg ipCfg,BaseStringCfg stringCfg,NumBoundaryCfg numCfg,ComplexkeywordCfg complexCfg){ - if(ipCfg!=null){ - ipCfg.setAction(source.getAction()); - ipCfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); - ipCfg.setAttribute(source.getAttribute()); - ipCfg.setClassify(source.getClassify()); - ipCfg.setLable(source.getLable()); - ipCfg.setIsAreaEffective(source.getIsAreaEffective()); - ipCfg.setRequestId(source.getRequestId()); - ipCfg.setServiceId(source.getServiceId()); - ipCfg.setCreatorId(source.getCreatorId()); - ipCfg.setCreatorName(source.getCreatorName()); - ipCfg.setCreateTime(source.getCreateTime()); - ipCfg.setEditorId(source.getEditorId()); - ipCfg.setEditorName(source.getEditorName()); - ipCfg.setEditTime(source.getEditTime()); - ipCfg.setAuditorId(source.getAuditorId()); - ipCfg.setAuditorName(source.getAuditorName()); - ipCfg.setAuditTime(source.getAuditTime()); + @SuppressWarnings("rawtypes") + protected void setProperties(MultipleSearchCfg source,BaseCfg cfg){ + if(cfg!=null){ + cfg.setIsValid(source.getIsValid()); + cfg.setIsAudit(source.getIsAudit()); + cfg.setAction(source.getAction()); + cfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); + cfg.setAttribute(source.getAttribute()); + cfg.setClassify(source.getClassify()); + cfg.setLable(source.getLable()); + cfg.setIsAreaEffective(source.getIsAreaEffective()); + cfg.setRequestId(source.getRequestId()); + cfg.setServiceId(source.getServiceId()); + cfg.setCreatorId(source.getCreatorId()); + cfg.setCreatorName(source.getCreatorName()); + cfg.setCreateTime(source.getCreateTime()); + cfg.setEditorId(source.getEditorId()); + cfg.setEditorName(source.getEditorName()); + cfg.setEditTime(source.getEditTime()); + cfg.setAuditorId(source.getAuditorId()); + cfg.setAuditorName(source.getAuditorName()); + cfg.setAuditTime(source.getAuditTime()); + cfg.setSeltype(source.getSeltype()); + cfg.setSearch_create_time_start(source.getSearch_create_time_start()); + cfg.setSearch_create_time_end(source.getSearch_create_time_end()); + cfg.setSearch_edit_time_start(source.getSearch_edit_time_start()); + cfg.setSearch_edit_time_end(source.getSearch_edit_time_end()); + cfg.setSearch_audit_time_start(source.getSearch_audit_time_start()); + cfg.setSearch_audit_time_end(source.getSearch_audit_time_end()); } - if(stringCfg!=null){ - stringCfg.setAction(source.getAction()); - stringCfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); - stringCfg.setAttribute(source.getAttribute()); - stringCfg.setClassify(source.getClassify()); - stringCfg.setLable(source.getLable()); - stringCfg.setIsAreaEffective(source.getIsAreaEffective()); - stringCfg.setRequestId(source.getRequestId()); - stringCfg.setServiceId(source.getServiceId()); - stringCfg.setCreatorId(source.getCreatorId()); - stringCfg.setCreatorName(source.getCreatorName()); - stringCfg.setCreateTime(source.getCreateTime()); - stringCfg.setEditorId(source.getEditorId()); - stringCfg.setEditorName(source.getEditorName()); - stringCfg.setEditTime(source.getEditTime()); - stringCfg.setAuditorId(source.getAuditorId()); - stringCfg.setAuditorName(source.getAuditorName()); - stringCfg.setAuditTime(source.getAuditTime()); - } - if(numCfg!=null){ - numCfg.setAction(source.getAction()); - numCfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); - numCfg.setAttribute(source.getAttribute()); - numCfg.setClassify(source.getClassify()); - numCfg.setLable(source.getLable()); - numCfg.setIsAreaEffective(source.getIsAreaEffective()); - numCfg.setRequestId(source.getRequestId()); - numCfg.setServiceId(source.getServiceId()); - numCfg.setCreatorId(source.getCreatorId()); - numCfg.setCreatorName(source.getCreatorName()); - numCfg.setCreateTime(source.getCreateTime()); - numCfg.setEditorId(source.getEditorId()); - numCfg.setEditorName(source.getEditorName()); - numCfg.setEditTime(source.getEditTime()); - numCfg.setAuditorId(source.getAuditorId()); - numCfg.setAuditorName(source.getAuditorName()); - numCfg.setAuditTime(source.getAuditTime()); - } - if(complexCfg!=null){ - complexCfg.setAction(source.getAction()); - complexCfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); - complexCfg.setAttribute(source.getAttribute()); - complexCfg.setClassify(source.getClassify()); - complexCfg.setLable(source.getLable()); - complexCfg.setIsAreaEffective(source.getIsAreaEffective()); - complexCfg.setRequestId(source.getRequestId()); - complexCfg.setServiceId(source.getServiceId()); - complexCfg.setCreatorId(source.getCreatorId()); - complexCfg.setCreatorName(source.getCreatorName()); - complexCfg.setCreateTime(source.getCreateTime()); - complexCfg.setEditorId(source.getEditorId()); - complexCfg.setEditorName(source.getEditorName()); - complexCfg.setEditTime(source.getEditTime()); - complexCfg.setAuditorId(source.getAuditorId()); - complexCfg.setAuditorName(source.getAuditorName()); - complexCfg.setAuditTime(source.getAuditTime()); - } - } - protected void setProperties(MultipleCfg source,BaseIpCfg ipCfg,BaseStringCfg stringCfg,NumBoundaryCfg numCfg,ComplexkeywordCfg complexCfg){ - if(ipCfg!=null){ - ipCfg.setAction(source.getAction()); - ipCfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); - ipCfg.setAttribute(source.getAttribute()); - ipCfg.setClassify(source.getClassify()); - ipCfg.setLable(source.getLable()); - ipCfg.setIsAreaEffective(source.getIsAreaEffective()); - ipCfg.setRequestId(source.getRequestId()); - ipCfg.setServiceId(source.getServiceId()); - } - if(stringCfg!=null){ - stringCfg.setAction(source.getAction()); - stringCfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); - stringCfg.setAttribute(source.getAttribute()); - stringCfg.setClassify(source.getClassify()); - stringCfg.setLable(source.getLable()); - stringCfg.setIsAreaEffective(source.getIsAreaEffective()); - stringCfg.setRequestId(source.getRequestId()); - stringCfg.setServiceId(source.getServiceId()); - } - if(numCfg!=null){ - numCfg.setAction(source.getAction()); - numCfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); - numCfg.setAttribute(source.getAttribute()); - numCfg.setClassify(source.getClassify()); - numCfg.setLable(source.getLable()); - numCfg.setIsAreaEffective(source.getIsAreaEffective()); - numCfg.setRequestId(source.getRequestId()); - numCfg.setServiceId(source.getServiceId()); - } - if(complexCfg!=null){ - complexCfg.setAction(source.getAction()); - complexCfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); - complexCfg.setAttribute(source.getAttribute()); - complexCfg.setClassify(source.getClassify()); - complexCfg.setLable(source.getLable()); - complexCfg.setIsAreaEffective(source.getIsAreaEffective()); - complexCfg.setRequestId(source.getRequestId()); - complexCfg.setServiceId(source.getServiceId()); + + } + protected void setProperties(MultipleCfg source,BaseCfg cfg){ + if(cfg!=null){ + cfg.setAction(source.getAction()); + cfg.setAreaEffectiveIds(source.getAreaEffectiveIds()); + cfg.setAttribute(source.getAttribute()); + cfg.setClassify(source.getClassify()); + cfg.setLable(source.getLable()); + cfg.setIsAreaEffective(source.getIsAreaEffective()); + cfg.setRequestId(source.getRequestId()); + cfg.setServiceId(source.getServiceId()); } } + @SuppressWarnings("rawtypes") protected void setPageProps(Page source,Page target){ target.setCount(source.getCount()); target.setPageNo(source.getPageNo()); diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java index 0d6597782..42f65f1b7 100644 --- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java @@ -86,6 +86,16 @@ public interface SysDictInfoDao extends CrudDao { * @param sysDictInfo */ void updateLevelNo(SysDictInfo sysDictInfo); + /** + * getDistrictDict(这里用一句话描述这个方法的作用) + * (这里描述这个方法适用条件 – 可选) + * @param sysDictInfo + * @return + *List + * @exception + * @since 1.0.0 + */ + List getDistrictDict(String itemCode); diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml index 7385a81a3..1365cdc20 100644 --- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml @@ -327,5 +327,11 @@ s.level_no = #{levelNo} WHERE s.sys_dict_id = #{sysDictId} - + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml index a9c411c7c..f4ce1570b 100644 --- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -94,75 +94,10 @@ AND CFG_ID=#{cfgId,jdbcType=BIGINT} - - AND CFG_DESC=#{cfgDesc,jdbcType=VARCHAR} - - - AND DISTRICT=#{district,jdbcType=VARCHAR} - - - AND KEYWORDS=#{keywords,jdbcType=VARCHAR} - - - AND ACTION=#{action,jdbcType=INTEGER} - - - AND IS_VALID=#{isValid,jdbcType=INTEGER} - - - AND IS_AUDIT=#{isAudit,jdbcType=INTEGER} - - - AND CREATOR_ID=#{creatorId,jdbcType=INTEGER} - - - AND CREATE_TIME=#{createTime,jdbcType=TIMESTAMP} - - - AND EDITOR_ID=#{editorId,jdbcType=INTEGER} - - - AND EDIT_TIME=#{editTime,jdbcType=TIMESTAMP} - - - AND AUDITOR_ID=#{auditorId,jdbcType=INTEGER} - - - AND AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP} - - - AND SERVICE_ID=#{serviceId,jdbcType=INTEGER} - - - AND REQUEST_ID=#{requestId,jdbcType=INTEGER} - AND COMPILE_ID=#{compileId,jdbcType=INTEGER} - - AND IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} - - - AND classify=#{classify,jdbcType=VARCHAR} - - - AND attribute=#{attribute,jdbcType=VARCHAR} - - - AND lable=#{lable,jdbcType=VARCHAR} - - - AND EXPR_TYPE=#{exprType,jdbcType=INTEGER} - - - AND MATCH_METHOD=#{matchMethod,jdbcType=INTEGER} - - - AND IS_HEXBIN=#{isHexbin,jdbcType=INTEGER} - - - AND AREA_EFFECTIVE_IDS=#{areaEffectiveIds,jdbcType=VARCHAR} - + AND IS_VALID!=-1 diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java index c71841b04..85c1a0e6a 100644 --- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java @@ -274,7 +274,9 @@ public class SysDictInfoService extends BaseService{ } - + public List getDistrictDict(String tableName){ + return sysDictInfoDao.getDistrictDict(tableName); + } diff --git a/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java b/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java index 4780c3806..b650d7ffb 100644 --- a/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java @@ -1,16 +1,21 @@ package com.nis.web.service.configuration; +import java.util.ArrayList; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.nis.domain.Page; +import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.MultipleCfg; import com.nis.domain.configuration.MultipleSearchCfg; import com.nis.domain.configuration.NumBoundaryCfg; +import com.nis.util.Constants; import com.nis.web.dao.configuration.ComplexStringCfgDao; import com.nis.web.dao.configuration.IpCfgDao; import com.nis.web.dao.configuration.MultipleCfgDao; @@ -76,7 +81,12 @@ public class MultipleCfgService extends CrudService cfgs=new ArrayList(); + if(sendCfg.getIpCfg()!=null){ + for(BaseIpCfg _cfg:sendCfg.getIpCfg().values()){ + cfgs.add(_cfg); + } + } + if(sendCfg.getStringCfg()!=null){ + for(BaseStringCfg _cfg:sendCfg.getStringCfg().values()){ + cfgs.add(_cfg); + } + } + if(sendCfg.getNumCfg()!=null){ + for(NumBoundaryCfg _cfg:sendCfg.getNumCfg().values()){ + cfgs.add(_cfg); + } + } + if(sendCfg.getComplexCfg()!=null){ + for(ComplexkeywordCfg _cfg:sendCfg.getComplexCfg().values()){ + cfgs.add(_cfg); + } + } + BaseCfg[] cfgArray=new BaseCfg[cfgs.size()]; + cfgs.toArray(cfgArray); + if(this.sendToMaatConvertor(cfg.getIsAudit(), null, cfgArray)){ + if(cfg.getIpCfg()!=null){ + for(BaseIpCfg _cfg:cfg.getIpCfg().values()){ + ipCfgDao.audit(_cfg); + } + } + if(cfg.getStringCfg()!=null){ + for(BaseStringCfg _cfg:cfg.getStringCfg().values()){ + stringCfgDao.audit(_cfg); + } + } + if(cfg.getNumCfg()!=null){ + for(NumBoundaryCfg _cfg:cfg.getNumCfg().values()){ + numCfgDao.audit(_cfg); + } + } + if(cfg.getComplexCfg()!=null){ + for(ComplexkeywordCfg _cfg:cfg.getComplexCfg().values()){ + complexStringCfgDao.audit(_cfg); + } + } + }else{ + return 0; + } + + }else{ + if(cfg.getIpCfg()!=null){ + for(BaseIpCfg _cfg:cfg.getIpCfg().values()){ + ipCfgDao.audit(_cfg); + } + } + if(cfg.getStringCfg()!=null){ + for(BaseStringCfg _cfg:cfg.getStringCfg().values()){ + stringCfgDao.audit(_cfg); + } + } + if(cfg.getNumCfg()!=null){ + for(NumBoundaryCfg _cfg:cfg.getNumCfg().values()){ + numCfgDao.audit(_cfg); + } + } + if(cfg.getComplexCfg()!=null){ + for(ComplexkeywordCfg _cfg:cfg.getComplexCfg().values()){ + complexStringCfgDao.audit(_cfg); + } } } + return 1; } diff --git a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp new file mode 100644 index 000000000..a02f4fb2c --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp @@ -0,0 +1,150 @@ + <%@ page contentType="text/html;charset=UTF-8"%> + <%@ include file="/WEB-INF/include/taglib.jsp"%> +

+
+
+
+ +
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+ + + diff --git a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp new file mode 100644 index 000000000..d199f1fe5 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp @@ -0,0 +1,164 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> +

增强字符串

+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+ + + + + + + + +
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp new file mode 100644 index 000000000..abb9069f1 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp @@ -0,0 +1,249 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + +

IP

+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + + <%-- --%> +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+ + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/stringInfo.jsp new file mode 100644 index 000000000..4ef9f0ba7 --- /dev/null +++ b/src/main/webapp/WEB-INF/include/form/multiple/stringInfo.jsp @@ -0,0 +1,139 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> +

字符串

+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + + + + +
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + +
+
+
+
+ + + + + + + + +
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp index 4fbd647c5..3d172297d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -302,10 +302,7 @@ - - - diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp new file mode 100644 index 000000000..f52421572 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp @@ -0,0 +1,218 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + +
+ +

+ +

+ +
+
+
+
+
+ + + +
+
+
+ +
+ + + + + + + + +
+ + + <%@include file="/WEB-INF/include/form/multiple/complexInfo.jsp" %> + + + + + <%@include file="/WEB-INF/include/form/multiple/stringInfo.jsp" %> + + + <%@include file="/WEB-INF/include/form/multiple/ipInfo.jsp" %> + + + + + + <%@include file="/WEB-INF/include/form/multiple/complexInfo.jsp" %> + + + + + <%@include file="/WEB-INF/include/form/multiple/stringInfo.jsp" %> + + + <%@include file="/WEB-INF/include/form/multiple/ipInfo.jsp" %> + + + + <%@include file="/WEB-INF/include/form/multiple/basicInfo.jsp" %> +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp new file mode 100644 index 000000000..d5207c09a --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp @@ -0,0 +1,564 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + +
+ + +

+ + +

+
+
+
+
+
+
+ + + + + + + + + + + + + + + +
+
+ + + + + + + +
+
+
+
+ + + + + + + + + + + + + +
+ + + +
+
+
+ + + +
+
+ href="javascript:;"> + + +
+ <%-- --%> + <%--
+ + +
--%> +
+ + + +
+
+ + + + + + +
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+ +
+ + +
+
+
+
+
+ + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+
+
+
+ + + +
+
+ + + + <%-- --%> + <%--遍历主表属性 --%> + + <%--增强字符串 --%> + + + + + + <%--数值 --%> + + + <%--字符串 --%> + + + + + <%--IP --%> + + + + + + + + + + + + + + + + <%--遍历主表属性 --%> + <%--遍历子表属性 --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--遍历子表属性 --%> + + + + + + + + + + + + + + + + + + + + + <%-- --%> + <%--遍历主表值 --%> + + <%--增强字符串 --%> + + + + + + <%--数值 --%> + + + <%--字符串 --%> + + + + + <%--IP --%> + + + + + + + + + + + + + + + + <%--遍历主表值 --%> + <%--遍历子表值 --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--遍历子表值 --%> + + <%-- --%> + + <%-- --%> + + + + + <%-- --%> + + + + + + + + + + + + +
增强字符串字符串ipip增强字符串字符串ipip
${status.index+1 }${bean.complexCfg[mainTable].cfgDesc }${bean.complexCfg[mainTable].district }${bean.complexCfg[mainTable].keywords }${bean.stringCfg[mainTable].cfgDesc }${bean.stringCfg[mainTable].cfgKeywords }${bean.ipCfg[mainTable].cfgDesc }V${bean.ipCfg[mainTable].ipType }${bean.ipCfg[mainTable].srcIp }${bean.ipCfg[mainTable].srcIpMask }${bean.ipCfg[mainTable].srcPort }${bean.ipCfg[mainTable].srcPortMask }${bean.ipCfg[mainTable].dstIp }${bean.ipCfg[mainTable].dstIpMask }${bean.ipCfg[mainTable].dstPort }${bean.ipCfg[mainTable].dstPortMask } + + + + + + + ${bean.complexCfg[other.tableName].cfgDesc }${bean.complexCfg[other.tableName].district }${bean.complexCfg[other.tableName].keywords }${bean.stringCfg[other.tableName].cfgDesc }${bean.stringCfg[other.tableName].cfgKeywords }${bean.ipCfg[other.tableName].cfgDesc }V${bean.ipCfg[other.tableName].ipType }${bean.ipCfg[other.tableName].srcIp }${bean.ipCfg[other.tableName].srcIpMask }${bean.ipCfg[other.tableName].srcPort }${bean.ipCfg[other.tableName].srcPortMask }${bean.ipCfg[other.tableName].dstIp }${bean.ipCfg[other.tableName].dstIpMask }${bean.ipCfg[other.tableName].dstPort }${bean.ipCfg[other.tableName].dstPortMask } + + + + + + + + + + + + + + ${cfg.serviceId }${bean.requestName }${cfg.compileId } + + + + + + + ${fl.itemValue}, + + + + + + + ${xz.itemValue}, + + + + + + ${lable.itemValue}, + + + ${cfg.areaEffectiveIds } + + + + + + + + + + + ${bean.creatorName }${bean.editorName }${bean.auditorName } +
+ +
    + + + +
    • +     + +
    • +
    • +     +     +     + + + +
    • +     + +
    • +
    • +     +     +     +
+
+
+
${page}
+
+ +
+
+
+ + + \ No newline at end of file