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

配置界面的Cfg Id检索条件 增加范围和in的检索方式的功能修改

Browse Source
This commit is contained in:
shangguanyanfei
2019-04-11 17:13:44 +08:00
parent fc08261929
commit 268a0ae81b
26 changed files with 276 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -62,10 +62,8 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
protected String exType;//导出类型 protected String exType;//导出类型
protected String hColumns;//导出隐藏列 protected String hColumns;//导出隐藏列
protected Integer compileIdStart;//配置ID 查询范围 开始
protected Integer compileIdEnd;//配置ID 查询范围 结束
protected String compileIdNew;// 查询 配置ID 范围 protected String compileIdNew;// 查询 配置ID 范围
protected List<String> compileIdNewList; //查询范围（1,2,3）
/** /**
* 定时任务信息 * 定时任务信息
*/ */
@@ -112,31 +110,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
public void setCompileGroupMap(Map<Integer, Integer> compileGroupMap) { public void setCompileGroupMap(Map<Integer, Integer> compileGroupMap) {
this.compileGroupMap = compileGroupMap; this.compileGroupMap = compileGroupMap;
} }
public Integer getCompileIdStart() {
return compileIdStart;
}
public void setCompileIdStart(Integer compileIdStart) {
this.compileIdStart = compileIdStart;
}
public Integer getCompileIdEnd() {
return compileIdEnd;
}
public void setCompileIdEnd(Integer compileIdEnd) {
this.compileIdEnd = compileIdEnd;
}
public String getCompileIdNew() { public String getCompileIdNew() {
return compileIdNew; return compileIdNew;
} }
public void setCompileIdNew(String compileIdNew) { public void setCompileIdNew(String compileIdNew) {
this.compileIdNew = compileIdNew; this.compileIdNew = compileIdNew;
} }
public List<String> getCompileIdNewList() {
return compileIdNewList;
}
public void setCompileIdNewList(List<String> compileIdNewList) {
this.compileIdNewList = compileIdNewList;
}
/** /**
* 编译id * 编译id
*/ */

95
src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
View File

@@ -761,16 +761,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>
@@ -941,16 +950,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="compileGroupMap != null"> <if test="compileGroupMap != null">
and r.COMPILE_ID in and r.COMPILE_ID in
<foreach collection="compileGroupMap.keys" index="index" item="compileId" open="(" separator="," close=")"> <foreach collection="compileGroupMap.keys" index="index" item="compileId" open="(" separator="," close=")">
@@ -1160,16 +1178,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>
@@ -1271,16 +1298,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>
@@ -1579,16 +1615,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

19
src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
View File

@@ -308,16 +308,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

19
src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
View File

@@ -164,16 +164,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

19
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -352,16 +352,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

19
src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
View File

@@ -234,16 +234,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

38
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
View File

@@ -245,16 +245,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>
@@ -927,16 +936,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

57
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -252,16 +252,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>
@@ -706,16 +715,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>
@@ -1150,16 +1168,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

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

@@ -1105,16 +1105,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

38
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -128,15 +128,24 @@
<if test="compileId != null"> <if test="compileId != null">
AND r.compile_id=#{compileId,jdbcType=BIGINT} AND r.compile_id=#{compileId,jdbcType=BIGINT}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND r.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND r.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND r.COMPILE_ID in AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND r.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if> </if>
<if test="srcIpAddress != null and srcIpAddress != ''"> <if test="srcIpAddress != null and srcIpAddress != ''">
AND r.src_ip_address=#{srcIpAddress,jdbcType=VARCHAR} AND r.src_ip_address=#{srcIpAddress,jdbcType=VARCHAR}
@@ -648,15 +657,24 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.compile_id=#{compileId,jdbcType=BIGINT} AND a.compile_id=#{compileId,jdbcType=BIGINT}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if> </if>
<if test="srcIpAddress != null and srcIpAddress != ''"> <if test="srcIpAddress != null and srcIpAddress != ''">
AND a.original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR} AND a.original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR}

