新增劫持文件、注入脚本文件、流量转发目的地菜单,完善文件劫持菜单。
This commit is contained in:
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user