后台日志管理,优惠卷列表以及增加优惠卷

This commit is contained in:
liuyingfang
2024-03-21 09:20:09 +08:00
parent 42f401469a
commit 1981baeb94
15 changed files with 795 additions and 0 deletions

View File

@@ -17,6 +17,7 @@ package cn.ysk.cashier.service;
import cn.ysk.cashier.service.dto.LogQueryCriteria;
import cn.ysk.cashier.domain.Log;
import cn.ysk.cashier.service.dto.LogQueryCriteriaExt;
import org.aspectj.lang.ProceedingJoinPoint;
import org.springframework.data.domain.Pageable;
import org.springframework.scheduling.annotation.Async;
@@ -24,6 +25,7 @@ import org.springframework.scheduling.annotation.Async;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* @author Zheng Jie
@@ -89,4 +91,6 @@ public interface LogService {
* 删除所有INFO日志
*/
void delAllByInfo();
Map<String, Object> shopInfoLog(LogQueryCriteriaExt criteria, Pageable pageable);
}

View File

@@ -37,6 +37,9 @@ public class LogQueryCriteria {
@Query
private String logType;
@Query
private Integer shopId;
@Query(type = Query.Type.BETWEEN)
private List<Timestamp> createTime;
}

View File

@@ -0,0 +1,19 @@
package cn.ysk.cashier.service.dto;
import cn.ysk.cashier.annotation.Query;
import lombok.Data;
/**
* 日志查询类扩展
* @author Zheng Jie
* @date 2019-6-4 09:23:07
*/
@Data
public class LogQueryCriteriaExt {
@Query
private String logType = "INFO";
@Query
private Integer shopId;
}

View File

@@ -20,9 +20,11 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import cn.ysk.cashier.domain.Log;
import cn.ysk.cashier.domain.LogVO;
import cn.ysk.cashier.repository.LogRepository;
import cn.ysk.cashier.service.LogService;
import cn.ysk.cashier.service.dto.LogQueryCriteria;
import cn.ysk.cashier.service.dto.LogQueryCriteriaExt;
import cn.ysk.cashier.service.mapstruct.LogErrorMapper;
import cn.ysk.cashier.service.mapstruct.LogSmallMapper;
import cn.ysk.cashier.utils.*;
@@ -41,6 +43,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.nio.charset.StandardCharsets;
import java.util.*;
/**
@@ -174,4 +177,23 @@ public class LogServiceImpl implements LogService {
public void delAllByInfo() {
logRepository.deleteByLogType("INFO");
}
@Override
public Map<String, Object> shopInfoLog(LogQueryCriteriaExt criteria, Pageable pageable) {
Page<Log> page = logRepository.findAll(((root, criteriaQuery, cb) -> QueryHelp.getPredicate(root, criteria, cb)), pageable);
List<LogVO> logVOList = new ArrayList<>();
for (Log log :page.getContent()) {
LogVO logVO = new LogVO();
logVO.setDescription(log.getDescription());
logVO.setCreateTime(log.getCreateTime());
logVO.setUsername(log.getUsername());
logVO.setRequestIp(log.getRequestIp());
logVOList.add(logVO);
}
Map<String,Object> map = new LinkedHashMap<>(2);
map.put("content",logVOList);
map.put("totalElements",page.getTotalElements());
return map;
}
}