19
src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
View File

@@ -196,16 +196,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

19
src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
View File

@@ -215,16 +215,25 @@
<if test="compileId != null"> <if test="compileId != null">
AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER} AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if> </if>
<if test="compileIdStart != null and compileIdEnd != null"> <if test="compileIdNew != null and compileIdNew != '' and compileIdNew.indexOf('-') != -1">
AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER} <foreach collection="compileIdNew.split('-')" index="index" item="item" >
AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER} <if test="index == 0">
AND a.COMPILE_ID &gt;= #{item,jdbcType=INTEGER}
</if>
<if test="index == 1">
AND a.COMPILE_ID &lt;= #{item,jdbcType=INTEGER}
</if>
</foreach>
</if> </if>
<if test="compileIdNewList !=null"> <if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') != -1">
AND a.COMPILE_ID in AND a.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="compileIdNew.split(',')" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
</if> </if>
<if test="compileIdNew !=null and compileIdNew != '' and compileIdNew.indexOf(',') == -1 and compileIdNew.indexOf('-') == -1">
AND a.COMPILE_ID=#{compileIdNew,jdbcType=INTEGER}
</if>
<if test="isAreaEffective != null"> <if test="isAreaEffective != null">
AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER} AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if> </if>

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

@@ -88,29 +88,6 @@ public class AppCfgService extends BaseService {
protected AsnIpCfgDao asnIpCfgDao; protected AsnIpCfgDao asnIpCfgDao;
public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) { public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page); entity.setPage(page);
List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity); List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity);
@@ -125,29 +102,6 @@ public class AppCfgService extends BaseService {
public Page<AppIpCfg> findAppIpList(Page<AppIpCfg> page, AppIpCfg entity) { public Page<AppIpCfg> findAppIpList(Page<AppIpCfg> page, AppIpCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page); entity.setPage(page);
List<AppIpCfg> list = appCfgDao.findAppIpList(entity); List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
@@ -178,29 +132,6 @@ public class AppCfgService extends BaseService {
} }
public Page<AppDomainCfg> findAppDomainList(Page<AppDomainCfg> page, AppDomainCfg entity) { public Page<AppDomainCfg> findAppDomainList(Page<AppDomainCfg> page, AppDomainCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page); entity.setPage(page);
List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity); List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity);
@@ -225,29 +156,6 @@ public class AppCfgService extends BaseService {
// 主题网站列表 // 主题网站列表
public Page<AppTopicDomainCfg> findAppTopicDomainList(Page<AppTopicDomainCfg> page, AppTopicDomainCfg entity) { public Page<AppTopicDomainCfg> findAppTopicDomainList(Page<AppTopicDomainCfg> page, AppTopicDomainCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page); entity.setPage(page);
List<AppTopicDomainCfg> list = appCfgDao.findAppTopicDomainList(entity); List<AppTopicDomainCfg> list = appCfgDao.findAppTopicDomainList(entity);
@@ -272,29 +180,6 @@ public class AppCfgService extends BaseService {
} }
public Page<AppSslCertCfg> findAppSslList(Page<AppSslCertCfg> page, AppSslCertCfg entity) { public Page<AppSslCertCfg> findAppSslList(Page<AppSslCertCfg> page, AppSslCertCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page); entity.setPage(page);
List<AppSslCertCfg> list = appCfgDao.findAppSslList(entity); List<AppSslCertCfg> list = appCfgDao.findAppSslList(entity);

23
src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
View File

@@ -58,29 +58,6 @@ public class AppMultiFeatureCfgService extends BaseService {
//分页查询 //分页查询
public Page<AppFeatureIndex> findAppFeatureIndexList(Page<AppFeatureIndex> page, AppFeatureIndex entity) { public Page<AppFeatureIndex> findAppFeatureIndexList(Page<AppFeatureIndex> page, AppFeatureIndex entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page); entity.setPage(page);
List<AppFeatureIndex> list = appMultiFeatureCfgDao.findAppFeatureIndexList(entity); List<AppFeatureIndex> list = appMultiFeatureCfgDao.findAppFeatureIndexList(entity);

23
src/main/java/com/nis/web/service/configuration/AvCfgService.java
View File

@@ -59,29 +59,6 @@ public class AvCfgService extends BaseService{
return avCfgDao.getAvSignSampleById(cfgId); return avCfgDao.getAvSignSampleById(cfgId);
} }
public Page<AvFileSampleCfg> getAvFileSampleList(Page<AvFileSampleCfg> page, AvFileSampleCfg entity){ public Page<AvFileSampleCfg> getAvFileSampleList(Page<AvFileSampleCfg> page, AvFileSampleCfg entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);

23
src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
View File

@@ -72,29 +72,6 @@ public class AvContentCfgService extends BaseService{
* @return * @return
*/ */
public Page<CfgIndexInfo> findPage(Page<CfgIndexInfo> page, CfgIndexInfo entity) { public Page<CfgIndexInfo> findPage(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.setPage(page); entity.setPage(page);
List<CfgIndexInfo> list=avContentCfgDao.findVoipList(entity); List<CfgIndexInfo> list=avContentCfgDao.findVoipList(entity);

23
src/main/java/com/nis/web/service/configuration/BgpCfgService.java
View File

@@ -64,29 +64,6 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
return entity; return entity;
} }
public Page<CfgIndexInfo> getBgpList(Page<CfgIndexInfo> page, CfgIndexInfo entity){ public Page<CfgIndexInfo> getBgpList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);

46
src/main/java/com/nis/web/service/configuration/CachePolicyService.java
View File

@@ -73,29 +73,6 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
} }
public Page<CachePolicyUserRegion> getCachePolicyUserRegionList(Page<CachePolicyUserRegion> page, CachePolicyUserRegion entity){ public Page<CachePolicyUserRegion> getCachePolicyUserRegionList(Page<CachePolicyUserRegion> page, CachePolicyUserRegion entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);
List<CachePolicyUserRegion> list = commonPolicyDao.getCachePolicyUserRegionList(entity); List<CachePolicyUserRegion> list = commonPolicyDao.getCachePolicyUserRegionList(entity);
@@ -177,29 +154,6 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
} }
public Page<CfgIndexInfo> getCachePolicyList(Page<CfgIndexInfo> page, CfgIndexInfo entity){ public Page<CfgIndexInfo> getCachePolicyList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);

23
src/main/java/com/nis/web/service/configuration/DomainService.java
View File

@@ -661,29 +661,6 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
} }
} }
public Page<CfgIndexInfo> getDomainList(Page<CfgIndexInfo> page, CfgIndexInfo entity){ public Page<CfgIndexInfo> getDomainList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);

