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

1、去掉文件策略 action

Browse Source 
2、调整service 接口
This commit is contained in:
fangshunjian
2018-08-23 10:03:25 +08:00
parent f2e72bef46
commit 76b9a732e0
10 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/com/nis/web/service/configuration/ProxyFileStrategyService.java
View File

@@ -1,32 +1,25 @@
package com.nis.web.service.configuration;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import com.beust.jcommander.internal.Lists;
import com.nis.domain.Page;
import com.nis.domain.SysUser;
import com.nis.domain.callback.ProxyFileStrategyCfg;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.HttpBodyCfg;
import com.nis.domain.maat.ToMaatResult;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.ProxyFileStrategyDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
import jersey.repackaged.com.google.common.collect.Maps;
@Service
public class ProxyFileStrategyService extends BaseService{
@@ -58,20 +51,20 @@ public class ProxyFileStrategyService extends BaseService{
setAreaEffectiveIds(entity);
//新增
if(entity.getCfgId()==null){
Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);//获取编译id
entity.setCompileId(compileId);
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
entity.setIsValid(0);
entity.setIsAudit(0);
//修改
proxyFileDao.insert(entity);
proxyFileDao.insert(entity);//新增
}else{
Date editTime=new Date();
entity.setIsValid(0);
entity.setIsAudit(0);
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
proxyFileDao.update(entity);
proxyFileDao.update(entity);//更新
}
}
@@ -99,6 +92,35 @@ public class ProxyFileStrategyService extends BaseService{
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(auditTime);
proxyFileDao.update(entity);
if(isAudit == 1) {//审核通过，下发配置回调配置信息
Map<String,Object> params = Maps.newHashMap();
params.put("fileId", entity.getCompileId());//文件ID
params.put("service", entity.getServiceId());//业务ID
params.put("fileDesc", entity.getFileDesc());//文件描述
params.put("contentType", entity.getContentType());//内容类型
params.put("contentLength", entity.getContentLength());//文件长度
params.put("filePath", entity.getUrl());//文件路径
params.put("isValid", 1);//有效标志，有效
params.put("opTime", new Date());
List list = Lists.newArrayList();
list.add(params);
String json = gsonToJson(list);
logger.debug("params:" + json);
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
logger.debug("响应："+gsonToJson(result));
}else if(isAudit == 3) {//取消审核通过，将回调配置信息置为无效
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);
logger.debug("params:" + json);
ToMaatResult result = ConfigServiceUtil.put(json,2);
logger.debug("响应："+gsonToJson(result));
}
}
/**