新增劫持文件、注入脚本文件、流量转发目的地菜单,完善文件劫持菜单。
This commit is contained in:
@@ -13,6 +13,14 @@ import com.google.common.collect.Lists;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.callback.InlineIp;
|
||||
import com.nis.domain.callback.NtcDnsResStrategy;
|
||||
import com.nis.domain.callback.ProxyFileHijackCfg;
|
||||
import com.nis.domain.callback.ProxyFileHijackCfgAudit;
|
||||
import com.nis.domain.callback.ProxyFileInsertScriptCfg;
|
||||
import com.nis.domain.callback.ProxyFileInsertScriptCfgAudit;
|
||||
import com.nis.domain.callback.ProxyFileStrategyCfg;
|
||||
import com.nis.domain.callback.ProxyFileStrategyCfgAudit;
|
||||
import com.nis.domain.callback.ProxyFileTrafficMirrorCfg;
|
||||
import com.nis.domain.callback.ProxyFileTrafficMirrorCfgAudit;
|
||||
import com.nis.domain.callback.ProxyObjKeyring;
|
||||
import com.nis.domain.callback.ProxyObjTrustedCa;
|
||||
import com.nis.domain.configuration.BaseCfg;
|
||||
@@ -361,6 +369,42 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
|
||||
if(convertList.size() > 0) {
|
||||
notAuditList = convertList;
|
||||
}
|
||||
}else if(entity.getServiceId().equals(643)) { // 劫持文件
|
||||
List<ProxyFileHijackCfgAudit> convertList = Lists.newArrayList();
|
||||
for (Object object : notAuditList) {
|
||||
ProxyFileHijackCfg cfg = (ProxyFileHijackCfg)object;
|
||||
convertList.add(BaseService.convertCallBackProxyFileHijack(cfg));
|
||||
}
|
||||
if(convertList.size() > 0) {
|
||||
notAuditList = convertList;
|
||||
}
|
||||
}else if(entity.getServiceId().equals(644)) { // 注入脚本文件
|
||||
List<ProxyFileInsertScriptCfgAudit> convertList = Lists.newArrayList();
|
||||
for (Object object : notAuditList) {
|
||||
ProxyFileInsertScriptCfg cfg = (ProxyFileInsertScriptCfg)object;
|
||||
convertList.add(BaseService.convertCallBackProxyFileInsertScript(cfg));
|
||||
}
|
||||
if(convertList.size() > 0) {
|
||||
notAuditList = convertList;
|
||||
}
|
||||
}else if(entity.getServiceId().equals(645)) { // 流量转发目的地址
|
||||
List<ProxyFileTrafficMirrorCfgAudit> convertList = Lists.newArrayList();
|
||||
for (Object object : notAuditList) {
|
||||
ProxyFileTrafficMirrorCfg cfg = (ProxyFileTrafficMirrorCfg)object;
|
||||
convertList.add(BaseService.convertCallBackProxyFileTrafficMirror(cfg));
|
||||
}
|
||||
if(convertList.size() > 0) {
|
||||
notAuditList = convertList;
|
||||
}
|
||||
}else if(entity.getServiceId().equals(608)) { // 文件策略
|
||||
List<ProxyFileStrategyCfgAudit> convertList = Lists.newArrayList();
|
||||
for (Object object : notAuditList) {
|
||||
ProxyFileStrategyCfg cfg = (ProxyFileStrategyCfg)object;
|
||||
convertList.add(BaseService.convertCallBackProxyFileStrategy(cfg));
|
||||
}
|
||||
if(convertList.size() > 0) {
|
||||
notAuditList = convertList;
|
||||
}
|
||||
}
|
||||
// 格式转换 -->
|
||||
|
||||
@@ -423,6 +467,42 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
|
||||
if(convertList.size() > 0) {
|
||||
auditList = convertList;
|
||||
}
|
||||
}else if(entity.getServiceId().equals(643)) { // 劫持文件
|
||||
List<ProxyFileHijackCfgAudit> convertList = Lists.newArrayList();
|
||||
for (Object object : auditList) {
|
||||
ProxyFileHijackCfg cfg = (ProxyFileHijackCfg)object;
|
||||
convertList.add(BaseService.convertCallBackProxyFileHijack(cfg));
|
||||
}
|
||||
if(convertList.size() > 0) {
|
||||
auditList = convertList;
|
||||
}
|
||||
}else if(entity.getServiceId().equals(644)) { // 劫持文件
|
||||
List<ProxyFileInsertScriptCfgAudit> convertList = Lists.newArrayList();
|
||||
for (Object object : auditList) {
|
||||
ProxyFileInsertScriptCfg cfg = (ProxyFileInsertScriptCfg)object;
|
||||
convertList.add(BaseService.convertCallBackProxyFileInsertScript(cfg));
|
||||
}
|
||||
if(convertList.size() > 0) {
|
||||
auditList = convertList;
|
||||
}
|
||||
}else if(entity.getServiceId().equals(645)) { // 流量转发目的地址
|
||||
List<ProxyFileTrafficMirrorCfgAudit> convertList = Lists.newArrayList();
|
||||
for (Object object : auditList) {
|
||||
ProxyFileTrafficMirrorCfg cfg = (ProxyFileTrafficMirrorCfg)object;
|
||||
convertList.add(BaseService.convertCallBackProxyFileTrafficMirror(cfg));
|
||||
}
|
||||
if(convertList.size() > 0) {
|
||||
auditList = convertList;
|
||||
}
|
||||
}else if(entity.getServiceId().equals(608)) { // 文件策略
|
||||
List<ProxyFileStrategyCfgAudit> convertList = Lists.newArrayList();
|
||||
for (Object object : notAuditList) {
|
||||
ProxyFileStrategyCfg cfg = (ProxyFileStrategyCfg)object;
|
||||
convertList.add(BaseService.convertCallBackProxyFileStrategy(cfg));
|
||||
}
|
||||
if(convertList.size() > 0) {
|
||||
notAuditList = convertList;
|
||||
}
|
||||
}
|
||||
// 格式转换 -->
|
||||
|
||||
|
||||
@@ -0,0 +1,157 @@
|
||||
package com.nis.web.service.configuration;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.beust.jcommander.internal.Lists;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.callback.ProxyFileHijackCfg;
|
||||
import com.nis.domain.callback.ProxyFileHijackCfgAudit;
|
||||
import com.nis.domain.callback.ProxyObjKeyring;
|
||||
import com.nis.domain.configuration.PxyObjKeyring;
|
||||
import com.nis.domain.maat.ToMaatResult;
|
||||
import com.nis.exceptions.MaatConvertException;
|
||||
import com.nis.util.ConfigServiceUtil;
|
||||
import com.nis.util.StringUtil;
|
||||
import com.nis.web.dao.configuration.ProxyFileHijackDao;
|
||||
import com.nis.web.security.UserUtils;
|
||||
import com.nis.web.service.BaseService;
|
||||
|
||||
import jersey.repackaged.com.google.common.collect.Maps;
|
||||
|
||||
@Service
|
||||
public class ProxyFileHijackService extends BaseService {
|
||||
|
||||
@Autowired
|
||||
protected ProxyFileHijackDao proxyFileDao;
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
* @param page
|
||||
* @param entity
|
||||
* @return
|
||||
*/
|
||||
public Page<ProxyFileHijackCfg> findPage(Page page, ProxyFileHijackCfg entity) {
|
||||
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
|
||||
entity.setPage(page);
|
||||
List<ProxyFileHijackCfg> list=proxyFileDao.findPage(entity);
|
||||
page.setList(list);
|
||||
return page;
|
||||
}
|
||||
|
||||
public ProxyFileHijackCfg getCfgById(Long cfgId) {
|
||||
return proxyFileDao.getCfgById(cfgId);
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void saveOrUpdate(ProxyFileHijackCfg entity){
|
||||
Date createTime=new Date();
|
||||
setAreaEffectiveIds(entity);
|
||||
int isValid=0;
|
||||
if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) {
|
||||
isValid=1;
|
||||
}
|
||||
entity.setIsValid(0);
|
||||
entity.setIsAudit(0);
|
||||
//新增
|
||||
if(StringUtil.isEmpty(entity.getCfgId())){
|
||||
entity.initDefaultValue();
|
||||
entity.setCreatorId(UserUtils.getUser().getId());
|
||||
entity.setCreateTime(createTime);
|
||||
//调用服务接口获取compileId
|
||||
try {
|
||||
Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);//获取编译id
|
||||
entity.setCompileId(compileId);
|
||||
} catch (Exception e) {
|
||||
logger.info("获取编译ID出错");
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
|
||||
}
|
||||
proxyFileDao.insert(entity);
|
||||
//修改
|
||||
}else{
|
||||
Date editTime=new Date();
|
||||
entity.setEditorId(UserUtils.getUser().getId());
|
||||
entity.setEditTime(editTime);
|
||||
|
||||
proxyFileDao.update(entity);
|
||||
}
|
||||
if(isValid==1) {
|
||||
entity.setIsAudit(1);
|
||||
entity.setIsValid(1);
|
||||
audit( entity.getIsAudit(), isValid, entity.getFunctionId(), String.valueOf(entity.getCfgId()));
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void update(Integer isAudit,Integer isValid,String ids,Integer functionId){
|
||||
ProxyFileHijackCfg entity = new ProxyFileHijackCfg();
|
||||
String[] idArray = ids.split(",");
|
||||
for(String id :idArray){
|
||||
entity.setCfgId(Long.parseLong(id));
|
||||
entity.setFunctionId(functionId);
|
||||
entity.setIsAudit(isAudit);
|
||||
entity.setIsValid(isValid);
|
||||
entity.setEditorId(UserUtils.getUser().getId());
|
||||
entity.setEditTime(new Date());
|
||||
proxyFileDao.update(entity);
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void audit(Integer isAudit,Integer isValid,Integer functionId,String id){
|
||||
Date auditTime = new Date();
|
||||
ProxyFileHijackCfg cfg=new ProxyFileHijackCfg();
|
||||
cfg.setCfgId(Long.valueOf(id));
|
||||
cfg.setIsValid(isValid);
|
||||
cfg.setIsAudit(isAudit);
|
||||
cfg.setAuditorId(UserUtils.getUser().getId());
|
||||
cfg.setAuditTime(auditTime);
|
||||
proxyFileDao.update(cfg);
|
||||
cfg=proxyFileDao.getCfgById(cfg.getCfgId());
|
||||
String json="";
|
||||
if(cfg.getIsAudit()==1){
|
||||
List<ProxyFileHijackCfgAudit> list = new ArrayList<ProxyFileHijackCfgAudit>();
|
||||
ProxyFileHijackCfgAudit listConvert=convertCallBackProxyFileHijack(cfg);
|
||||
list.add(listConvert);
|
||||
//调用服务接口下发配置数据
|
||||
json=gsonToJson(list);
|
||||
logger.info("劫持文件配置下发配置参数:"+json);
|
||||
//调用服务接口下发配置
|
||||
try {
|
||||
//ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
/*if(result!=null){
|
||||
logger.info("劫持文件配置下发响应信息:"+result.getMsg());
|
||||
}*/
|
||||
} catch (Exception e) {
|
||||
logger.error("劫持文件配置配置下发失败",e);
|
||||
throw e;
|
||||
}
|
||||
}else if(cfg.getIsAudit()==3){
|
||||
List<ProxyFileHijackCfgAudit> list = new ArrayList<ProxyFileHijackCfgAudit>();
|
||||
ProxyFileHijackCfgAudit listConvert = convertCallBackProxyFileHijack(cfg);
|
||||
list.add(listConvert);
|
||||
//调用服务接口取消配置
|
||||
json=gsonToJson(list);
|
||||
logger.info("劫持文件配置配置参数:"+json);
|
||||
//调用服务接口取消配置
|
||||
try {
|
||||
/*ToMaatResult result = ConfigServiceUtil.put(json, 2);
|
||||
logger.info("劫持文件配置响应信息:"+result.getMsg());*/
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.info("劫持文件置配置失败");
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
public List<ProxyFileHijackCfg> findByList(String ids) {
|
||||
List<ProxyFileHijackCfg> list=proxyFileDao.findByList(ids);
|
||||
return list;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,156 @@
|
||||
package com.nis.web.service.configuration;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.callback.ProxyFileHijackCfg;
|
||||
import com.nis.domain.callback.ProxyFileHijackCfgAudit;
|
||||
import com.nis.domain.callback.ProxyFileInsertScriptCfg;
|
||||
import com.nis.domain.callback.ProxyFileInsertScriptCfgAudit;
|
||||
import com.nis.domain.maat.ToMaatResult;
|
||||
import com.nis.exceptions.MaatConvertException;
|
||||
import com.nis.util.ConfigServiceUtil;
|
||||
import com.nis.util.StringUtil;
|
||||
import com.nis.web.dao.configuration.ProxyFileInsertScriptDao;
|
||||
import com.nis.web.security.UserUtils;
|
||||
import com.nis.web.service.BaseService;
|
||||
|
||||
@Service
|
||||
public class ProxyFileInsertScriptService extends BaseService{
|
||||
|
||||
|
||||
@Autowired
|
||||
protected ProxyFileInsertScriptDao proxyFileDao;
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
* @param page
|
||||
* @param entity
|
||||
* @return
|
||||
*/
|
||||
public Page<ProxyFileInsertScriptCfg> findPage(Page page, ProxyFileInsertScriptCfg entity) {
|
||||
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
|
||||
entity.setPage(page);
|
||||
List<ProxyFileInsertScriptCfg> list = proxyFileDao.findPage(entity);
|
||||
page.setList(list);
|
||||
return page;
|
||||
}
|
||||
|
||||
public ProxyFileInsertScriptCfg getCfgById(Long cfgId) {
|
||||
return proxyFileDao.getCfgById(cfgId);
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void saveOrUpdate(ProxyFileInsertScriptCfg entity){
|
||||
Date createTime=new Date();
|
||||
setAreaEffectiveIds(entity);
|
||||
int isValid=0;
|
||||
if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) {
|
||||
isValid=1;
|
||||
}
|
||||
entity.setIsValid(0);
|
||||
entity.setIsAudit(0);
|
||||
//新增
|
||||
if(StringUtil.isEmpty(entity.getCfgId())){
|
||||
entity.initDefaultValue();
|
||||
entity.setCreatorId(UserUtils.getUser().getId());
|
||||
entity.setCreateTime(createTime);
|
||||
//调用服务接口获取compileId
|
||||
try {
|
||||
Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);//获取编译id
|
||||
entity.setCompileId(compileId);
|
||||
} catch (Exception e) {
|
||||
logger.info("获取编译ID出错");
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
|
||||
}
|
||||
proxyFileDao.insert(entity);
|
||||
//修改
|
||||
}else{
|
||||
Date editTime=new Date();
|
||||
entity.setEditorId(UserUtils.getUser().getId());
|
||||
entity.setEditTime(editTime);
|
||||
|
||||
proxyFileDao.update(entity);
|
||||
}
|
||||
if(isValid==1) {
|
||||
entity.setIsAudit(1);
|
||||
entity.setIsValid(1);
|
||||
audit( entity.getIsAudit(), isValid, entity.getFunctionId(), String.valueOf(entity.getCfgId()));
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void audit(Integer isAudit,Integer isValid,Integer functionId,String id){
|
||||
Date auditTime = new Date();
|
||||
ProxyFileInsertScriptCfg cfg=new ProxyFileInsertScriptCfg();
|
||||
cfg.setCfgId(Long.valueOf(id));
|
||||
cfg.setIsValid(isValid);
|
||||
cfg.setIsAudit(isAudit);
|
||||
cfg.setAuditorId(UserUtils.getUser().getId());
|
||||
cfg.setAuditTime(auditTime);
|
||||
proxyFileDao.update(cfg);
|
||||
cfg=proxyFileDao.getCfgById(cfg.getCfgId());
|
||||
String json="";
|
||||
if(cfg.getIsAudit()==1){
|
||||
List<ProxyFileInsertScriptCfgAudit> list = new ArrayList<ProxyFileInsertScriptCfgAudit>();
|
||||
ProxyFileInsertScriptCfgAudit listConvert=convertCallBackProxyFileInsertScript(cfg);
|
||||
list.add(listConvert);
|
||||
//调用服务接口下发配置数据
|
||||
json=gsonToJson(list);
|
||||
logger.info("注入脚本文件配置下发配置参数:"+json);
|
||||
//调用服务接口下发配置
|
||||
try {
|
||||
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
if(result!=null){
|
||||
logger.info("注入脚本文件配置下发响应信息:"+result.getMsg());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("注入脚本文件配置配置下发失败",e);
|
||||
throw e;
|
||||
}
|
||||
}else if(cfg.getIsAudit()==3){
|
||||
List<ProxyFileInsertScriptCfgAudit> list = new ArrayList<ProxyFileInsertScriptCfgAudit>();
|
||||
ProxyFileInsertScriptCfgAudit listConvert = convertCallBackProxyFileInsertScript(cfg);
|
||||
list.add(listConvert);
|
||||
//调用服务接口取消配置
|
||||
json=gsonToJson(list);
|
||||
logger.info("注入脚本文件配置配置参数:"+json);
|
||||
//调用服务接口取消配置
|
||||
try {
|
||||
ToMaatResult result = ConfigServiceUtil.put(json, 2);
|
||||
logger.info("注入脚本文件配置响应信息:"+result.getMsg());
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.info("注入脚本文件配置配置失败");
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<ProxyFileInsertScriptCfg> findByList(String ids) {
|
||||
List<ProxyFileInsertScriptCfg> list=proxyFileDao.findByList(ids);
|
||||
return list;
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
|
||||
ProxyFileInsertScriptCfg entity = new ProxyFileInsertScriptCfg();
|
||||
String[] idArray = ids.split(",");
|
||||
for(String id :idArray){
|
||||
entity.setCfgId(Long.parseLong(id));
|
||||
entity.setFunctionId(functionId);
|
||||
entity.setIsAudit(isAudit);
|
||||
entity.setIsValid(isValid);
|
||||
entity.setEditorId(UserUtils.getUser().getId());
|
||||
entity.setEditTime(new Date());
|
||||
proxyFileDao.update(entity);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,8 +12,10 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
import com.beust.jcommander.internal.Lists;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.callback.ProxyFileStrategyCfg;
|
||||
import com.nis.domain.callback.ProxyFileStrategyCfgAudit;
|
||||
import com.nis.domain.maat.ToMaatResult;
|
||||
import com.nis.util.ConfigServiceUtil;
|
||||
import com.nis.util.StringUtil;
|
||||
import com.nis.web.dao.configuration.ProxyFileStrategyDao;
|
||||
import com.nis.web.security.UserUtils;
|
||||
import com.nis.web.service.BaseService;
|
||||
@@ -49,7 +51,13 @@ public class ProxyFileStrategyService extends BaseService{
|
||||
public void saveOrUpdate(ProxyFileStrategyCfg entity){
|
||||
Date createTime=new Date();
|
||||
//设置区域运营商信息
|
||||
setAreaEffectiveIds(entity);
|
||||
setAreaEffectiveIds(entity);
|
||||
int isValid=0;
|
||||
if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) {
|
||||
isValid=1;
|
||||
}
|
||||
entity.setIsValid(0);
|
||||
entity.setIsAudit(0);
|
||||
//新增
|
||||
if(entity.getCfgId()==null){
|
||||
Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);//获取编译id
|
||||
@@ -67,6 +75,11 @@ public class ProxyFileStrategyService extends BaseService{
|
||||
entity.setEditTime(editTime);
|
||||
proxyFileDao.update(entity);//更新
|
||||
}
|
||||
if(isValid==1) {
|
||||
entity.setIsAudit(1);
|
||||
entity.setIsValid(1);
|
||||
audit( entity.getIsAudit(), isValid, entity.getFunctionId(), String.valueOf(entity.getCfgId()));
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
@@ -96,7 +109,9 @@ public class ProxyFileStrategyService extends BaseService{
|
||||
entity.setAuditTime(auditTime);
|
||||
proxyFileDao.update(entity);
|
||||
if(isAudit == 1) {//审核通过,下发配置回调配置信息
|
||||
Map<String,Object> params = Maps.newHashMap();
|
||||
List<ProxyFileStrategyCfgAudit> convertList = Lists.newArrayList();
|
||||
convertList.add(BaseService.convertCallBackProxyFileStrategy(entity));
|
||||
/*Map<String,Object> params = Maps.newHashMap();
|
||||
params.put("fileId", entity.getCompileId());//文件ID
|
||||
params.put("service", entity.getServiceId());//业务ID
|
||||
params.put("fileDesc", entity.getFileDesc());//文件描述
|
||||
@@ -106,20 +121,22 @@ public class ProxyFileStrategyService extends BaseService{
|
||||
params.put("isValid", 1);//有效标志,有效
|
||||
params.put("opTime", new Date());
|
||||
List list = Lists.newArrayList();
|
||||
list.add(params);
|
||||
String json = gsonToJson(list);
|
||||
list.add(params);*/
|
||||
String json = gsonToJson(convertList);
|
||||
logger.debug("params:" + json);
|
||||
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
logger.debug("响应:"+gsonToJson(result));
|
||||
}else if(isAudit == 3) {//取消审核通过,将回调配置信息置为无效
|
||||
Map<String,Object> params = Maps.newHashMap();
|
||||
List<ProxyFileStrategyCfgAudit> convertList = Lists.newArrayList();
|
||||
convertList.add(BaseService.convertCallBackProxyFileStrategy(entity));
|
||||
/*Map<String,Object> params = Maps.newHashMap();
|
||||
params.put("fileId", entity.getCompileId());//文件ID
|
||||
params.put("service", entity.getServiceId());//业务ID
|
||||
params.put("isValid", 0);//有效标志,无效
|
||||
params.put("opTime", new Date());
|
||||
List list = Lists.newArrayList();
|
||||
list.add(params);
|
||||
String json = gsonToJson(list);
|
||||
list.add(params);*/
|
||||
String json = gsonToJson(convertList);
|
||||
logger.debug("params:" + json);
|
||||
ToMaatResult result = ConfigServiceUtil.put(json,2);
|
||||
logger.debug("响应:"+gsonToJson(result));
|
||||
|
||||
@@ -0,0 +1,151 @@
|
||||
package com.nis.web.service.configuration;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.callback.ProxyFileTrafficMirrorCfg;
|
||||
import com.nis.domain.callback.ProxyFileTrafficMirrorCfgAudit;
|
||||
import com.nis.domain.maat.ToMaatResult;
|
||||
import com.nis.exceptions.MaatConvertException;
|
||||
import com.nis.util.ConfigServiceUtil;
|
||||
import com.nis.util.StringUtil;
|
||||
import com.nis.web.dao.configuration.ProxyFileTrafficMirrorDao;
|
||||
import com.nis.web.security.UserUtils;
|
||||
import com.nis.web.service.BaseService;
|
||||
|
||||
@Service
|
||||
public class ProxyFileTrafficMirrorService extends BaseService{
|
||||
@Autowired
|
||||
protected ProxyFileTrafficMirrorDao proxyFileDao;
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
* @param page
|
||||
* @param entity
|
||||
* @return
|
||||
*/
|
||||
public Page<ProxyFileTrafficMirrorCfg> findPage(Page page, ProxyFileTrafficMirrorCfg entity) {
|
||||
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
|
||||
entity.setPage(page);
|
||||
List<ProxyFileTrafficMirrorCfg> list = proxyFileDao.findPage(entity);
|
||||
page.setList(list);
|
||||
return page;
|
||||
}
|
||||
|
||||
public ProxyFileTrafficMirrorCfg getCfgById(Long cfgId) {
|
||||
return proxyFileDao.getCfgById(cfgId);
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void saveOrUpdate(ProxyFileTrafficMirrorCfg entity){
|
||||
Date createTime=new Date();
|
||||
setAreaEffectiveIds(entity);
|
||||
int isValid=0;
|
||||
if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) {
|
||||
isValid=1;
|
||||
}
|
||||
entity.setIsValid(0);
|
||||
entity.setIsAudit(0);
|
||||
//新增
|
||||
if(StringUtil.isEmpty(entity.getCfgId())){
|
||||
entity.initDefaultValue();
|
||||
entity.setCreatorId(UserUtils.getUser().getId());
|
||||
entity.setCreateTime(createTime);
|
||||
//调用服务接口获取compileId
|
||||
try {
|
||||
Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);//获取编译id
|
||||
entity.setCompileId(compileId);
|
||||
} catch (Exception e) {
|
||||
logger.info("获取编译ID出错");
|
||||
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
|
||||
}
|
||||
proxyFileDao.insert(entity);
|
||||
//修改
|
||||
}else{
|
||||
Date editTime=new Date();
|
||||
entity.setEditorId(UserUtils.getUser().getId());
|
||||
entity.setEditTime(editTime);
|
||||
|
||||
proxyFileDao.update(entity);
|
||||
}
|
||||
if(isValid==1) {
|
||||
entity.setIsAudit(1);
|
||||
entity.setIsValid(1);
|
||||
audit( entity.getIsAudit(), isValid, entity.getFunctionId(), String.valueOf(entity.getCfgId()));
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void audit(Integer isAudit,Integer isValid,Integer functionId,String id){
|
||||
Date auditTime = new Date();
|
||||
ProxyFileTrafficMirrorCfg cfg=new ProxyFileTrafficMirrorCfg();
|
||||
cfg.setCfgId(Long.valueOf(id));
|
||||
cfg.setIsValid(isValid);
|
||||
cfg.setIsAudit(isAudit);
|
||||
cfg.setAuditorId(UserUtils.getUser().getId());
|
||||
cfg.setAuditTime(auditTime);
|
||||
proxyFileDao.update(cfg);
|
||||
cfg=proxyFileDao.getCfgById(cfg.getCfgId());
|
||||
String json="";
|
||||
if(cfg.getIsAudit()==1){
|
||||
List<ProxyFileTrafficMirrorCfgAudit> list = new ArrayList<ProxyFileTrafficMirrorCfgAudit>();
|
||||
ProxyFileTrafficMirrorCfgAudit listConvert=convertCallBackProxyFileTrafficMirror(cfg);
|
||||
list.add(listConvert);
|
||||
//调用服务接口下发配置数据
|
||||
json=gsonToJson(list);
|
||||
logger.info("流量镜像文件配置下发配置参数:"+json);
|
||||
//调用服务接口下发配置
|
||||
try {
|
||||
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
|
||||
if(result!=null){
|
||||
logger.info("流量镜像文件配置下发响应信息:"+result.getMsg());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("流量镜像文件配置配置下发失败",e);
|
||||
throw e;
|
||||
}
|
||||
}else if(cfg.getIsAudit()==3){
|
||||
List<ProxyFileTrafficMirrorCfgAudit> list = new ArrayList<ProxyFileTrafficMirrorCfgAudit>();
|
||||
ProxyFileTrafficMirrorCfgAudit listConvert = convertCallBackProxyFileTrafficMirror(cfg);
|
||||
list.add(listConvert);
|
||||
//调用服务接口取消配置
|
||||
json=gsonToJson(list);
|
||||
logger.info("流量镜像文件配置配置参数:"+json);
|
||||
//调用服务接口取消配置
|
||||
try {
|
||||
ToMaatResult result = ConfigServiceUtil.put(json, 2);
|
||||
logger.info("流量镜像文件配置响应信息:"+result.getMsg());
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.info("流量镜像文件配置配置失败");
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public List<ProxyFileTrafficMirrorCfg> findByList(String ids) {
|
||||
List<ProxyFileTrafficMirrorCfg> list=proxyFileDao.findByList(ids);
|
||||
return list;
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){
|
||||
ProxyFileTrafficMirrorCfg entity = new ProxyFileTrafficMirrorCfg();
|
||||
String[] idArray = ids.split(",");
|
||||
for(String id :idArray){
|
||||
entity.setCfgId(Long.parseLong(id));
|
||||
entity.setFunctionId(functionId);
|
||||
entity.setIsAudit(isAudit);
|
||||
entity.setIsValid(isValid);
|
||||
entity.setEditorId(UserUtils.getUser().getId());
|
||||
entity.setEditTime(new Date());
|
||||
proxyFileDao.update(entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user