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:
zhanghongqing
2018-11-29 17:20:33 +08:00
parent 8c7b187c8b
commit 787427197e
18 changed files with 479 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,8 +52,8 @@ public class AvCfgService extends BaseService{
@Autowired
protected AvCfgDao avCfgDao;
public AvFileSampleCfg getAvFileSampleById(Long cfgId){
return avCfgDao.getAvFileSampleById(cfgId);
public AvFileSampleCfg getAvFileSampleById(Long cfgId,Integer compileId){
return avCfgDao.getAvFileSampleById(cfgId,compileId);
}
public AvSignSampleCfg getAvSignSampleById(Long cfgId){
return avCfgDao.getAvSignSampleById(cfgId);
@@ -112,7 +112,7 @@ public class AvCfgService extends BaseService{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
}else{
AvFileSampleCfg oldEntity = this.getAvFileSampleById(entity.getCfgId());
AvFileSampleCfg oldEntity = this.getAvFileSampleById(entity.getCfgId(),entity.getCompileId());
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(new Date());
entity.setIsValid(0);

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

@@ -62,8 +62,8 @@ public class DdosCfgService extends BaseService{
return page;
}
public DdosIpCfg getDdosIpCfg(Long cfgId) {
return ddosCfgDao.getDdosIpCfg(cfgId);
public DdosIpCfg getDdosIpCfg(Long cfgId,Integer compileId) {
return ddosCfgDao.getDdosIpCfg(cfgId,compileId);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdate(DdosIpCfg entity){
@@ -224,7 +224,7 @@ public class DdosCfgService extends BaseService{
public void audit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime) throws Exception{
DdosIpCfg entity = new DdosIpCfg();
entity=ddosCfgDao.getDdosIpCfg(Long.valueOf(id));
entity=ddosCfgDao.getDdosIpCfg(Long.valueOf(id),entity.getCompileId());
List<DdosIpCfg> list = new ArrayList();
entity.setCfgId(Long.valueOf(id));
@@ -265,7 +265,7 @@ public class DdosCfgService extends BaseService{
List<IpCfg> areaIpRegionList = new ArrayList();
entity=this.getDdosIpCfg(entity.getCfgId());
entity=this.getDdosIpCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIsAudit()==1){
List<DdosIpCfg> ipList=new ArrayList<DdosIpCfg>();