Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改bug2116 接口返回超过50s没反应

Browse Source
This commit is contained in:
hzj
2023-12-05 09:42:09 +08:00
parent 9453bf7f08
commit b96ebcad82
3 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AuditMapper.java
View File

@@ -37,13 +37,13 @@ public interface AuditMapper {
*/
void deleteByTime(@Param("ew") QueryWrapper<UserLog> queryWrapper);
/**
* 查询所有登录名
* 查询UserLog
*/
List<String> selectLoginName();
List<UserLog> selectUserLog();
/**
* 查询所有操作类型
*/
List<String> selectOperateType();
// List<String> selectOperateType();
/**
* 时间范围查询id集合

18
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/AuditMapper.xml
View File

@@ -103,21 +103,21 @@
GROUP BY login_name, operate_type
</select>
<select id="selectLoginName" resultType="String">
<select id="selectUserLog" resultType="com.njcn.system.pojo.po.UserLog">
SELECT
login_name
*
FROM sys_user_log
WHERE login_name !=""
AND login_name !="unknown user"
GROUP BY login_name
</select>
<select id="selectOperateType" resultType="String">
SELECT
operate_type
FROM sys_user_log
GROUP BY operate_type
</select>
<!-- <select id="selectOperateType" resultType="String">-->
<!-- SELECT-->
<!-- operate_type-->
<!-- FROM sys_user_log-->
<!-- GROUP BY operate_type-->
<!-- </select>-->
<select id="queryExportLimit" resultType="com.njcn.system.excel.UserLogExcel">
SELECT

65
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
View File

@@ -5,7 +5,6 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.StopWatch;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -49,7 +48,10 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.ParseException;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -89,26 +91,6 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
.eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType())
.ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())))
.le(StrUtil.isNotBlank(auditParam.getSearchEndTime()), UserLog::getCreateTime, DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime())))
.or(StrUtil.isNotBlank(auditParam.getLoginName()), qw ->
qw.like(StrUtil.isNotBlank(auditParam.getLoginName()), UserLog::getIp, auditParam.getLoginName())
.ne(UserLog::getLoginName, "unknown user")
.ne(UserLog::getLoginName, "")
.ne(UserLog::getOperate, "unknown user")
.eq(auditParam.getType() != null, UserLog::getType, auditParam.getType())
.eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType())
.ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())))
.le(StrUtil.isNotBlank(auditParam.getSearchEndTime()), UserLog::getCreateTime, DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime())))
)
.or(StrUtil.isNotBlank(auditParam.getLoginName()), qw ->
qw.like(StrUtil.isNotBlank(auditParam.getLoginName()), UserLog::getCreateTime, auditParam.getLoginName())
.ne(UserLog::getLoginName, "unknown user")
.ne(UserLog::getLoginName, "")
.ne(UserLog::getOperate, "unknown user")
.eq(auditParam.getType() != null, UserLog::getType, auditParam.getType())
.eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType())
.ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())))
.le(StrUtil.isNotBlank(auditParam.getSearchEndTime()), UserLog::getCreateTime, DateUtil.endOfDay(DateUtil.parse(auditParam.getSearchEndTime())))
)
.orderByDesc(UserLog::getCreateTime)
);
Page<AuditLogVO> page = BeanUtil.copyProperties(info, Page.class);
@@ -372,22 +354,33 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
@Override
public LogParamVO saveLogParam() {
LogParamVO logParamVO = new LogParamVO();
List<String> loginName = auditMapper.selectLoginName();
List<String> operateType = auditMapper.selectOperateType();
List<ValuePO> loginNameList = new ArrayList<>();
List<ValuePO> operateTypeList = new ArrayList<>();
for (int i = 0; i < loginName.size(); i++) {
List<UserLog> userLogs = auditMapper.selectUserLog();
List<ValuePO> loginNameList = userLogs.stream().map(UserLog::getLoginName).distinct().map(temp->{
ValuePO valuePO = new ValuePO();
valuePO.setName("选项" + (i + 1));
valuePO.setValue(loginName.get(i));
loginNameList.add(valuePO);
}
for (int i = 0; i < operateType.size(); i++) {
valuePO.setValue(temp);
return valuePO;
}).collect(Collectors.toList());
List<ValuePO> operateTypeList = userLogs.stream().map(UserLog::getOperateType).distinct().map(temp->{
ValuePO valuePO = new ValuePO();
valuePO.setName("选项" + (i + 1));
valuePO.setValue(operateType.get(i));
operateTypeList.add(valuePO);
}
valuePO.setValue(temp);
return valuePO;
}).collect(Collectors.toList());
// List<ValuePO> loginNameList = new ArrayList<>();
// List<ValuePO> operateTypeList = new ArrayList<>();
// for (int i = 0; i < loginName.size(); i++) {
// ValuePO valuePO = new ValuePO();
// valuePO.setName("选项" + (i + 1));
// valuePO.setValue(loginName.get(i));
// loginNameList.add(valuePO);
// }
// for (int i = 0; i < operateType.size(); i++) {
// ValuePO valuePO = new ValuePO();
// valuePO.setName("选项" + (i + 1));
// valuePO.setValue(operateType.get(i));
// operateTypeList.add(valuePO);
// }
logParamVO.setLoginName(loginNameList);
logParamVO.setOperateType(operateTypeList);
return logParamVO;