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

无更改

Browse Source
This commit is contained in:
DuanDongmei
2018-11-29 09:34:13 +08:00
parent 8f9f100469
commit c81bb25f22
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,7 +206,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
entity.setFunctionId(functionId); entity.setFunctionId(functionId);
ipCfgDao.updateCfgValid(entity); ipCfgDao.updateCfgValid(entity);
//查询子配置 //查询子配置
entity = this.getIpPortCfg(Long.parseLong(id)); entity = this.getIpPortCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg(); IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -468,7 +468,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
int maatType=0; int maatType=0;
//查询子配置并修改审核状态 //查询子配置并修改审核状态
entity = this.getIpPortCfg(entity.getCfgId()); entity = this.getIpPortCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){ if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
//判断下发类型是走maat还是callback //判断下发类型是走maat还是callback
String regionValue=entity.getIpPortList().get(0).getCfgType(); String regionValue=entity.getIpPortList().get(0).getCfgType();
@@ -827,8 +827,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){ public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){
return ipCfgDao.getById(baseIpCfg.getTableName(), baseIpCfg.getCfgId()); return ipCfgDao.getById(baseIpCfg.getTableName(), baseIpCfg.getCfgId());
} }
public CfgIndexInfo getIpPortCfg(Long cfgId){ public CfgIndexInfo getIpPortCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId); CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = ipCfgDao.getIpPortList(entity); List<IpPortCfg> ipPortList = ipCfgDao.getIpPortList(entity);
List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity); List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
entity.setIpPortList(ipPortList); entity.setIpPortList(ipPortList);