purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化表结构

Browse Source
This commit is contained in:
季圣华
2020-07-21 01:36:26 +08:00
parent 1393244160
commit 70f0dae473
104 changed files with 5005 additions and 9006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/jsh/erp/service/log/LogComponent.java
View File

@@ -25,20 +25,19 @@ public class LogComponent implements ICommonQuery {
@Override
public List<?> select(Map<String, String> map)throws Exception {
return getUserList(map);
return getLogList(map);
}
private List<?> getUserList(Map<String, String> map)throws Exception {
private List<?> getLogList(Map<String, String> map)throws Exception {
String search = map.get(Constants.SEARCH);
String operation = StringUtil.getInfo(search, "operation");
Integer usernameID = StringUtil.parseInteger(StringUtil.getInfo(search, "usernameID"));
Integer userId = StringUtil.parseInteger(StringUtil.getInfo(search, "userId"));
String clientIp = StringUtil.getInfo(search, "clientIp");
Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status"));
String beginTime = StringUtil.getInfo(search, "beginTime");
String endTime = StringUtil.getInfo(search, "endTime");
String contentdetails = StringUtil.getInfo(search, "contentdetails");
String order = QueryUtils.order(map);
return logService.select(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails,
String content = StringUtil.getInfo(search, "content");
return logService.select(operation, userId, clientIp, status, beginTime, endTime, content,
QueryUtils.offset(map), QueryUtils.rows(map));
}
@@ -46,13 +45,13 @@ public class LogComponent implements ICommonQuery {
public Long counts(Map<String, String> map)throws Exception {
String search = map.get(Constants.SEARCH);
String operation = StringUtil.getInfo(search, "operation");
Integer usernameID = StringUtil.parseInteger(StringUtil.getInfo(search, "usernameID"));
Integer userId = StringUtil.parseInteger(StringUtil.getInfo(search, "userId"));
String clientIp = StringUtil.getInfo(search, "clientIp");
Integer status = StringUtil.parseInteger(StringUtil.getInfo(search, "status"));
String beginTime = StringUtil.getInfo(search, "beginTime");
String endTime = StringUtil.getInfo(search, "endTime");
String contentdetails = StringUtil.getInfo(search, "contentdetails");
return logService.countLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails);
String content = StringUtil.getInfo(search, "content");
return logService.countLog(operation, userId, clientIp, status, beginTime, endTime, content);
}
@Override

24
src/main/java/com/jsh/erp/service/log/LogService.java
View File

@@ -55,15 +55,15 @@ public class LogService {
return list;
}
public List<LogVo4List> select(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime,
String contentdetails, int offset, int rows)throws Exception {
public List<LogVo4List> select(String operation, Integer userId, String clientIp, Integer status, String beginTime, String endTime,
String content, int offset, int rows)throws Exception {
List<LogVo4List> list=null;
try{
list=logMapperEx.selectByConditionLog(operation, usernameID, clientIp, status, beginTime, endTime,
contentdetails, offset, rows);
list=logMapperEx.selectByConditionLog(operation, userId, clientIp, status, beginTime, endTime,
content, offset, rows);
if (null != list) {
for (LogVo4List log : list) {
log.setCreateTimeStr(Tools.getCenternTime(log.getCreatetime()));
log.setCreateTimeStr(Tools.getCenternTime(log.getCreateTime()));
}
}
}catch(Exception e){
@@ -72,11 +72,11 @@ public class LogService {
return list;
}
public Long countLog(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime,
String contentdetails)throws Exception {
public Long countLog(String operation, Integer userId, String clientIp, Integer status, String beginTime, String endTime,
String content)throws Exception {
Long result=null;
try{
result=logMapperEx.countsByLog(operation, usernameID, clientIp, status, beginTime, endTime, contentdetails);
result=logMapperEx.countsByLog(operation, userId, clientIp, status, beginTime, endTime, content);
}catch(Exception e){
JshException.readFail(logger, e);
}
@@ -153,13 +153,13 @@ public class LogService {
Long userId = getUserId(request);
if(userId!=null) {
Log log = new Log();
log.setUserid(userId);
log.setUserId(userId);
log.setOperation(moduleName);
log.setClientip(getLocalIp(request));
log.setCreatetime(new Date());
log.setClientIp(getLocalIp(request));
log.setCreateTime(new Date());
Byte status = 0;
log.setStatus(status);
log.setContentdetails(content);
log.setContent(content);
logMapper.insertSelective(log);
}
}catch(Exception e){