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

fix(all):细节和语义修正

Browse Source
This commit is contained in:
doufenghu
2018-07-19 10:19:57 +08:00
parent b55bad8343
commit 6ee382738a
33 changed files with 665 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

868
src/main/java/com/nis/web/service/SaveRequestLogThread.java → src/main/java/com/nis/web/service/AuditLogThread.java
View File

@@ -1,435 +1,433 @@
/**
*@Title: SaveLogThread.java
*@Package com.nis.web.service.logthread
*@Description TODO
*@author dell
*@date 2016年10月14日 下午6:26:41
*@version 版本号
*/
package com.nis.web.service;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.util.Date;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
import com.nis.datasource.CustomerContextHolder;
/**
* 审计日志工作线程
* @ClassName: SaveLogThread.java
* @Description: 用于记录业务操作日志，后期用于审计及相关联调验证工作
* @author (dell)
* @date 2016年10月14日 下午6:26:41
* @version V1.0
*/
public class SaveRequestLogThread implements Runnable {
private Logger logger = Logger.getLogger(SaveRequestLogThread.class);
private ServicesRequestLogService service;
private String remoteAddr;
private String requestURI;
private String queryString;
private String contextPath;
private String operator;
private String version;
private int opAction;
private Date opTime;
private Object content;
private Date requestTime;
private long consumerTime;
private int businessCode;
private String exceptionInfo;
private String traceCode;
/*
* (non-Javadoc)
*
* @see java.lang.Runnable#run()
*/
@Override
public void run() {
logger.info("线程开始执行！");
// 新开线程切换数据源，不影响action中的数据源
CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_B);// 开启数据源B
// TODO Auto-generated method stub
if (service != null) {
service.saveRequestLog(remoteAddr, requestURI, queryString, contextPath, operator, version, opAction,
opTime, content, requestTime, consumerTime, businessCode, exceptionInfo, traceCode);
} else {
logger.error("service 为空！");
}
CustomerContextHolder.clearCustomerType();
}
public SaveRequestLogThread() {
super();
}
/**
* 创建一个新的实例 SaveRequestLogThread.
*
* @param service
* @param requestURI
* @param queryString
* @param contextPath
* @param operator
* @param version
* @param opAction
* @param opTime
* @param content
* @param requestTime
* @param consumerTime
*/
public SaveRequestLogThread(ServicesRequestLogService service, String remoteAddr, String requestURI,
String queryString, String contextPath, String operator, String version, int opAction, Date opTime,
Object content, Date requestTime, long consumerTime, String exceptionInfo) {
super();
this.service = service;
this.remoteAddr = remoteAddr;
this.requestURI = requestURI;
this.queryString = queryString;
this.contextPath = contextPath;
this.operator = operator;
this.version = version;
this.opAction = opAction;
this.opTime = opTime;
this.content = content;
this.requestTime = requestTime;
this.consumerTime = consumerTime;
this.exceptionInfo = exceptionInfo;
}
public SaveRequestLogThread(ServicesRequestLogService service, String operator, String version, int opAction,
Date opTime, Object content, Date requestTime, long consumerTime, String exceptionInfo) {
super();
this.service = service;
this.operator = operator;
this.version = version;
this.opAction = opAction;
this.opTime = opTime;
this.content = content;
this.requestTime = requestTime;
this.consumerTime = consumerTime;
this.exceptionInfo = exceptionInfo;
}
public static InputStream cloneInputStream(ServletInputStream inputStream) {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
int len;
try {
while ((len = inputStream.read(buffer)) > -1) {
byteArrayOutputStream.write(buffer, 0, len);
}
byteArrayOutputStream.flush();
} catch (IOException e) {
e.printStackTrace();
}
InputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
return byteArrayInputStream;
}
/**
* 获取非get请求的参数
* @param request
* @return
*/
private static String getBodyString(ServletRequest request) {
StringBuilder sb = new StringBuilder();
InputStream inputStream = null;
BufferedReader reader = null;
try {
inputStream = cloneInputStream(request.getInputStream());
reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
String line = "";
while ((line = reader.readLine()) != null) {
sb.append(line);
}
} catch (IOException e) {
e.printStackTrace();
} finally {
if (inputStream != null) {
try {
inputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return sb.toString();
}
public static SaveRequestLogThread getNewSaveRequestLogThread(HttpServletRequest request) {
SaveRequestLogThread thread = new SaveRequestLogThread();
thread.setRemoteAddr(request.getRemoteAddr());
thread.setRequestURI(request.getRequestURI());
if (request.getMethod().toLowerCase().equals("get")) {
thread.setQueryString(request.getQueryString());
thread.setContent(request.getQueryString());
} else {
String contentType = request.getContentType();
if(!contentType.contains("multipart/form-data")) {
String bodyString = getBodyString(request);
thread.setQueryString(bodyString);
thread.setContent(bodyString);
}else {
//String bodyString = getBodyString(request);
thread.setQueryString("contentTyp="+contentType+",一般是上传文件,此种请求不记录请求内容");
thread.setContent("contentTyp="+contentType+",一般是上传文件,此种请求不记录请求内容");
}
}
thread.setContextPath(request.getContextPath());
thread.setRequestTime(new Date());
return thread;
}
/**
* service
* @return service
*/
public ServicesRequestLogService getService() {
return service;
}
/**
* @param service the service to set
*/
public void setService(ServicesRequestLogService service) {
this.service = service;
}
/**
* remoteAddr
* @return remoteAddr
*/
public String getRemoteAddr() {
return remoteAddr;
}
/**
* @param remoteAddr the remoteAddr to set
*/
public void setRemoteAddr(String remoteAddr) {
this.remoteAddr = remoteAddr;
}
/**
* requestURI
* @return requestURI
*/
public String getRequestURI() {
return requestURI;
}
/**
* @param requestURI the requestURI to set
*/
public void setRequestURI(String requestURI) {
this.requestURI = requestURI;
}
/**
* queryString
* @return queryString
*/
public String getQueryString() {
return queryString;
}
/**
* @param queryString the queryString to set
*/
public void setQueryString(String queryString) {
this.queryString = queryString;
}
/**
* contextPath
* @return contextPath
*/
public String getContextPath() {
return contextPath;
}
/**
* @param contextPath the contextPath to set
*/
public void setContextPath(String contextPath) {
this.contextPath = contextPath;
}
/**
* operator
* @return operator
*/
public String getOperator() {
return operator;
}
/**
* @param operator the operator to set
*/
public void setOperator(String operator) {
this.operator = operator;
}
/**
* version
* @return version
*/
public String getVersion() {
return version;
}
/**
* @param version the version to set
*/
public void setVersion(String version) {
this.version = version;
}
/**
* opAction
* @return opAction
*/
public int getOpAction() {
return opAction;
}
/**
* @param opAction the opAction to set
*/
public void setOpAction(int opAction) {
this.opAction = opAction;
}
/**
* opTime
* @return opTime
*/
public Date getOpTime() {
return opTime;
}
/**
* @param opTime the opTime to set
*/
public void setOpTime(Date opTime) {
this.opTime = opTime;
}
/**
* content
* @return content
*/
public Object getContent() {
return content;
}
/**
* @param content the content to set
*/
public void setContent(Object content) {
this.content = content;
}
/**
* requestTime
* @return requestTime
*/
public Date getRequestTime() {
return requestTime;
}
/**
* @param requestTime the requestTime to set
*/
public void setRequestTime(Date requestTime) {
this.requestTime = requestTime;
}
/**
* consumerTime
* @return consumerTime
*/
public long getConsumerTime() {
return consumerTime;
}
/**
* @param consumerTime the consumerTime to set
*/
public void setConsumerTime(long consumerTime) {
this.consumerTime = consumerTime;
}
/**
* businessCode
* @return businessCode
*/
public int getBusinessCode() {
return businessCode;
}
/**
* @param businessCode the businessCode to set
*/
public void setBusinessCode(int businessCode) {
this.businessCode = businessCode;
}
/**
* exceptionInfo
* @return exceptionInfo
*/
public String getExceptionInfo() {
return exceptionInfo;
}
/**
* @param exceptionInfo the exceptionInfo to set
*/
public void setExceptionInfo(String exceptionInfo) {
this.exceptionInfo = exceptionInfo;
}
public String getTraceCode() {
return traceCode;
}
public void setTraceCode(String traceCode) {
this.traceCode = traceCode;
}
}
/**
*@Title: SaveLogThread.java
*@Package com.nis.web.service.logthread
*@Description TODO
*@author dell
*@date 2016年10月14日 下午6:26:41
*@version 版本号
*/
package com.nis.web.service;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.util.Date;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
import com.nis.datasource.CustomerContextHolder;
/**
* 审计日志工作线程
* @ClassName: SaveLogThread.java
* @Description: 用于记录业务操作日志，后期用于审计及相关联调验证工作
* @author (dell)
* @date 2016年10月14日 下午6:26:41
* @version V1.0
*/
public class AuditLogThread implements Runnable {
private Logger logger = Logger.getLogger(AuditLogThread.class);
private ServicesRequestLogService service;
private String remoteAddr;
private String requestURI;
private String queryString;
private String contextPath;
private String operator;
private String version;
private int opAction;
private Date opTime;
private Object content;
private Date requestTime;
private long consumerTime;
private int businessCode;
private String exceptionInfo;
private String traceCode;
/*
* (non-Javadoc)
*
* @see java.lang.Runnable#run()
*/
@Override
public void run() {
// 新开线程切换数据源，不影响action中的数据源
CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_A);// 开启数据源B
if (service != null) {
service.saveRequestLog(remoteAddr, requestURI, queryString, contextPath, operator, version, opAction,
opTime, content, requestTime, consumerTime, businessCode, exceptionInfo, traceCode);
} else {
logger.error("service 为空！");
}
CustomerContextHolder.clearCustomerType();
}
public AuditLogThread() {
super();
}
/**
* 创建一个新的实例 AuditLogThread.
*
* @param service
* @param requestURI
* @param queryString
* @param contextPath
* @param operator
* @param version
* @param opAction
* @param opTime
* @param content
* @param requestTime
* @param consumerTime
*/
public AuditLogThread(ServicesRequestLogService service, String remoteAddr, String requestURI,
String queryString, String contextPath, String operator, String version, int opAction, Date opTime,
Object content, Date requestTime, long consumerTime, String exceptionInfo) {
super();
this.service = service;
this.remoteAddr = remoteAddr;
this.requestURI = requestURI;
this.queryString = queryString;
this.contextPath = contextPath;
this.operator = operator;
this.version = version;
this.opAction = opAction;
this.opTime = opTime;
this.content = content;
this.requestTime = requestTime;
this.consumerTime = consumerTime;
this.exceptionInfo = exceptionInfo;
}
public AuditLogThread(ServicesRequestLogService service, String operator, String version, int opAction,
Date opTime, Object content, Date requestTime, long consumerTime, String exceptionInfo) {
super();
this.service = service;
this.operator = operator;
this.version = version;
this.opAction = opAction;
this.opTime = opTime;
this.content = content;
this.requestTime = requestTime;
this.consumerTime = consumerTime;
this.exceptionInfo = exceptionInfo;
}
public static InputStream cloneInputStream(ServletInputStream inputStream) {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
byte[] buffer = new byte[1024];
int len;
try {
while ((len = inputStream.read(buffer)) > -1) {
byteArrayOutputStream.write(buffer, 0, len);
}
byteArrayOutputStream.flush();
} catch (IOException e) {
e.printStackTrace();
}
InputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
return byteArrayInputStream;
}
/**
* 获取非get请求的参数
* @param request
* @return
*/
private static String getBodyString(ServletRequest request) {
StringBuilder sb = new StringBuilder();
InputStream inputStream = null;
BufferedReader reader = null;
try {
inputStream = cloneInputStream(request.getInputStream());
reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
String line = "";
while ((line = reader.readLine()) != null) {
sb.append(line);
}
} catch (IOException e) {
e.printStackTrace();
} finally {
if (inputStream != null) {
try {
inputStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return sb.toString();
}
public static AuditLogThread getNewSaveRequestLogThread(HttpServletRequest request) {
AuditLogThread thread = new AuditLogThread();
thread.setRemoteAddr(request.getRemoteAddr());
thread.setRequestURI(request.getRequestURI());
if (request.getMethod().toLowerCase().equals("get")) {
thread.setQueryString(request.getQueryString());
thread.setContent(request.getQueryString());
} else {
String contentType = request.getContentType();
if(!contentType.contains("multipart/form-data")) {
String bodyString = getBodyString(request);
thread.setQueryString(bodyString);
thread.setContent(bodyString);
}else {
//String bodyString = getBodyString(request);
thread.setQueryString("contentTyp="+contentType+",一般是上传文件,此种请求不记录请求内容");
thread.setContent("contentTyp="+contentType+",一般是上传文件,此种请求不记录请求内容");
}
}
thread.setContextPath(request.getContextPath());
thread.setRequestTime(new Date());
return thread;
}
/**
* service
* @return service
*/
public ServicesRequestLogService getService() {
return service;
}
/**
* @param service the service to set
*/
public void setService(ServicesRequestLogService service) {
this.service = service;
}
/**
* remoteAddr
* @return remoteAddr
*/
public String getRemoteAddr() {
return remoteAddr;
}
/**
* @param remoteAddr the remoteAddr to set
*/
public void setRemoteAddr(String remoteAddr) {
this.remoteAddr = remoteAddr;
}
/**
* requestURI
* @return requestURI
*/
public String getRequestURI() {
return requestURI;
}
/**
* @param requestURI the requestURI to set
*/
public void setRequestURI(String requestURI) {
this.requestURI = requestURI;
}
/**
* queryString
* @return queryString
*/
public String getQueryString() {
return queryString;
}
/**
* @param queryString the queryString to set
*/
public void setQueryString(String queryString) {
this.queryString = queryString;
}
/**
* contextPath
* @return contextPath
*/
public String getContextPath() {
return contextPath;
}
/**
* @param contextPath the contextPath to set
*/
public void setContextPath(String contextPath) {
this.contextPath = contextPath;
}
/**
* operator
* @return operator
*/
public String getOperator() {
return operator;
}
/**
* @param operator the operator to set
*/
public void setOperator(String operator) {
this.operator = operator;
}
/**
* version
* @return version
*/
public String getVersion() {
return version;
}
/**
* @param version the version to set
*/
public void setVersion(String version) {
this.version = version;
}
/**
* opAction
* @return opAction
*/
public int getOpAction() {
return opAction;
}
/**
* @param opAction the opAction to set
*/
public void setOpAction(int opAction) {
this.opAction = opAction;
}
/**
* opTime
* @return opTime
*/
public Date getOpTime() {
return opTime;
}
/**
* @param opTime the opTime to set
*/
public void setOpTime(Date opTime) {
this.opTime = opTime;
}
/**
* content
* @return content
*/
public Object getContent() {
return content;
}
/**
* @param content the content to set
*/
public void setContent(Object content) {
this.content = content;
}
/**
* requestTime
* @return requestTime
*/
public Date getRequestTime() {
return requestTime;
}
/**
* @param requestTime the requestTime to set
*/
public void setRequestTime(Date requestTime) {
this.requestTime = requestTime;
}
/**
* consumerTime
* @return consumerTime
*/
public long getConsumerTime() {
return consumerTime;
}
/**
* @param consumerTime the consumerTime to set
*/
public void setConsumerTime(long consumerTime) {
this.consumerTime = consumerTime;
}
/**
* businessCode
* @return businessCode
*/
public int getBusinessCode() {
return businessCode;
}
/**
* @param businessCode the businessCode to set
*/
public void setBusinessCode(int businessCode) {
this.businessCode = businessCode;
}
/**
* exceptionInfo
* @return exceptionInfo
*/
public String getExceptionInfo() {
return exceptionInfo;
}
/**
* @param exceptionInfo the exceptionInfo to set
*/
public void setExceptionInfo(String exceptionInfo) {
this.exceptionInfo = exceptionInfo;
}
public String getTraceCode() {
return traceCode;
}
public void setTraceCode(String traceCode) {
this.traceCode = traceCode;
}
}

24
src/main/java/com/nis/web/service/BaseLogService.java
View File

@@ -52,7 +52,7 @@ public abstract class BaseLogService {
* @exception @since
* 1.0.0
*/
public void checkCloumnIsExist(SaveRequestLogThread thread, long start, Class clazz, Page page) throws Exception {
public void checkCloumnIsExist(AuditLogThread thread, long start, Class clazz, Page page) throws Exception {
String[] fieldsColoumn = null;
String[] orderByColoumn = null;
String notExistColumn = "";
@@ -136,8 +136,8 @@ public abstract class BaseLogService {
* @param clazz
* @param page
*/
public void queryConditionCheck(SaveRequestLogThread thread, long start, LogEntity<?> entity, Class clazz,
Page page) {
public void queryConditionCheck(AuditLogThread thread, long start, LogEntity<?> entity, Class clazz,
Page page) {
logger.info("请求参数校验开始----" + System.currentTimeMillis());
try {
if (!StringUtil.isBlank(entity.getSearchCfgId())) {
@@ -252,8 +252,8 @@ public abstract class BaseLogService {
* @param clazz
* @param page
*/
public void queryReportConditionCheck(SaveRequestLogThread thread, long start, NtcReportEntity<?> entity, Class clazz,
Page page) {
public void queryReportConditionCheck(AuditLogThread thread, long start, NtcReportEntity<?> entity, Class clazz,
Page page) {
logger.info("实时报表统计查询参数校验开始----" + System.currentTimeMillis());
if (!StringUtil.isBlank(entity.getSearchBusinessType())&&!StringUtil.isNumeric(entity.getSearchBusinessType())) {
logger.error(RestBusinessCode.param_formate_error.getErrorReason()+",searchBusinessType参数格式错误");
@@ -316,7 +316,7 @@ public abstract class BaseLogService {
* @param condition
* @param condName
*/
public void checkNumericCondition(SaveRequestLogThread thread, long start,String condition,String condName) {
public void checkNumericCondition(AuditLogThread thread, long start, String condition, String condName) {
if (!StringUtil.isEmpty(condition)){
Boolean flag = false;
if (condition.contains(",")) {
@@ -348,8 +348,8 @@ public abstract class BaseLogService {
* @param page
* 需要校验的page对象
*/
public void queryConditionCheck(SaveRequestLogThread thread, long start, StatLogEntity entity, Class clazz,
Page page) {
public void queryConditionCheck(AuditLogThread thread, long start, StatLogEntity entity, Class clazz,
Page page) {
try {
if (!StringUtil.isBlank(entity.getSearchStatStartTime())) {
@@ -413,8 +413,8 @@ public abstract class BaseLogService {
*
* @param entity
*/
public void queryConditionCheck(SaveRequestLogThread thread, long start, DfJitLogEntity<?> entity, Class clazz,
Page page) {
public void queryConditionCheck(AuditLogThread thread, long start, DfJitLogEntity<?> entity, Class clazz,
Page page) {
try {
if (!StringUtil.isBlank(entity.getSearchReportEndTime())) {
sdf.parse(entity.getSearchReportEndTime());
@@ -498,8 +498,8 @@ public abstract class BaseLogService {
*
* @param entity
*/
public void queryConditionCheck(SaveRequestLogThread thread, long start, DfReportEntity entity, Class clazz,
Page page) {
public void queryConditionCheck(AuditLogThread thread, long start, DfReportEntity entity, Class clazz,
Page page) {
try {
if (!StringUtil.isBlank(entity.getSearchReportEndTime())) {
sdf.parse(entity.getSearchReportEndTime());

62
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -19,12 +19,12 @@ import java.util.concurrent.CountDownLatch;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.nis.web.service.AuditLogThread;
import net.sf.json.JSONObject;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,7 +60,6 @@ import com.nis.web.dao.IpRegionDao;
import com.nis.web.dao.NumRegionDao;
import com.nis.web.dao.StrRegionDao;
import com.nis.web.service.BaseService;
import com.nis.web.service.SaveRequestLogThread;
import com.nis.web.service.SpringContextHolder;
/**
@@ -118,8 +117,8 @@ public class ConfigSourcesService extends BaseService {
* @return
* @throws Exception
*/
public void updateConfigSource(SaveRequestLogThread thread, long start,
List<ConfigCompile> configSource, Date opTime, StringBuffer sb) {
public void updateConfigSource(AuditLogThread thread, long start,
List<ConfigCompile> configSource, Date opTime, StringBuffer sb) {
SqlSessionFactory sqlSessionFactory = SpringContextHolder
.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
@@ -202,9 +201,9 @@ public class ConfigSourcesService extends BaseService {
* @throws Exception
*/
public void updateConfigCompile(SaveRequestLogThread thread, long start,
ConfigCompile config, SqlSession batchSqlSession, Date opTime,
StringBuffer sb) throws Exception {
public void updateConfigCompile(AuditLogThread thread, long start,
ConfigCompile config, SqlSession batchSqlSession, Date opTime,
StringBuffer sb) throws Exception {
List<IpRegion> ipRegionList = config.getIpRegionList();
List<StrRegion> strRegionList = config.getStrRegionList();
List<NumRegion> numRegionList = config.getNumRegionList();
@@ -295,10 +294,10 @@ public class ConfigSourcesService extends BaseService {
* 当前编译下所有的配置分组关系
* @return
*/
public void regionUpdate(SaveRequestLogThread thread, long start,
ConfigCompile config,
List<ConfigGroupRelation> queryCompileGroupByPID,
SqlSession batchSqlSession, Date opTime, StringBuffer sb)
public void regionUpdate(AuditLogThread thread, long start,
ConfigCompile config,
List<ConfigGroupRelation> queryCompileGroupByPID,
SqlSession batchSqlSession, Date opTime, StringBuffer sb)
throws Exception {
Map<String, Map<Long, List<Long>>> regionMap = getRegionList(thread,
System.currentTimeMillis() - start, config,
@@ -478,7 +477,7 @@ public class ConfigSourcesService extends BaseService {
}
public Map<String, Map<Long, List<Long>>> getRegionList(
SaveRequestLogThread thread, long start, ConfigCompile config,
AuditLogThread thread, long start, ConfigCompile config,
List<ConfigGroupRelation> queryCompileGroupByPID,
SqlSession batchSqlSession, StringBuffer sb) {
Map<String, Map<Long, List<Long>>> map = new HashMap<String, Map<Long, List<Long>>>();
@@ -651,7 +650,7 @@ public class ConfigSourcesService extends BaseService {
* @param configSource
* @throws Exception
*/
public void insertConfigSourceData(SaveRequestLogThread thread,
public void insertConfigSourceData(AuditLogThread thread,
long _start, List<ConfigCompile> configSource, StringBuffer sb) {
SqlSessionFactory sqlSessionFactory = SpringContextHolder
.getBean(SqlSessionFactory.class);
@@ -717,7 +716,7 @@ public class ConfigSourcesService extends BaseService {
* @return
* @throws Exception
*/
private String insertConfigComLileData(SaveRequestLogThread thread,
private String insertConfigComLileData(AuditLogThread thread,
long start, List<ConfigCompile> configCompileList, StringBuffer sb)
throws Exception {
@@ -1009,8 +1008,8 @@ public class ConfigSourcesService extends BaseService {
* @param sb
* @return
*/
public String saveMaatConfig(SaveRequestLogThread thread, long start,
List<ConfigCompile> configCompileList, StringBuffer sb) {
public String saveMaatConfig(AuditLogThread thread, long start,
List<ConfigCompile> configCompileList, StringBuffer sb) {
// List<MaatConfig> maatConfigList = new ArrayList<MaatConfig>();
// List<Integer> serviceList = new ArrayList<Integer>();
Map<Integer, List<MaatConfig>> maatMap = new HashMap<Integer, List<MaatConfig>>();
@@ -1379,8 +1378,8 @@ public class ConfigSourcesService extends BaseService {
return dstMap;
}
public String updateConfigSources(SaveRequestLogThread thread, long start,
List<ConfigCompile> compileList, Date opTime, StringBuffer sb) {
public String updateConfigSources(AuditLogThread thread, long start,
List<ConfigCompile> compileList, Date opTime, StringBuffer sb) {
Map<Integer, List<Long>> compileMap = new HashMap<Integer, List<Long>>();
if (null != compileList && compileList.size() > 0) {
for (ConfigCompile config : compileList) {
@@ -1459,8 +1458,8 @@ public class ConfigSourcesService extends BaseService {
return "ok";
}
public String saveByJDBCThread(SaveRequestLogThread thread, long start,
List<ConfigCompile> configCompileList, StringBuffer sb) {
public String saveByJDBCThread(AuditLogThread thread, long start,
List<ConfigCompile> configCompileList, StringBuffer sb) {
List<ConfigGroupRelation> groupRelationList = new ArrayList<ConfigGroupRelation>();
Map<String, List<StrRegion>> strRegionMap = new HashMap<String, List<StrRegion>>();
Map<String, List<StrRegion>> strStongRegionMap = new HashMap<String, List<StrRegion>>();
@@ -1774,8 +1773,8 @@ public class ConfigSourcesService extends BaseService {
* @return
* @throws Exception
*/
public String updateByJDBCThread(SaveRequestLogThread thread, long start,
List<ConfigCompile> compileList, Date opTime, StringBuffer sb) {
public String updateByJDBCThread(AuditLogThread thread, long start,
List<ConfigCompile> compileList, Date opTime, StringBuffer sb) {
List<ConfigCompile> compileAllList = new ArrayList<ConfigCompile>();
List<ConfigGroupRelation> groupRelationAllList = new ArrayList<ConfigGroupRelation>();
Map<String, List<StrRegion>> strRegionMap = new HashMap<String, List<StrRegion>>();
@@ -2193,8 +2192,8 @@ public class ConfigSourcesService extends BaseService {
* @return
* @throws Exception
*/
public String updateByJDBCThread12(SaveRequestLogThread thread, long start,
List<ConfigCompile> compileList, Date opTime, StringBuffer sb) {
public String updateByJDBCThread12(AuditLogThread thread, long start,
List<ConfigCompile> compileList, Date opTime, StringBuffer sb) {
List<ConfigCompile> compileAllList = new ArrayList<ConfigCompile>();
List<ConfigGroupRelation> groupRelationAllList = new ArrayList<ConfigGroupRelation>();
Map<String, List<StrRegion>> strRegionMap = new HashMap<String, List<StrRegion>>();
@@ -2420,8 +2419,8 @@ public class ConfigSourcesService extends BaseService {
* @param sb
* @return
*/
public String updateByJDBCThread3(SaveRequestLogThread thread, long start,
List<ConfigCompile> compileList, Date opTime, StringBuffer sb) {
public String updateByJDBCThread3(AuditLogThread thread, long start,
List<ConfigCompile> compileList, Date opTime, StringBuffer sb) {
List<ConfigCompile> compileAllList = new ArrayList<ConfigCompile>();
if (null != compileList && compileList.size() > 0) {
for (ConfigCompile config : compileList) {
@@ -2545,7 +2544,7 @@ public class ConfigSourcesService extends BaseService {
* @return
*/
public Map<String, Map<Long, List<Long>>> getRegionList(
SaveRequestLogThread thread, long start, ConfigCompile config,
AuditLogThread thread, long start, ConfigCompile config,
List<ConfigGroupRelation> queryCompileGroupByPID, StringBuffer sb) {
Map<String, Map<Long, List<Long>>> map = new HashMap<String, Map<Long, List<Long>>>();
Map<String, String> updateTableMap = new HashMap<String, String>();
@@ -2724,8 +2723,8 @@ public class ConfigSourcesService extends BaseService {
return "ok";
}
public String saveCommonSources(SaveRequestLogThread thread, long start,
String jsonString, StringBuffer sb) {
public String saveCommonSources(AuditLogThread thread, long start,
String jsonString) {
CompileVal.setBusinessCode(null);
JsonArray jsonObjectList = new JsonParser().parse(jsonString)
.getAsJsonArray();
@@ -3026,7 +3025,6 @@ public class ConfigSourcesService extends BaseService {
try {
configRedisService.saveUnMaatConfig(configMap);
} catch (Exception e) {
// TODO: handle exception
logger.error(e.getMessage());
CompileVal.setBusinessCode(RestBusinessCode.unknow_error.getValue());
if (e.getMessage().startsWith("后台错误:")) {
@@ -3039,8 +3037,8 @@ public class ConfigSourcesService extends BaseService {
return "ok";
}
public String updateCommonSources(SaveRequestLogThread thread, long start,
String jsonString, Date opTime, StringBuffer sb) {
public String updateCommonSources(AuditLogThread thread, long start,
String jsonString, Date opTime, StringBuffer sb) {
JsonArray jsonObjectList = null;
try {
jsonObjectList = new JsonParser().parse(jsonString)

7
src/main/java/com/nis/web/service/restful/DfKeyConvertUrlService.java
View File

@@ -9,15 +9,12 @@ import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.restful.DfKeyConvertUrl;
import com.nis.domain.restful.DfKeyMailAdd;
import com.nis.domain.restful.DjFlowControlStop;
import com.nis.restful.RestBusinessCode;
import com.nis.restful.RestServiceException;
import com.nis.util.StringUtil;
import com.nis.web.dao.DfKeyConvertUrlDao;
import com.nis.web.dao.IntervalTimeSearchDao;
import com.nis.web.service.BaseLogService;
import com.nis.web.service.SaveRequestLogThread;
import com.nis.web.service.AuditLogThread;
/**
* @ClassName: DfKeyConvertUrlService
@@ -54,7 +51,7 @@ public class DfKeyConvertUrlService extends BaseLogService {
* wx
* @param entity
*/
public void queryConditionCheck(SaveRequestLogThread thread,long start,DfKeyConvertUrl entity,Page page) {
public void queryConditionCheck(AuditLogThread thread, long start, DfKeyConvertUrl entity, Page page) {
try {
if (!StringUtil.isBlank(entity.getSearchId())) {

4
src/main/java/com/nis/web/service/restful/DfKeyMailAddService.java
View File

@@ -14,7 +14,7 @@ import com.nis.restful.RestServiceException;
import com.nis.util.StringUtil;
import com.nis.web.dao.DfKeyMailAddDao;
import com.nis.web.service.BaseLogService;
import com.nis.web.service.SaveRequestLogThread;
import com.nis.web.service.AuditLogThread;
/**
* @ClassName: DfKeyMailAddService
@@ -43,7 +43,7 @@ public class DfKeyMailAddService extends BaseLogService {
/**
* 查询条件检查
*/
public void queryConditionCheck(SaveRequestLogThread thread, long start, DfKeyMailAdd entity, Page page) {
public void queryConditionCheck(AuditLogThread thread, long start, DfKeyMailAdd entity, Page page) {
try {
if (!StringUtil.isBlank(entity.getSearchId())) {
Long.parseLong(entity.getSearchId());

6
src/main/java/com/nis/web/service/restful/DnsGroupTypeService.java
View File

@@ -11,6 +11,7 @@ package com.nis.web.service.restful;
import java.util.ArrayList;
import java.util.List;
import com.nis.web.service.AuditLogThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,7 +22,6 @@ import com.nis.restful.RestServiceException;
import com.nis.util.Constants;
import com.nis.web.dao.DnsGroupTypeDao;
import com.nis.web.service.CrudService;
import com.nis.web.service.SaveRequestLogThread;
/**
* @ClassName: DnsGroupTypeService.java
@@ -41,7 +41,7 @@ public class DnsGroupTypeService extends CrudService<DnsGroupTypeDao, DnsGroupTy
public DnsGroupType findById(long id) {
return get(id);
}
public void saveDnsGroupTypeBatch(SaveRequestLogThread thread,long start,List<DnsGroupType> entity) {
public void saveDnsGroupTypeBatch(AuditLogThread thread, long start, List<DnsGroupType> entity) {
// TODO Auto-generated method stub
List<Integer> idsList=new ArrayList<>();
for(DnsGroupType e:entity){
@@ -55,7 +55,7 @@ public class DnsGroupTypeService extends CrudService<DnsGroupTypeDao, DnsGroupTy
}
super.saveBatch(entity,DnsGroupTypeDao.class);
}
public void updateDnsGroupTypeBatch(SaveRequestLogThread thread,long start,List<DnsGroupType> entity) {
public void updateDnsGroupTypeBatch(AuditLogThread thread, long start, List<DnsGroupType> entity) {
// TODO Auto-generated method stub
// List<Integer> idsList=new ArrayList<>();
// for(DnsGroupType e:entity){

7
src/main/java/com/nis/web/service/restful/DnsResponseStrategyService.java
View File

@@ -9,7 +9,6 @@
package com.nis.web.service.restful;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +21,7 @@ import com.nis.restful.RestServiceException;
import com.nis.util.Constants;
import com.nis.web.dao.DnsResponseStrategyDao;
import com.nis.web.service.CrudService;
import com.nis.web.service.SaveRequestLogThread;
import com.nis.web.service.AuditLogThread;
/**
* @ClassName: DnsResponseStrategy.java
@@ -64,7 +63,7 @@ public class DnsResponseStrategyService extends CrudService<DnsResponseStrategyD
* @exception
* @since 1.0.0
*/
public void saveDnsResponseStrategyBatch(SaveRequestLogThread thread,long start,List<DnsResponseStrategy> entity) {
public void saveDnsResponseStrategyBatch(AuditLogThread thread, long start, List<DnsResponseStrategy> entity) {
// TODO Auto-generated method stub
List idsList=new ArrayList<>();
for(DnsResponseStrategy e:entity){
@@ -103,7 +102,7 @@ public class DnsResponseStrategyService extends CrudService<DnsResponseStrategyD
* @exception
* @since 1.0.0
*/
public void updateDnsResponseStrategyBatch(SaveRequestLogThread thread,long start,List<DnsResponseStrategy> entity) {
public void updateDnsResponseStrategyBatch(AuditLogThread thread, long start, List<DnsResponseStrategy> entity) {
// List idsList=new ArrayList<>();
// for(DnsResponseStrategy e:entity){
// if(e.getReqStrateId()!=null)

5
src/main/java/com/nis/web/service/restful/IntervalTimeSearchService.java
View File

@@ -3,19 +3,18 @@ package com.nis.web.service.restful;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import com.nis.web.service.AuditLogThread;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.restful.DfKeyConvertUrl;
import com.nis.domain.restful.DjFlowControlStop;
import com.nis.restful.RestBusinessCode;
import com.nis.restful.RestServiceException;
import com.nis.util.StringUtil;
import com.nis.web.dao.IntervalTimeSearchDao;
import com.nis.web.service.BaseLogService;
import com.nis.web.service.SaveRequestLogThread;
/**
* @ClassName: IntervalTimeSearchService
@@ -51,7 +50,7 @@ public class IntervalTimeSearchService extends BaseLogService {
* wx
* @param entity
*/
public void queryConditionCheck(SaveRequestLogThread thread,long start,DjFlowControlStop entity,Page page) {
public void queryConditionCheck(AuditLogThread thread, long start, DjFlowControlStop entity, Page page) {
/*try {
if (!StringUtil.isBlank(entity.getSearchCfgId())) {
Long.parseLong(entity.getSearchCfgId());