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

（1）ip，字符串，增强字符串mapper.xml里的get方法删除多余参数，只保留cfgId以及compileId。

Browse Source 
（2）系统字典表更新方法查询多域增强字符串配置的匹配区域。mysql这里查询好像自动大小写忽略，待测试。
（3）多域界面提交。界面展示采用查一张主表再查其他表的方式展示，非所有表都有的字段只能查主表的，这里界面查询条件已做限制；另外表单提交未做验证；多个同类型（字符串，增强字符串）的表现在界面无法区分，后面会将界面展示意义不明的字段调整展示名称。
This commit is contained in:
wangxin
2018-03-29 14:56:27 +08:00
parent c0e0dd3b7a
commit 3d5f9d6878
21 changed files with 1894 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java
View File

@@ -86,6 +86,16 @@ public interface SysDictInfoDao extends CrudDao<SysDictInfo> {
* @param sysDictInfo
*/
void updateLevelNo(SysDictInfo sysDictInfo);
/**
* getDistrictDict(这里用一句话描述这个方法的作用)
* (这里描述这个方法适用条件 – 可选)
* @param sysDictInfo
* @return
*List<SysDictInfo>
* @exception
* @since 1.0.0
*/
List<SysDictInfo> getDistrictDict(String itemCode);

8
src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
View File

@@ -327,5 +327,11 @@
s.level_no = #{levelNo}
WHERE s.sys_dict_id = #{sysDictId}
</update>
<!-- 获取增强字符串配置district -->
<select id="getDistrictDict" resultType="com.nis.domain.basics.SysDictInfo" >
SELECT
<include refid="sysDictInfoColumns"/>
FROM sys_dict_info s
WHERE s.is_valid = 1 AND item_type = 3 AND item_code like concat(#{itemCode,jdbcType=VARCHAR},'%')
</select>
</mapper>

67
src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
View File

@@ -94,75 +94,10 @@
<if test="cfgId != null">
AND CFG_ID=#{cfgId,jdbcType=BIGINT}
</if>
<if test="cfgDesc != null">
AND CFG_DESC=#{cfgDesc,jdbcType=VARCHAR}
</if>
<if test="district != null">
AND DISTRICT=#{district,jdbcType=VARCHAR}
</if>
<if test="keywords != null">
AND KEYWORDS=#{keywords,jdbcType=VARCHAR}
</if>
<if test="action != null">
AND ACTION=#{action,jdbcType=INTEGER}
</if>
<if test="isValid != null">
AND IS_VALID=#{isValid,jdbcType=INTEGER}
</if>
<if test="isAudit != null">
AND IS_AUDIT=#{isAudit,jdbcType=INTEGER}
</if>
<if test="creatorId != null">
AND CREATOR_ID=#{creatorId,jdbcType=INTEGER}
</if>
<if test="createTime != null">
AND CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
</if>
<if test="editorId != null">
AND EDITOR_ID=#{editorId,jdbcType=INTEGER}
</if>
<if test="editTime != null">
AND EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
</if>
<if test="auditorId != null">
AND AUDITOR_ID=#{auditorId,jdbcType=INTEGER}
</if>
<if test="auditTime != null">
AND AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
</if>
<if test="serviceId != null">
AND SERVICE_ID=#{serviceId,jdbcType=INTEGER}
</if>
<if test="requestId != null">
AND REQUEST_ID=#{requestId,jdbcType=INTEGER}
</if>
<if test="compileId != null">
AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
<if test="classify != null">
AND classify=#{classify,jdbcType=VARCHAR}
</if>
<if test="attribute != null">
AND attribute=#{attribute,jdbcType=VARCHAR}
</if>
<if test="lable != null">
AND lable=#{lable,jdbcType=VARCHAR}
</if>
<if test="exprType != null">
AND EXPR_TYPE=#{exprType,jdbcType=INTEGER}
</if>
<if test="matchMethod != null">
AND MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
</if>
<if test="isHexbin != null">
AND IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
</if>
<if test="areaEffectiveIds != null">
AND AREA_EFFECTIVE_IDS=#{areaEffectiveIds,jdbcType=VARCHAR}
</if>
AND IS_VALID!=-1
</trim>
</select>
<select id="findList" resultMap="ComplexStringMapWithUser">

88
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -155,96 +155,10 @@
<if test="cfgId != null">
AND CFG_ID=#{cfgId,jdbcType=BIGINT}
</if>
<if test="cfgDesc != null">
AND CFG_DESC=#{cfgDesc,jdbcType=VARCHAR}
</if>
<if test="ipType != null">
AND IP_TYPE=#{ipType,jdbcType=INTEGER}
</if>
<if test="srcIp != null">
AND SRC_IP=#{srcIp,jdbcType=VARCHAR}
</if>
<if test="srcIpMask != null">
AND SRC_IP_MASK=#{srcIpMask,jdbcType=VARCHAR}
</if>
<if test="srcPort != null">
AND SRC_PORT=#{srcPort,jdbcType=VARCHAR}
</if>
<if test="srcPortMask != null">
AND SRC_PORT_MASK=#{srcPortMask,jdbcType=VARCHAR}
</if>
<if test="dstIp != null">
AND DST_IP=#{dstIp,jdbcType=VARCHAR}
</if>
<if test="dstIpMask != null">
AND DST_IP_MASK=#{dstIpMask,jdbcType=VARCHAR}
</if>
<if test="dstPort != null">
AND DST_PORT=#{dstPort,jdbcType=VARCHAR}
</if>
<if test="dstPortMask != null">
AND DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR}
</if>
<if test="direction != null">
AND DIRECTION=#{direction,jdbcType=INTEGER}
</if>
<if test="protocol != null">
AND PROTOCOL=#{protocol,jdbcType=INTEGER}
</if>
<if test="protocolId != null">
AND PROTOCOL_ID=#{protocolId,jdbcType=INTEGER}
</if>
<if test="action != null">
AND ACTION=#{action,jdbcType=INTEGER}
</if>
<if test="isValid != null">
AND IS_VALID=#{isValid,jdbcType=INTEGER}
</if>
<if test="isAudit != null">
AND IS_AUDIT=#{isAudit,jdbcType=INTEGER}
</if>
<if test="creatorId != null">
AND CREATOR_ID=#{creatorId,jdbcType=INTEGER}
</if>
<if test="createTime != null">
AND CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
</if>
<if test="editorId != null">
AND EDITOR_ID=#{editorId,jdbcType=INTEGER}
</if>
<if test="editTime != null">
AND EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
</if>
<if test="auditorId != null">
AND AUDITOR_ID=#{auditorId,jdbcType=INTEGER}
</if>
<if test="auditTime != null">
AND AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
</if>
<if test="serviceId != null">
AND SERVICE_ID=#{serviceId,jdbcType=INTEGER}
</if>
<if test="requestId != null">
AND REQUEST_ID=#{requestId,jdbcType=INTEGER}
</if>
<if test="compileId != null">
AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
<if test="classify != null">
AND classify=#{classify,jdbcType=VARCHAR}
</if>
<if test="attribute != null">
AND attribute=#{attribute,jdbcType=VARCHAR}
</if>
<if test="lable != null">
AND lable=#{lable,jdbcType=VARCHAR}
</if>
<if test="areaEffectiveIds != null">
AND AREA_EFFECTIVE_IDS=#{areaEffectiveIds,jdbcType=VARCHAR}
</if>
AND IS_VALID!=-1
</trim>
</select>
<select id="findList" resultMap="BaseIpMapWithUser">

70
src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml
View File

@@ -94,78 +94,10 @@
<if test="cfgId != null">
AND CFG_ID=#{cfgId,jdbcType=BIGINT}
</if>
<if test="cfgDesc != null">
AND CFG_DESC=#{cfgDesc,jdbcType=VARCHAR}
</if>
<if test="lowBounadry != null">
AND LOW_BOUNADRY=#{lowBounadry,jdbcType=BIGINT}
</if>
<if test="upBounadry != null">
AND UP_BOUNADRY=#{upBounadry,jdbcType=BIGINT}
</if>
<if test="cfgKeywords != null">
AND CFG_KEYWORDS=#{cfgKeywords,jdbcType=VARCHAR}
</if>
<if test="action != null">
AND ACTION=#{action,jdbcType=INTEGER}
</if>
<if test="isValid != null">
AND IS_VALID=#{isValid,jdbcType=INTEGER}
</if>
<if test="isAudit != null">
AND IS_AUDIT=#{isAudit,jdbcType=INTEGER}
</if>
<if test="creatorId != null">
AND CREATOR_ID=#{creatorId,jdbcType=INTEGER}
</if>
<if test="createTime != null">
AND CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
</if>
<if test="editorId != null">
AND EDITOR_ID=#{editorId,jdbcType=INTEGER}
</if>
<if test="editTime != null">
AND EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
</if>
<if test="auditorId != null">
AND AUDITOR_ID=#{auditorId,jdbcType=INTEGER}
</if>
<if test="auditTime != null">
AND AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
</if>
<if test="serviceId != null">
AND SERVICE_ID=#{serviceId,jdbcType=INTEGER}
</if>
<if test="requestId != null">
AND REQUEST_ID=#{requestId,jdbcType=INTEGER}
</if>
<if test="compileId != null">
AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
<if test="classify != null">
AND classify=#{classify,jdbcType=VARCHAR}
</if>
<if test="attribute != null">
AND attribute=#{attribute,jdbcType=VARCHAR}
</if>
<if test="lable != null">
AND lable=#{lable,jdbcType=VARCHAR}
</if>
<if test="exprType != null">
AND EXPR_TYPE=#{exprType,jdbcType=INTEGER}
</if>
<if test="matchMethod != null">
AND MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
</if>
<if test="isHexbin != null">
AND IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
</if>
<if test="areaEffectiveIds != null">
AND AREA_EFFECTIVE_IDS=#{areaEffectiveIds,jdbcType=VARCHAR}
</if>
AND IS_VALID!=-1
</trim>
</select>
<select id="findList" resultMap="NumMapWithUser">

64
src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
View File

@@ -115,72 +115,10 @@
<if test="cfgId != null">
AND CFG_ID=#{cfgId,jdbcType=BIGINT}
</if>
<if test="cfgDesc != null">
AND CFG_DESC=#{cfgDesc,jdbcType=VARCHAR}
</if>
<if test="cfgKeywords != null">
AND CFG_KEYWORDS=#{cfgKeywords,jdbcType=VARCHAR}
</if>
<if test="action != null">
AND ACTION=#{action,jdbcType=INTEGER}
</if>
<if test="isValid != null">
AND IS_VALID=#{isValid,jdbcType=INTEGER}
</if>
<if test="isAudit != null">
AND IS_AUDIT=#{isAudit,jdbcType=INTEGER}
</if>
<if test="creatorId != null">
AND CREATOR_ID=#{creatorId,jdbcType=INTEGER}
</if>
<if test="createTime != null">
AND CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
</if>
<if test="editorId != null">
AND EDITOR_ID=#{editorId,jdbcType=INTEGER}
</if>
<if test="editTime != null">
AND EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
</if>
<if test="auditorId != null">
AND AUDITOR_ID=#{auditorId,jdbcType=INTEGER}
</if>
<if test="auditTime != null">
AND AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
</if>
<if test="serviceId != null">
AND SERVICE_ID=#{serviceId,jdbcType=INTEGER}
</if>
<if test="requestId != null">
AND REQUEST_ID=#{requestId,jdbcType=INTEGER}
</if>
<if test="compileId != null">
AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null">
AND IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
<if test="classify != null">
AND classify=#{classify,jdbcType=VARCHAR}
</if>
<if test="attribute != null">
AND attribute=#{attribute,jdbcType=VARCHAR}
</if>
<if test="lable != null">
AND lable=#{lable,jdbcType=VARCHAR}
</if>
<if test="exprType != null">
AND EXPR_TYPE=#{exprType,jdbcType=INTEGER}
</if>
<if test="matchMethod != null">
AND MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
</if>
<if test="isHexbin != null">
AND IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
</if>
<if test="areaEffectiveIds != null">
AND AREA_EFFECTIVE_IDS=#{areaEffectiveIds,jdbcType=VARCHAR}
</if>
AND IS_VALID!=-1
</trim>
</select>