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

feature(tools):切换工具类

Browse Source
This commit is contained in:
doufenghu
2018-10-18 19:19:59 +08:00
parent 7f392422ef
commit e8e9d093f3
59 changed files with 720 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/util/CamelUnderlineUtil.java
View File

@@ -3,6 +3,8 @@
*/
package com.nis.util;
import com.zdjizhi.utils.StringUtil;
/**
* @ClassName:CamelUnderlineUtil
* @Description:TODO(这里用一句话描述这个类的作用)

6
src/main/java/com/nis/util/CompileVal.java
View File

@@ -16,6 +16,7 @@ import com.nis.listener.SystemConfigListener;
import com.nis.restful.RestBusinessCode;
import com.nis.restful.RestServiceException;
import com.nis.web.service.restful.ConfigSourcesService;
import com.zdjizhi.utils.StringUtil;
public class CompileVal {
@@ -63,10 +64,11 @@ public class CompileVal {
}
if (!isUpdate) {
if (configCompile.getIsValid() != 1)
if (configCompile.getIsValid() != 1) {
throw new RestServiceException("编译配置id为" + configCompile.getCompileId() + "的配置在添加时不能为无效",
RestBusinessCode.IsValidIsT.getValue());
{
}
} else {
throw new RestServiceException("编译配置id为" + configCompile.getCompileId() + "的配置在修改时不能为有效",

2
src/main/java/com/nis/util/Configurations.java
View File

@@ -1,5 +1,7 @@
package com.nis.util;
import com.zdjizhi.utils.StringUtil;
import java.io.File;
import java.util.Map;
import java.util.Properties;

1
src/main/java/com/nis/util/DateUtils.java
View File

@@ -12,6 +12,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zdjizhi.utils.StringUtil;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.log4j.Logger;

1
src/main/java/com/nis/util/DictUtils.java
View File

@@ -3,6 +3,7 @@ package com.nis.util;
import java.util.List;
import java.util.Map;
import com.zdjizhi.utils.StringUtil;
import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Lists;

1
src/main/java/com/nis/util/FileUtils.java
View File

@@ -21,6 +21,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.zdjizhi.utils.StringUtil;
import org.apache.tools.zip.ZipEntry;
import org.apache.tools.zip.ZipFile;
import org.apache.tools.zip.ZipOutputStream;

3
src/main/java/com/nis/util/GroupReuseVal.java
View File

@@ -11,6 +11,7 @@ import com.nis.restful.RestBusinessCode;
import com.nis.restful.RestServiceException;
import com.nis.restful.ServiceRuntimeException;
import com.nis.web.service.restful.ConfigSourcesService;
import com.zdjizhi.utils.StringUtil;
public class GroupReuseVal {
@@ -27,7 +28,7 @@ public class GroupReuseVal {
hasRegionFlag = true;
List<NumRegion> numRegionList = groupReuse.getNumRegionList();
for (NumRegion numRegion : numRegionList) {
if (!StringUtil.isEmpty(numRegion.getTableName())
if (!StringUtil.isEmpty(numRegion.getTableName())
&& !groupReuseRegionMap.get("numRegion").contains(numRegion.getTableName())) {
throw new RestServiceException("numRegionList中的regionId为"
+ numRegion.getRegionId()

5
src/main/java/com/nis/util/HiveJDBC.java
View File

@@ -18,6 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import com.zdjizhi.utils.StringUtil;
import org.apache.ibatis.mapping.ResultMap;
import org.apache.ibatis.mapping.ResultMapping;
import org.apache.ibatis.session.SqlSessionFactory;
@@ -146,9 +147,9 @@ public class HiveJDBC {
if (!StringUtil.isEmpty(value)) {
// 如果是日期类型的属性需要把时间戳转换成日期，如果时间戳为0直接把值设置为null
if (null != columnList && columnList.contains(filedName.toLowerCase())) {
long time = 0l;
long time = 0L;
time = Long.parseLong(value.toString());
map.put(filedName, time == 0l ? null : new Date(time * 1000));
map.put(filedName, time == 0L ? null : new Date(time * 1000));
// map.put(filedName, new
// Date(Long.parseLong("1476583810000")));
} else {

2
src/main/java/com/nis/util/JsonDateDeserializer.java
View File

@@ -30,7 +30,7 @@ public class JsonDateDeserializer extends JsonDeserializer<Date> {
// TODO Auto-generated method stub
Date date = null;
if (null!=p&&!"".equals(p.getText())) {
date = DateUtil.convertStringToDate(p.getText(), DateUtil.YYYY_MM_DD_HH24_MM_SS);
date = com.zdjizhi.utils.DateUtils.convertStringToDate(p.getText(), com.zdjizhi.utils.DateUtils.YYYY_MM_DD_HH24_MM_SS);
}
return date;
}

5
src/main/java/com/nis/util/JsonDateSerializer.java
View File

@@ -17,7 +17,8 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.nis.util.DateUtil;
import com.zdjizhi.utils.*;
/**
* @ClassName: JsonDateSerializer.java
@@ -36,7 +37,7 @@ public class JsonDateSerializer extends JsonSerializer<Date> {
throws IOException, JsonProcessingException {
// TODO Auto-generated method stub
//gen.writeString(sdf.format(date));
gen.writeString(DateUtil.getFormatDate(date, DateUtil.YYYY_MM_DD_HH24_MM_SS));
gen.writeString(com.zdjizhi.utils.DateUtils.getFormatDate(date, com.zdjizhi.utils.DateUtils.YYYY_MM_DD_HH24_MM_SS));
}
}

5
src/main/java/com/nis/util/LogJDBCByDruid.java
View File

@@ -15,6 +15,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.zdjizhi.utils.StringUtil;
import org.apache.ibatis.mapping.ResultMap;
import org.apache.ibatis.mapping.ResultMapping;
import org.apache.ibatis.session.SqlSessionFactory;
@@ -89,9 +90,9 @@ public class LogJDBCByDruid {
if (!StringUtil.isEmpty(value)) {
// 如果是日期类型的属性需要把时间戳转换成日期，如果时间戳为0直接把值设置为null
if (null != columnList && columnList.contains(filedName.toLowerCase())) {
long time = 0l;
long time = 0L;
time = Long.parseLong(value.toString());
map.put(filedName, time == 0l ? null : new Date(time * 1000));
map.put(filedName, time == 0L ? null : new Date(time * 1000));
// map.put(filedName, new
// Date(Long.parseLong("1476583810000")));
} else {

1
src/main/java/com/nis/util/LogUtils.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.zdjizhi.utils.StringUtil;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.method.HandlerMethod;

2
src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java
View File

@@ -2,12 +2,12 @@ package com.nis.util;
import java.util.Properties;
import com.zdjizhi.crypt.AESUtil;
import org.apache.commons.codec.binary.Base64;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import com.nis.crypt.AESUtil;
public class PropertyPlaceholderConfigurerCrypt extends PropertyPlaceholderConfigurer {

1
src/main/java/com/nis/util/ReadCommSourceXmlUtil.java
View File

@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.zdjizhi.utils.StringUtil;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;

1
src/main/java/com/nis/util/ServiceAndRDBIndexReal.java
View File

@@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.zdjizhi.utils.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
src/main/java/com/nis/util/TreeUtil.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import com.nis.domain.SysMenu;
import com.nis.web.security.UserUtils;
import com.zdjizhi.utils.StringUtil;
/**
* 将树构建成上下层结构

2
src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java
View File

@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.zdjizhi.utils.StringUtil;
import org.apache.http.client.ClientProtocolException;
import org.apache.ibatis.mapping.ResultMap;
import org.apache.ibatis.mapping.ResultMapping;
@@ -34,7 +35,6 @@ import com.nis.domain.LogEntity;
import com.nis.domain.Page;
import com.nis.util.Constants;
import com.nis.util.JsonMapper;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.service.SpringContextHolder;