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

解决因DfIpPortLog类删除后产生的错误的代码

Browse Source
This commit is contained in:
zhangdongxu
2018-06-13 14:05:48 +08:00
parent bd9c248b3b
commit 5eb4756a7e
8 changed files with 1 additions and 2828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/domain/Page.java
View File

@@ -18,7 +18,6 @@ import org.apache.ibatis.mapping.ResultMapping;
import org.apache.ibatis.session.SqlSessionFactory;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.nis.domain.restful.DfIpPortLog;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.CookieUtil;
@@ -809,6 +808,6 @@ public class Page<T> {
// this.list = page.getContent();
//
public static void main(String[] args) {
Page page=new Page<DfIpPortLog>();
// Page page=new Page<DfIpPortLog>();
}
}

15
src/main/java/com/nis/web/controller/restful/ServiceController.java
View File

@@ -9,30 +9,15 @@
package com.nis.web.controller.restful;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.nis.domain.ControlLog;
import com.nis.domain.Page;
import com.nis.domain.restful.ConfigSource;
import com.nis.domain.restful.DfIpPortLog;
import com.nis.restful.RestBusinessCode;
import com.nis.restful.RestServiceException;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseRestController;
import com.nis.web.service.restful.ControlLogService;
import com.wordnik.swagger.annotations.ApiOperation;
/**
* @ClassName: ServiceController

1
src/main/java/com/nis/web/controller/restful/ServicesRequestLogController.java
View File

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.nis.domain.Page;
import com.nis.domain.ServicesRequestLog;
import com.nis.domain.restful.DfIpPortLog;
import com.nis.domain.restful.ServicesRequestLogBean;
import com.nis.restful.RestServiceException;
import com.nis.util.Constants;

58
src/main/java/com/nis/web/dao/DfLogSearchDao.java
View File

@@ -1,58 +0,0 @@
/**
* @Title: DfLogSearchDao.java
* @Package com.nis.web.dao
* @Description: TODO(用一句话描述该文件做什么)
* @author （ddm）
* @date 2016年9月5日 下午44:6:25
* @version V1.0
*/
package com.nis.web.dao;
import java.util.List;
import com.nis.domain.ControlLog;
import com.nis.domain.LogEntity;
import com.nis.domain.restful.DfDnsLog;
import com.nis.domain.restful.DfFtpLog;
import com.nis.domain.restful.DfIpsecLog;
import com.nis.domain.restful.DfL2tpLog;
import com.nis.domain.restful.DfMailLog;
import com.nis.domain.restful.DfOpenvpnLog;
import com.nis.domain.restful.DfPptpLog;
import com.nis.domain.restful.DfSshLog;
import com.nis.domain.restful.DfSslLog;
import com.nis.domain.restful.DfTunnelRandomLog;
/**
* @ClassName: DfLogSearchDao
* @Description: TODO(这里用一句话描述这个类的作用)
* @author (ddm)
* @date 2016年9月5日 下午2:6:25
* @version V1.0
*/
@MyBatisDao
public interface DfLogSearchDao extends CrudDao<LogEntity> {
List<DfMailLog> findMailLogs(DfMailLog log);
List<DfDnsLog> findDnsLogs(DfDnsLog log);
List<DfFtpLog> findFtpLogs(DfFtpLog log);
List<DfPptpLog> findPptpLogs(DfPptpLog log);
List<DfL2tpLog> findL2tpLogs(DfL2tpLog log);
List<DfIpsecLog> findIpsecLogs(DfIpsecLog log);
List<DfOpenvpnLog> findOpenvpnLogs(DfOpenvpnLog log);
List<DfSshLog> findSshLogs(DfSshLog log);
List<DfSslLog> findSslLogs(DfSslLog log);
List<DfTunnelRandomLog> findTunnelRandomLogs(DfTunnelRandomLog log);
List<DfMailLog> findMailLogsCluster(DfMailLog log);
List<DfDnsLog> findDnsLogsCluster(DfDnsLog log);
List<DfFtpLog> findFtpLogsCluster(DfFtpLog log);
List<DfPptpLog> findPptpLogsCluster(DfPptpLog log);
List<DfL2tpLog> findL2tpLogsCluster(DfL2tpLog log);
List<DfIpsecLog> findIpsecLogsCluster(DfIpsecLog log);
List<DfOpenvpnLog> findOpenvpnLogsCluster(DfOpenvpnLog log);
List<DfSshLog> findSshLogsCluster(DfSshLog log);
List<DfSslLog> findSslLogsCluster(DfSslLog log);
List<DfTunnelRandomLog> findTunnelRandomLogsCluster(DfTunnelRandomLog log);
}

