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 11:26:39 +08:00
parent 04a94458ed
commit fc08261929
58 changed files with 844 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,11 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
protected Integer compileIsIssued;
protected String exType;//导出类型
protected String hColumns;//导出隐藏列
protected Integer compileIdStart;//配置ID 查询范围 开始
protected Integer compileIdEnd;//配置ID 查询范围 结束
protected String compileIdNew;// 查询 配置ID 范围
protected List<String> compileIdNewList; //查询范围（1,2,3）
/**
* 定时任务信息
*/
@@ -108,6 +113,30 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
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() {
return compileIdNew;
}
public void setCompileIdNew(String compileIdNew) {
this.compileIdNew = compileIdNew;
}
public List<String> getCompileIdNewList() {
return compileIdNewList;
}
public void setCompileIdNewList(List<String> compileIdNewList) {
this.compileIdNewList = compileIdNewList;
}
/**
* 编译id
*/

31
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -484,13 +484,15 @@ public class IpMultiplexController extends CommonController {
for (Integer id : set) {
serviceIds.append(id+",");
}
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
//获取日志总量
if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
logTotals.addAll(logs);
}
if(serviceIds.length()>1&&compileIds.length()>1){
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
//获取日志总量
if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
logTotals.addAll(logs);
}
}
List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
for (IpReusePolicyCfg ipReusePolicyCfg : ipLists) {
if(ipReusePolicyCfg.getAddrPoolId()!=null){
@@ -604,12 +606,15 @@ public class IpMultiplexController extends CommonController {
for (Integer id : set) {
serviceIds.append(id+",");
}
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
//获取日志总量
if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
logTotals.addAll(logs);
if(serviceIds.length()>1&&compileIds.length()>1){
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
//获取日志总量
if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), IpReuseDnatPolicyCfg.class);

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

@@ -761,6 +761,16 @@
<if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
</if>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -931,6 +941,16 @@
<if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
</if>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="compileGroupMap != null">
and r.COMPILE_ID in
<foreach collection="compileGroupMap.keys" index="index" item="compileId" open="(" separator="," close=")">
@@ -1140,6 +1160,16 @@
<if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
</if>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -1241,6 +1271,16 @@
<if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
</if>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>
@@ -1539,6 +1579,16 @@
<if test="compileId != null">
AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
</if>
<if test="compileIdStart != null and compileIdEnd != null">
AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
</if>
<if test="compileIdNewList !=null">
AND r.COMPILE_ID in
<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="isAreaEffective != null">
AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
</if>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -88,6 +88,29 @@ public class AppCfgService extends BaseService {
protected AsnIpCfgDao asnIpCfgDao;
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.setPage(page);
List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity);
@@ -102,6 +125,29 @@ public class AppCfgService extends BaseService {
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.setPage(page);
List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
@@ -132,6 +178,29 @@ public class AppCfgService extends BaseService {
}
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.setPage(page);
List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity);
@@ -156,6 +225,29 @@ public class AppCfgService extends BaseService {
// 主题网站列表
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.setPage(page);
List<AppTopicDomainCfg> list = appCfgDao.findAppTopicDomainList(entity);
@@ -180,6 +272,29 @@ public class AppCfgService extends BaseService {
}
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.setPage(page);
List<AppSslCertCfg> list = appCfgDao.findAppSslList(entity);

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

@@ -58,6 +58,29 @@ public class AppMultiFeatureCfgService extends BaseService {
//分页查询
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.setPage(page);
List<AppFeatureIndex> list = appMultiFeatureCfgDao.findAppFeatureIndexList(entity);

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

@@ -59,6 +59,29 @@ public class AvCfgService extends BaseService{
return avCfgDao.getAvSignSampleById(cfgId);
}
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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);

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

@@ -72,6 +72,29 @@ public class AvContentCfgService extends BaseService{
* @return
*/
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.setPage(page);
List<CfgIndexInfo> list=avContentCfgDao.findVoipList(entity);

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

@@ -64,6 +64,29 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
return 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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);

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

@@ -73,6 +73,29 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
}
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.setPage(page);
List<CachePolicyUserRegion> list = commonPolicyDao.getCachePolicyUserRegionList(entity);
@@ -154,6 +177,29 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
}
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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);

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

@@ -661,6 +661,29 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
}
}
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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);

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

@@ -66,6 +66,29 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
protected StringCfgDao stringCfgDao;
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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);
@@ -393,6 +416,29 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);
@@ -677,6 +723,29 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);

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

@@ -101,6 +101,29 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
}
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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);

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

@@ -1001,6 +1001,29 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
return msgProp;
}
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.setPage(page);
List<CfgIndexInfo> list = ipCfgDao.getIpCfgList(entity);

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

@@ -1,5 +1,6 @@
package com.nis.web.service.configuration;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -23,6 +24,7 @@ import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.dao.configuration.IpMultiplexDao;
import com.nis.web.security.UserUtils;
@@ -37,6 +39,29 @@ public class IpMultiplexService extends BaseService{
private IpMultiplexDao ipMultiplexDao;
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.setPage(page);
List<IpReusePolicyCfg> list=ipMultiplexDao.findPage(entity);
@@ -283,6 +308,29 @@ public class IpMultiplexService extends BaseService{
}
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.setPage(page);
List<BaseIpCfg> list=ipMultiplexDao.findPageDnat(entity);

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

@@ -37,6 +37,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.MailCfgDao;
import com.nis.web.dao.configuration.StringCfgDao;
@@ -59,6 +60,29 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.SysUser;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
@@ -165,6 +166,29 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
return 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）
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
entity.setPage(page);