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/web/service/AreaService.java
View File

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
import com.google.common.collect.Lists;
import com.nis.domain.SysArea;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.web.dao.SysAreaDao;
import com.nis.web.security.UserUtils;

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

@@ -22,7 +22,7 @@ import com.nis.domain.Page;
import com.nis.domain.restful.NtcReportEntity;
import com.nis.restful.RestBusinessCode;
import com.nis.restful.RestServiceException;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.util.elasticsearch.ElasticsearchSqlDao;
/**

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

@@ -3,14 +3,14 @@ package com.nis.web.service;
import java.util.Date;
import java.util.List;
import com.zdjizhi.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.SysDataDictionaryName;
import com.nis.util.DateUtil;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.web.dao.SysDictDao;
import com.nis.web.security.UserUtils;
@@ -52,7 +52,7 @@ public class DictService extends BaseService {
}else {//修改
//累加修改记录
String newRevision = "用户"+UserUtils.getUser().getName()+",在"+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"修改！";
String newRevision = "用户"+UserUtils.getUser().getName()+",在"+ DateUtils.getCurrentDate(DateUtils.YYYY_MM_DD_HH24_MM_SS)+"修改！";
StringBuilder revisionBuilder = new StringBuilder(newRevision);
String oldRevision = sysDictName.getRevision();
if(!StringUtil.isBlank(oldRevision)){

2
src/main/java/com/nis/web/service/HiveSqlService.java
View File

@@ -23,7 +23,7 @@ import com.alibaba.druid.pool.DruidDataSource;
import com.nis.domain.Page;
import com.nis.util.Constants;
import com.nis.util.LogJDBCByDruid;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.util.redis.SaveRedisThread;
public class HiveSqlService {

2
src/main/java/com/nis/web/service/MenuService.java
View File

@@ -10,7 +10,7 @@ import com.nis.domain.SysMenu;
import com.nis.domain.SysUser;
import com.nis.util.CacheUtils;
import com.nis.util.LogUtils;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.web.dao.SysMenuDao;
import com.nis.web.security.UserUtils;

2
src/main/java/com/nis/web/service/OfficeService.java
View File

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
import com.nis.domain.SysOffice;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.web.dao.SysOfficeDao;
import com.nis.web.security.UserUtils;
@Service

2
src/main/java/com/nis/web/service/RoleService.java
View File

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
import com.nis.domain.SysRole;
import com.nis.domain.SysUser;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.web.dao.SysRoleDao;
import com.nis.web.security.UserUtils;

8
src/main/java/com/nis/web/service/SystemService.java
View File

@@ -13,6 +13,8 @@ import java.util.Map;
import javax.xml.namespace.QName;
import com.zdjizhi.utils.IPUtil;
import com.zdjizhi.utils.TimeConstants;
import org.apache.commons.io.FileUtils;
import org.apache.shiro.session.Session;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +26,7 @@ import com.nis.domain.SysUser;
import com.nis.domain.WebServiceClient;
import com.nis.util.Configurations;
import com.nis.util.DateUtils;
import com.nis.util.IpUtil;
import com.nis.util.StringUtil;
import com.nis.util.TimeConstants;
import com.zdjizhi.utils.StringUtil;
import com.nis.web.dao.SrcIpDao;
import com.nis.web.dao.SysOfficeDao;
import com.nis.web.dao.UserDao;
@@ -69,7 +69,7 @@ public class SystemService extends BaseService{
}
public List<SrcIp> ipLookUp(String ip) {
return srcIpDao.getIpInfo(IpUtil.getIpHostDesimal(ip));
return srcIpDao.getIpInfo(IPUtil.getIpHostDesimal(ip));
}

2
src/main/java/com/nis/web/service/TreeService.java
View File

@@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.TreeEntity;
import com.nis.exceptions.ServiceException;
import com.nis.util.Reflections;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.dao.TreeDao;

2
src/main/java/com/nis/web/service/UserService.java
View File

@@ -12,7 +12,7 @@ import com.nis.domain.Page;
import com.nis.domain.SysUser;
import com.nis.exceptions.ServiceException;
import com.nis.util.CacheUtils;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.dao.UserDao;
import com.nis.web.security.UserUtils;

2
src/main/java/com/nis/web/service/restful/ConfigPzIdService.java
View File

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.restful.ConfigPzIdSource;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.web.dao.ConfigPzIdDao;
import com.nis.web.service.BaseLogService;
import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BIConversion.Static;

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

@@ -42,7 +42,7 @@ import com.nis.util.GroupReuseVal;
import com.nis.util.JsonMapper;
import com.nis.util.ReadCommSourceXmlUtil;
import com.nis.util.ServiceAndRDBIndexReal;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import com.nis.web.service.AuditLogThread;
import com.nis.web.service.BaseService;
@@ -297,8 +297,10 @@ public class ConfigSourcesService extends BaseService {
Map<String, String> dstMap = new HashMap<String, String>();
Field[] fields = obj.getClass().getDeclaredFields();
for (Field field : fields) {
if ("serialVersionUID".equals(field.getName()))
if ("serialVersionUID".equals(field.getName())) {
continue;
}
String dstName = CamelUnderlineUtil.camelToUnderline(field.getName());
PropertyDescriptor pd;
pd = new PropertyDescriptor(field.getName(), clazz);

2
src/main/java/com/nis/web/service/restful/MaatTestServiceimpl.java
View File

@@ -37,7 +37,7 @@ import com.nis.util.JedisUtils;
import com.nis.util.ReadCommSourceXmlUtil;
import com.nis.util.ReadMaatXmlUtil;
import com.nis.util.ServiceAndRDBIndexReal;
import com.nis.util.StringUtil;
import com.zdjizhi.utils.StringUtil;
import net.sf.json.JSONObject;