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

(1)getList方法改名，原先版本的是根据编译ID获取配置列表，这里改成两个方法，getListByCfgId和getListByCompileId

Browse Source 
(2)调整后台返回给界面的提示信息
(3)修复几处functionId没有传递的bug
(4)nis.properties调整url
(5)白名单的审核提交
(6)注释掉CrudService的sendTomaat的方法实现，在后续代码没有用到该方法时删除该方法
This commit is contained in:
wangxin
2018-05-24 19:33:59 +08:00
parent 45a860e779
commit 262087ecf0
16 changed files with 308 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/main/java/com/nis/web/service/configuration/StringCfgService.java
View File

@@ -1,18 +1,23 @@
package com.nis.web.service.configuration;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.web.dao.configuration.IpCfgDao;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.service.CrudService;
@@ -40,7 +45,26 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
if(areaIpCfgs!=null&&areaIpCfgs.size()>0){
this.saveIpBatch(areaIpCfgs);
}
return stringCfgDao.insert(baseStringCfg);
//调用服务接口获取compileId
Integer compileId = 0;
try {
List<Integer> compileIds = ConfigServiceUtil.getId(1,1);
if(!StringUtil.isEmpty(compileIds)){
compileId = compileIds.get(0);
}
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileId!=0){
baseStringCfg.setCompileId(compileId);
return stringCfgDao.insert(baseStringCfg);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
// baseStringCfg.setCompileId(0);
// return stringCfgDao.insert(baseStringCfg);
}
/**
*
@@ -65,6 +89,48 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
return stringCfgDao.update(baseStringCfg);
}
public void auditWhiteDomain(String ids,HttpUrlCfg cfg) throws Exception{
for(String id:ids.split(",")){
Long.parseLong(id);
}
List<BaseStringCfg> beans=stringCfgDao.getListByCfgId(HttpUrlCfg.getTablename(),ids);
Date date=new Date();
for(BaseStringCfg bean:beans){
bean.setTableName(IpPortCfg.getTablename());
bean.setAuditorId(bean.getCurrentUser().getId());
bean.setAuditTime(date);
bean.setIsAudit(cfg.getIsAudit());
bean.setIsValid(cfg.getIsValid());
}
this.auditBatch(beans, StringCfgDao.class);
if(cfg.getIsAudit()==1){
//调用服务接口下发配置数据
String json=gsonToJson(beans);
logger.info("文件样例下发配置参数："+json);
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
logger.info("IP白名单配置下发响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.info("IP白名单配置下发失败");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}else if(cfg.getIsAudit()==3){
//调用服务接口取消配置
String json=gsonToJson(beans);
logger.info("IP白名单配置参数："+json);
//调用服务接口取消配置
try {
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("IP白名单取消配置响应信息："+result.getMsg());
} catch (Exception e) {
e.printStackTrace();
logger.info("IP白名单取消配置失败");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
}
}
/**
*
* auditStringCfg(审核IP类配置)
@@ -77,16 +143,16 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void auditStringCfg(int isAduit,List<BaseStringCfg> auditCfg,List<BaseIpCfg> areaCfg,List<BaseStringCfg> sendCfg) throws Exception{
List<List<BaseCfg>> sendCfgs=new ArrayList<List<BaseCfg>>();
for(BaseStringCfg c:sendCfg){
List<BaseCfg> cArr=new ArrayList<>();
cArr.add(c);
sendCfgs.add(cArr);
public void auditStringCfg(int isAduit,List<BaseStringCfg> auditCfg,List<BaseStringCfg> sendCfg) throws Exception{
List<BaseIpCfg> areaCfg=new ArrayList<>();
for(BaseStringCfg c:auditCfg){
if(c.getAreaCfg()!=null){
areaCfg.addAll(c.getAreaCfg());
}
}
if(Constants.AUDIT_NOT_YES==isAduit||
Constants.AUDIT_YES==isAduit){//审核通过,取消审核通过需要发到maat
if(sendToMaatConvertorBatch(isAduit,sendCfgs)){
if(sendToMaatConvertorBatch(isAduit,sendCfg)){
if(areaCfg!=null&&areaCfg.size()>0){
this.auditIpBatch(areaCfg);
}
@@ -96,6 +162,25 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
this.auditBatch(auditCfg, StringCfgDao.class);
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void deleteWhiteDomain(String ids){
List<BaseStringCfg> cfgs=new ArrayList<BaseStringCfg>();
Date date =new Date();
if(StringUtils.isNotBlank(ids)){
for(String idStr:ids.split(",")){
if(StringUtils.isNotBlank(idStr)){
BaseStringCfg cfg=new BaseStringCfg();
cfg.setCfgId(Long.parseLong(idStr));
cfg.setTableName(HttpUrlCfg.getTablename());
cfg.setEditorId(cfg.getCurrentUser().getId());
cfg.setEditTime(date);
cfg.setIsValid(Constants.VALID_DEL);
cfgs.add(cfg);
}
}
}
this.deleteBatch(cfgs, StringCfgDao.class);
}
/**
*
* deleteStringCfg(删除IP类配置)
@@ -152,8 +237,8 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
public List<BaseStringCfg> getList(String tableName, String ids) {
public List<BaseStringCfg> getListByCompileId(String tableName, String ids) {
// TODO Auto-generated method stub
return stringCfgDao.getList(tableName,ids);
return stringCfgDao.getListByCompileId(tableName,ids);
}
}