diff --git a/src/main/java/com/nis/domain/configuration/MultipleCfg.java b/src/main/java/com/nis/domain/configuration/MultipleCfg.java index a7c04354c..12875394a 100644 --- a/src/main/java/com/nis/domain/configuration/MultipleCfg.java +++ b/src/main/java/com/nis/domain/configuration/MultipleCfg.java @@ -29,6 +29,7 @@ public class MultipleCfg extends BaseCfg { private static final long serialVersionUID = -8369567908781421920L; private String mainTable; private String mainTableType; + private String mainTableDesc; private List otherTables;//key 表名，value 类型 // private BaseCfg mainCfg; //ip配置 @@ -153,4 +154,18 @@ public class MultipleCfg extends BaseCfg { public void setOtherTables(List otherTables) { this.otherTables = otherTables; } + /** + * mainTableDesc + * @return mainTableDesc + */ + + public String getMainTableDesc() { + return mainTableDesc; + } + /** + * @param mainTableDesc the mainTableDesc to set + */ + public void setMainTableDesc(String mainTableDesc) { + this.mainTableDesc = mainTableDesc; + } } diff --git a/src/main/java/com/nis/domain/configuration/MultipleSearchCfg.java b/src/main/java/com/nis/domain/configuration/MultipleSearchCfg.java index 76500dcbc..88c32f330 100644 --- a/src/main/java/com/nis/domain/configuration/MultipleSearchCfg.java +++ b/src/main/java/com/nis/domain/configuration/MultipleSearchCfg.java @@ -28,6 +28,7 @@ public class MultipleSearchCfg extends BaseCfg { private static final long serialVersionUID = -8369567908781421920L; private String mainTable;//主表名 private String mainTableType;//主表类型 + private String mainTableDesc;//主表类型 private String ipTable;//查询条件IP表名，界面限制查询条件除了共用属性之外只能查一个条件 private String stringTable;//查询条件字符串表名，界面限制查询条件除了共用属性之外只能查一个条件 private String complexTable;//查询条件增强字符串串表名，界面限制查询条件除了共用属性之外只能查一个条件 @@ -196,5 +197,18 @@ public class MultipleSearchCfg extends BaseCfg { public void setComplexTable(String complexTable) { this.complexTable = complexTable; } + /** + * mainTableDesc + * @return mainTableDesc + */ + public String getMainTableDesc() { + return mainTableDesc; + } + /** + * @param mainTableDesc the mainTableDesc to set + */ + public void setMainTableDesc(String mainTableDesc) { + this.mainTableDesc = mainTableDesc; + } } diff --git a/src/main/java/com/nis/domain/configuration/TableBean.java b/src/main/java/com/nis/domain/configuration/TableBean.java index 62ad3ba8f..17eafe742 100644 --- a/src/main/java/com/nis/domain/configuration/TableBean.java +++ b/src/main/java/com/nis/domain/configuration/TableBean.java @@ -27,13 +27,15 @@ public class TableBean implements Serializable{ private static final long serialVersionUID = -7276874824312210708L; private String tableName; private String tableType; + private String tableDesc; private boolean canEmpty; public TableBean(){ } - public TableBean(String tableName,String tableType){ + public TableBean(String tableName,String tableType,String tableDesc){ this.tableName=tableName; this.tableType=tableType; + this.tableDesc=tableDesc; } /** * tableName @@ -77,4 +79,19 @@ public class TableBean implements Serializable{ public void setCanEmpty(boolean canEmpty) { this.canEmpty = canEmpty; } + /** + * tableDesc + * @return tableDesc + */ + + public String getTableDesc() { + return tableDesc; + } + /** + * @param tableDesc the tableDesc to set + */ + public void setTableDesc(String tableDesc) { + this.tableDesc = tableDesc; + } + } diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index f8145f9d9..c9994e0e5 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -5,7 +5,18 @@ import java.util.Date; import com.google.gson.GsonBuilder; public final class Constants { - + /** + * 字典表地域运营商 + */ + public static final int ITEM_TYPE_AREA = 1; + public static final int ITEM_TYPE_ISP = 2; + /** + * action值 + */ + public static final int ACTION_DF = 1; + public static final int ACTION_DJ = 2; + public static final int ACTION_BMD = 5; + public static final int ACTION_HMD = 8; public static final int CFG_PAGE = 0; public static final int AUDIT_PAGE = 1; public static final String DEFAULT_CAPTCHA_PARAM = "captcha"; 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 7bc24621f..b2e098f1b 100644 --- a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java @@ -20,7 +20,6 @@ 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; @@ -93,7 +92,9 @@ public class MultipleCfgController extends BaseController{ String tableName=info.getTableName(); if(mainTable.equals(tableName)){ model.addAttribute("mainTableType", String.valueOf(info.getTableType())); + model.addAttribute("mainTableDesc", info.getTableDesc()); cfg.setMainTableType(String.valueOf(type)); + cfg.setMainTableDesc(info.getTableDesc()); if(Constants.TABLE_TYPE_COMPLEX==type){//增强字符串类型 ComplexkeywordCfg _cfg=cfg.getComplexCfg()==null?new ComplexkeywordCfg():cfg.getComplexCfg(); _cfg.setTableName(mainTable); @@ -209,7 +210,7 @@ public class MultipleCfgController extends BaseController{ } for(ServiceConfigInfo info:serviceConfigInfos){ int type=info.getTableType(); - TableBean tableBean=new TableBean(info.getTableName(),String.valueOf(type)); + TableBean tableBean=new TableBean(info.getTableName(),String.valueOf(type),info.getTableDesc()); if(!mainTable.equals(info.getTableName())){ otherTables.add(tableBean); if(Constants.TABLE_TYPE_COMPLEX==type){//增强字符串类型 @@ -347,7 +348,7 @@ public class MultipleCfgController extends BaseController{ }else{ for(ServiceConfigInfo info:serviceConfigInfos){ int type=info.getTableType(); - TableBean tableBean=new TableBean(info.getTableName(),String.valueOf(type)); + TableBean tableBean=new TableBean(info.getTableName(),String.valueOf(type),info.getTableDesc()); if(!mainTable.equals(info.getTableName())){ otherTables.add(tableBean); } @@ -356,6 +357,7 @@ public class MultipleCfgController extends BaseController{ } } model.addAttribute("mainTableType", cfg.getMainTableType()); + model.addAttribute("mainTableDesc", cfg.getMainTableDesc()); model.addAttribute("action", cfg.getAction()); model.addAttribute("page", resultPage); List requestInfos=requestInfoService.getAllRequestInfo(); @@ -386,10 +388,12 @@ public class MultipleCfgController extends BaseController{ cfg.setOtherTables(otherTables); for(ServiceConfigInfo info:serviceConfigInfos){ int type=info.getTableType(); - TableBean tableBean=new TableBean(info.getTableName(), String.valueOf(type)); + TableBean tableBean=new TableBean(info.getTableName(), String.valueOf(type),info.getTableDesc()); if(mainTable.equals(info.getTableName())){ cfg.setMainTableType(String.valueOf(type)); + cfg.setMainTableDesc(info.getTableDesc()); model.addAttribute("mainTableType", String.valueOf(type)); + model.addAttribute("mainTableDesc", info.getTableDesc()); }else{ otherTables.add(tableBean); } @@ -467,7 +471,9 @@ public class MultipleCfgController extends BaseController{ resultCfg.setMainTable(mainTable); String mainTableType=cfg.getMainTableType(); model.addAttribute("mainTableType", mainTableType); + model.addAttribute("mainTableDesc", cfg.getMainTableDesc()); resultCfg.setMainTableType(mainTableType); + resultCfg.setMainTableDesc(cfg.getMainTableDesc()); resultCfg.setAction(cfg.getAction()); int serviceId=cfg.getServiceId(); cfg.setServiceId(serviceId); @@ -480,7 +486,7 @@ public class MultipleCfgController extends BaseController{ String tableName=info.getTableName(); int type=info.getTableType(); if(!tableName.equals(mainTable)){ - TableBean bean=new TableBean(tableName,String.valueOf(type)); + TableBean bean=new TableBean(tableName,String.valueOf(type),info.getTableDesc()); if(Constants.TABLE_TYPE_IP==type){ bean.setCanEmpty(true); } @@ -603,7 +609,9 @@ public class MultipleCfgController extends BaseController{ resultCfg.setMainTable(mainTable); String mainTableType=cfg.getMainTableType(); model.addAttribute("mainTableType", mainTableType); + model.addAttribute("mainTableDesc", cfg.getMainTableDesc()); resultCfg.setMainTableType(mainTableType); + resultCfg.setMainTableDesc(cfg.getMainTableDesc()); resultCfg.setAction(cfg.getAction()); int serviceId=cfg.getServiceId(); cfg.setServiceId(serviceId); @@ -843,6 +851,7 @@ public class MultipleCfgController extends BaseController{ String tableName=info.getTableName(); if(cfg.getMainTable().equals(tableName)){ model.addAttribute("mainTableType", String.valueOf(type)); + model.addAttribute("mainTableDesc", info.getTableDesc()); } if(Constants.TABLE_TYPE_IP==type){ BaseIpCfg searchIpCfg=new BaseIpCfg(); diff --git a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp index 1184815be..99a229301 100644 --- a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp @@ -13,7 +13,17 @@ $(function(){ } }) -

增强字符串

+

+ + + + + + + + 增强字符串 + +

diff --git a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp index b07f71192..843cf021a 100644 --- a/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiple/ipInfo.jsp @@ -3,7 +3,17 @@ -

IP 可选

+

+ + + + + + + + IP + + 可选

diff --git a/src/main/webapp/WEB-INF/include/form/multiple/numInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/numInfo.jsp index 798105b55..abc3d47e2 100644 --- a/src/main/webapp/WEB-INF/include/form/multiple/numInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiple/numInfo.jsp @@ -1,6 +1,16 @@ <%@ 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/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/stringInfo.jsp index de950f9cd..f6da8b254 100644 --- a/src/main/webapp/WEB-INF/include/form/multiple/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiple/stringInfo.jsp @@ -1,6 +1,16 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> -

字符串

+

+ + + + + + + + 字符串 + +

diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp index 6ff627a5c..f41d0e001 100644 --- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp @@ -72,6 +72,7 @@ + @@ -269,24 +270,24 @@ <%--增强字符串 --%> - 增强字符串 + <%--数值 --%> - + <%--字符串 --%> - 字符串 + <%--IP --%> - ip + ip @@ -304,21 +305,21 @@ <%--遍历子表属性 --%> - 增强字符串 + - + - 字符串 + - ip + ip @@ -524,22 +525,22 @@ -
    • +
    • -
    • -
    • +
    • +
    • -
    • +
    • -
    • -
    • +
    • +