1190
src/main/java/com/nis/web/dao/DfLogSearchDao.xml
View File

File diff suppressed because it is too large Load Diff

48
src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.java
View File

@@ -1,48 +0,0 @@
/**
* @Title: DfLogSearchDao.java
* @Package com.nis.web.dao
* @Description: TODO(用一句话描述该文件做什么)
* @author （ddm）
* @date 2016年9月5日 下午44:6:25
* @version V1.0
*/
package com.nis.web.dao;
import java.util.List;
import com.nis.domain.ControlLog;
import com.nis.domain.LogEntity;
import com.nis.domain.restful.DfDnsLog;
import com.nis.domain.restful.DfFtpLog;
import com.nis.domain.restful.DfIpsecLog;
import com.nis.domain.restful.DfL2tpLog;
import com.nis.domain.restful.DfMailLog;
import com.nis.domain.restful.DfOpenvpnLog;
import com.nis.domain.restful.DfPptpLog;
import com.nis.domain.restful.DfSshLog;
import com.nis.domain.restful.DfSslLog;
import com.nis.domain.restful.DfTunnelRandomLog;
/**
* @ClassName: DfLogSearchDao
* @Description: TODO(这里用一句话描述这个类的作用)
* @author (ddm)
* @date 2016年9月5日 下午2:6:25
* @version V1.0
*/
@MyBatisDao
public interface DfLogSearchDaoCluster extends CrudDao<LogEntity> {
List<DfMailLog> findMailLogsCluster(DfMailLog log);
List<DfDnsLog> findDnsLogsCluster(DfDnsLog log);
List<DfFtpLog> findFtpLogsCluster(DfFtpLog log);
List<DfPptpLog> findPptpLogsCluster(DfPptpLog log);
List<DfL2tpLog> findL2tpLogsCluster(DfL2tpLog log);
List<DfIpsecLog> findIpsecLogsCluster(DfIpsecLog log);
List<DfOpenvpnLog> findOpenvpnLogsCluster(DfOpenvpnLog log);
List<DfSshLog> findSshLogsCluster(DfSshLog log);
List<DfSslLog> findSslLogsCluster(DfSslLog log);
List<DfTunnelRandomLog> findTunnelRandomLogsCluster(DfTunnelRandomLog log);
}

1120
src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.xml
View File

File diff suppressed because it is too large Load Diff

394
src/main/java/com/nis/web/service/restful/DfLogSearchService.java
View File

