diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 179088d42..4ff3d08be 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.ModelAttribute; 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.ServiceConfigInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.RequestInfo; import com.nis.util.Constants; @@ -65,7 +65,7 @@ public class IpCfgController extends BaseController{ model.addAttribute("page", page); model.addAttribute("action", ipCfg.getAction()); model.addAttribute("tableName", tableName); - List requestInfos=requestInfoService.getValidRequestInfo(); + List requestInfos=requestInfoService.getAllRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index c616369e8..7a310ebbb 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -276,19 +276,18 @@ left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0 left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0 - AND ${page.where} - + AND ${page.alias}.CFG_ID=#{cfgId,jdbcType=BIGINT} AND ${page.alias}.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') - + AND ${page.alias}.IP_TYPE=#{ipType,jdbcType=INTEGER} @@ -315,25 +314,25 @@ AND ${page.alias}.DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR} - + AND ${page.alias}.DIRECTION=#{direction,jdbcType=INTEGER} - + AND ${page.alias}.PROTOCOL=#{protocol,jdbcType=INTEGER} - + AND ${page.alias}.PROTOCOL_ID=#{protocolId,jdbcType=INTEGER} - + AND ${page.alias}.ACTION=#{action,jdbcType=INTEGER} - + AND ${page.alias}.IS_VALID=#{isValid,jdbcType=INTEGER} - + AND ${page.alias}.IS_VALID != -1 - + AND ${page.alias}.IS_AUDIT=#{isAudit,jdbcType=INTEGER} @@ -354,16 +353,16 @@ AND ${page.alias}.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP} - + AND ${page.alias}.SERVICE_ID=#{serviceId,jdbcType=INTEGER} - + AND ${page.alias}.REQUEST_ID=#{requestId,jdbcType=INTEGER} - + AND ${page.alias}.COMPILE_ID=#{compileId,jdbcType=INTEGER} - + AND ${page.alias}.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -380,13 +379,13 @@ - + AND r.CFG_ID=#{cfgId,jdbcType=BIGINT} AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') - + AND r.IP_TYPE=#{ipType,jdbcType=INTEGER} @@ -413,25 +412,25 @@ AND r.DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR} - + AND r.DIRECTION=#{direction,jdbcType=INTEGER} - + AND r.PROTOCOL=#{protocol,jdbcType=INTEGER} - + AND r.PROTOCOL_ID=#{protocolId,jdbcType=INTEGER} - + AND r.ACTION=#{action,jdbcType=INTEGER} - + AND r.IS_VALID=#{isValid,jdbcType=INTEGER} - + AND r.IS_VALID != -1 - + AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER} @@ -452,16 +451,16 @@ AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP} - + AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER} - + AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER} - + AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} - + AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} @@ -478,7 +477,6 @@ - @@ -528,34 +526,34 @@ update ${tableName} - + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, ip_type = #{ipType,jdbcType=INTEGER}, - + src_ip = #{srcIp,jdbcType=VARCHAR}, - + src_ip_mask = #{srcIpMask,jdbcType=VARCHAR}, - + src_port = #{srcPort,jdbcType=VARCHAR}, - + src_port_mask = #{srcPortMask,jdbcType=VARCHAR}, - + dst_ip = #{dstIp,jdbcType=VARCHAR}, - + dst_ip_mask = #{dstIpMask,jdbcType=VARCHAR}, - + dst_port = #{dstPort,jdbcType=VARCHAR}, - + dst_port_mask = #{srcPortMask,jdbcType=VARCHAR}, @@ -579,19 +577,19 @@ creator_id = #{creatorId,jdbcType=INTEGER}, - + create_time = #{createTime,jdbcType=TIMESTAMP}, editor_id = #{editorId,jdbcType=INTEGER}, - + edit_time = #{editTime,jdbcType=TIMESTAMP}, auditor_id = #{auditorId,jdbcType=INTEGER}, - + audit_time = #{auditTime,jdbcType=TIMESTAMP}, @@ -606,16 +604,16 @@ is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, - + classify = #{classify,jdbcType=VARCHAR}, - + attribute = #{attribute,jdbcType=VARCHAR}, - + lable = #{lable,jdbcType=VARCHAR}, - + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR} diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index c95b9f089..663019d58 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -28,20 +28,20 @@ - + - >${fl.itemValue} - @@ -62,13 +62,13 @@ - + - @@ -86,13 +86,13 @@ - + - diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 72030fa79..5cd144e66 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -154,7 +154,7 @@ - + ${fl.itemValue}, @@ -164,14 +164,14 @@ - ${xz.itemValue}, + ${xz.itemValue}, - ${lable.itemValue}, + ${lable.itemValue}, diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp index d4d441021..5447598ff 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp @@ -21,19 +21,21 @@