69
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -66,29 +66,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
protected StringCfgDao stringCfgDao; protected StringCfgDao stringCfgDao;
public Page<CfgIndexInfo> getFtpList(Page<CfgIndexInfo> page, CfgIndexInfo entity){ public Page<CfgIndexInfo> getFtpList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);
@@ -416,29 +393,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
} }
public Page<FileDigestCfg> getFileDigestList(Page<FileDigestCfg> page, FileDigestCfg entity){ public Page<FileDigestCfg> getFileDigestList(Page<FileDigestCfg> page, FileDigestCfg entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);
@@ -723,29 +677,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
} }
public Page<CfgIndexInfo> getP2pList(Page<CfgIndexInfo> page, CfgIndexInfo entity){ public Page<CfgIndexInfo> getP2pList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);

23
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -101,29 +101,6 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
} }
public Page<CfgIndexInfo> getHttpRedirectList(Page<CfgIndexInfo> page, CfgIndexInfo entity){ public Page<CfgIndexInfo> getHttpRedirectList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);

23
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -1001,29 +1001,6 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
return msgProp; return msgProp;
} }
public Page<CfgIndexInfo> getIpCfgList(Page<CfgIndexInfo> page, CfgIndexInfo entity) { public Page<CfgIndexInfo> getIpCfgList(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);
List<CfgIndexInfo> list = ipCfgDao.getIpCfgList(entity); List<CfgIndexInfo> list = ipCfgDao.getIpCfgList(entity);

48
src/main/java/com/nis/web/service/configuration/IpMultiplexService.java
View File

@@ -1,6 +1,5 @@
package com.nis.web.service.configuration; package com.nis.web.service.configuration;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -24,7 +23,6 @@ import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils; import com.nis.util.StringUtils;
import com.nis.web.dao.configuration.IpMultiplexDao; import com.nis.web.dao.configuration.IpMultiplexDao;
import com.nis.web.security.UserUtils; import com.nis.web.security.UserUtils;
@@ -39,29 +37,6 @@ public class IpMultiplexService extends BaseService{
private IpMultiplexDao ipMultiplexDao; private IpMultiplexDao ipMultiplexDao;
public Page<IpReusePolicyCfg> findPage(Page<IpReusePolicyCfg> page, IpReusePolicyCfg entity) { public Page<IpReusePolicyCfg> findPage(Page<IpReusePolicyCfg> page, IpReusePolicyCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.setPage(page); entity.setPage(page);
List<IpReusePolicyCfg> list=ipMultiplexDao.findPage(entity); List<IpReusePolicyCfg> list=ipMultiplexDao.findPage(entity);
@@ -308,29 +283,6 @@ public class IpMultiplexService extends BaseService{
} }
public Page<BaseIpCfg> findPageDnat(Page<BaseIpCfg> page, IpReuseDnatPolicyCfg entity) { public Page<BaseIpCfg> findPageDnat(Page<BaseIpCfg> page, IpReuseDnatPolicyCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);
List<BaseIpCfg> list=ipMultiplexDao.findPageDnat(entity); List<BaseIpCfg> list=ipMultiplexDao.findPageDnat(entity);

24
src/main/java/com/nis/web/service/configuration/MailCfgService.java
View File

@@ -37,7 +37,6 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.FileUtils; import com.nis.util.FileUtils;
import com.nis.util.JsonMapper; import com.nis.util.JsonMapper;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AreaIpCfgDao; import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.MailCfgDao; import com.nis.web.dao.configuration.MailCfgDao;
import com.nis.web.dao.configuration.StringCfgDao; import com.nis.web.dao.configuration.StringCfgDao;
@@ -60,29 +59,6 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
public Page<CfgIndexInfo> getMailList(Page<CfgIndexInfo> page, CfgIndexInfo entity){ public Page<CfgIndexInfo> getMailList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);

24
src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
View File

@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.SysUser;
import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.CfgIndexInfo;
@@ -166,29 +165,6 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
return entity; return entity;
} }
public Page<CfgIndexInfo> getWebsiteList(Page<CfgIndexInfo> page, CfgIndexInfo entity){ public Page<CfgIndexInfo> getWebsiteList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL） // 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page); entity.setPage(page);

8
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
View File

@@ -29,6 +29,14 @@ jQuery.validator.addMethod("compileIdCheck",function(value,element){
var flagTypeSame=true; var flagTypeSame=true;
if(this.optional(element) || /^(\d+,)*\d+$/.test(value) || /^(\d+-)?\d+$/.test(value)){ if(this.optional(element) || /^(\d+,)*\d+$/.test(value) || /^(\d+-)?\d+$/.test(value)){
flagTypeSame=true; flagTypeSame=true;
if(/^(\d+-)?\d+$/.test(value)){
var strArr=value.split("-");
if(Number(strArr[0])>Number(strArr[1])){
flagTypeSame=false;
}else{
flagTypeSame=true;
}
}
}else{ }else{
flagTypeSame=false; flagTypeSame=false;
} }