@@ -1,394 +0,0 @@
/**
* @Title: DfLogSearchService.java
* @Package com.nis.web.service.restful
* @Description: TODO(用一句话描述该文件做什么)
* @author （ddm）
* @date 2016年9月15日 下午2:08:12
* @version V1.0
*/
package com.nis.web.service.restful;
import java.io.IOException;
import java.sql.SQLException;
import java.util.ArrayList;
import java.text.ParseException;
import java.util.List;
import org.apache.log4j.Logger;
import org.apache.http.client.ClientProtocolException;
import org.json.JSONException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.LogEntity;
import com.nis.domain.Page;
import com.nis.domain.restful.DfDnsLog;
import com.nis.domain.restful.DfFtpLog;
import com.nis.domain.restful.DfIpsecLog;
import com.nis.domain.restful.DfL2tpLog;
import com.nis.domain.restful.DfMailLog;
import com.nis.domain.restful.DfOpenvpnLog;
import com.nis.domain.restful.DfPptpLog;
import com.nis.domain.restful.DfSshLog;
import com.nis.domain.restful.DfSslLog;
import com.nis.domain.restful.DfTunnelRandomLog;
//import com.nis.util.MysqlJDBC;
import com.nis.util.Constants;
import com.nis.web.dao.DfLogSearchDao;
import com.nis.web.dao.DfLogSearchDaoCluster;
import com.nis.web.service.BaseLogService;
/**
* @ClassName: DfLogSearchService
* @Description: TODO(这里用一句话描述这个类的作用)
* @author (ddm)
* @date 2016年9月5日 下午2:08:12
* @version V1.0
*/
@Service
public class DfLogSearchService extends BaseLogService{
protected final Logger logger = Logger.getLogger(this.getClass());
/**
* 持久层对象
*/
@Autowired
protected DfLogSearchDao dao;
@Autowired
protected DfLogSearchDaoCluster daoCluster;
/**
* 获取单条数据
* @param id
* @return
*/
public LogEntity get(Long id) {
return dao.get(id);
}
/**
* 获取单条数据
* @param entity
* @return
*/
public LogEntity get(LogEntity entity) {
return dao.get(entity);
}
/**
* 查询列表数据
* @param entity
* @return
*/
public List<LogEntity> findList(LogEntity entity) {
return dao.findList(entity);
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfMailLog> findMailPage(Page<DfMailLog> page, DfMailLog entity,String activeSys) throws Exception{
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfMailLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findMailLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfDnsLog> findDnsPage(Page<DfDnsLog> page, DfDnsLog entity,String activeSys) throws Exception{
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfDnsLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findDnsLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfFtpLog> findFtpPage(Page<DfFtpLog> page, DfFtpLog entity,String activeSys) throws SQLException, IllegalArgumentException, IllegalAccessException, ClientProtocolException, ParseException, JSONException, IOException {
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfFtpLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findFtpLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfPptpLog> findPptpPage(Page<DfPptpLog> page, DfPptpLog entity,String activeSys) throws Exception {
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfPptpLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findPptpLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfL2tpLog> findL2tpPage(Page<DfL2tpLog> page, DfL2tpLog entity,String activeSys) throws Exception{
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfL2tpLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findL2tpLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfIpsecLog> findIpsecPage(Page<DfIpsecLog> page, DfIpsecLog entity,String activeSys) throws Exception{
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfIpsecLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findIpsecLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfOpenvpnLog> findOpenvpnPage(Page<DfOpenvpnLog> page, DfOpenvpnLog entity,String activeSys) throws Exception {
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfOpenvpnLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findOpenvpnLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfSshLog> findSshPage(Page<DfSshLog> page, DfSshLog entity,String activeSys) throws Exception {
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfSshLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findSshLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfSslLog> findSslPage(Page<DfSslLog> page, DfSslLog entity,String activeSys) throws Exception{
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfSslLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findSslLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfTunnelRandomLog> findTunnelRandomPage(Page<DfTunnelRandomLog> page, DfTunnelRandomLog entity,String activeSys) throws Exception{
entity.setPage(page);
if(Constants.IS_USE_ES){
List<DfTunnelRandomLog> resultList=new ArrayList<>();
elasticsearchSqlDao.findLogs(resultList, entity,activeSys);
page.setList(resultList);
}else{
page.setList(dao.findTunnelRandomLogs(entity));
}
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfMailLog> findMailPageCluster(Page<DfMailLog> page, DfMailLog entity,String activeSys) throws Exception{
entity.setPage(page);
page.setList(daoCluster.findMailLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfDnsLog> findDnsPageCluster(Page<DfDnsLog> page, DfDnsLog entity,String activeSys) throws Exception{
entity.setPage(page);
page.setList(daoCluster.findDnsLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfFtpLog> findFtpPageCluster(Page<DfFtpLog> page, DfFtpLog entity,String activeSys) throws SQLException, IllegalArgumentException, IllegalAccessException, ClientProtocolException, ParseException, JSONException, IOException {
entity.setPage(page);
page.setList(daoCluster.findFtpLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfPptpLog> findPptpPageCluster(Page<DfPptpLog> page, DfPptpLog entity,String activeSys) throws Exception {
entity.setPage(page);
page.setList(daoCluster.findPptpLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfL2tpLog> findL2tpPageCluster(Page<DfL2tpLog> page, DfL2tpLog entity,String activeSys) throws Exception{
entity.setPage(page);
page.setList(daoCluster.findL2tpLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfIpsecLog> findIpsecPageCluster(Page<DfIpsecLog> page, DfIpsecLog entity,String activeSys) throws Exception{
entity.setPage(page);
page.setList(daoCluster.findIpsecLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfOpenvpnLog> findOpenvpnPageCluster(Page<DfOpenvpnLog> page, DfOpenvpnLog entity,String activeSys) throws Exception {
entity.setPage(page);
page.setList(daoCluster.findOpenvpnLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfSshLog> findSshPageCluster(Page<DfSshLog> page, DfSshLog entity,String activeSys) throws Exception {
entity.setPage(page);
page.setList(daoCluster.findSshLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfSslLog> findSslPageCluster(Page<DfSslLog> page, DfSslLog entity,String activeSys) throws Exception{
entity.setPage(page);
page.setList(daoCluster.findSslLogsCluster(entity));
return page;
}
/**
* 查询分页数据
* @param page 分页对象
* @param entity
* @return
* @throws Exception
*/
public Page<DfTunnelRandomLog> findTunnelRandomPageCluster(Page<DfTunnelRandomLog> page, DfTunnelRandomLog entity,String activeSys) throws Exception{
entity.setPage(page);
page.setList(daoCluster.findTunnelRandomLogsCluster(entity));
return page;
}
}