From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/sys/DownlogController.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/DownlogController.java b/src/main/java/com/lf/server/controller/sys/DownlogController.java
index e29374b..1cec9a3 100644
--- a/src/main/java/com/lf/server/controller/sys/DownlogController.java
+++ b/src/main/java/com/lf/server/controller/sys/DownlogController.java
@@ -1,26 +1,19 @@
package com.lf.server.controller.sys;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
-import com.lf.server.entity.sys.BlacklistEntity;
import com.lf.server.entity.sys.DownlogEntity;
-import com.lf.server.helper.StringHelper;
-import com.lf.server.mapper.sys.DownlogMapper;
-import com.lf.server.service.sys.DepService;
+import com.lf.server.service.sys.DownlogService;
+import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import java.sql.Timestamp;
import java.util.List;
/**
@@ -32,34 +25,38 @@
@RequestMapping("/downlog")
public class DownlogController extends BaseController {
@Autowired
- DownlogMapper downlogMapper;
+ DownlogService downlogService;
+
+ @Autowired
+ TokenService tokenService;
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "uname", value = "鐢ㄦ埛鍚�", dataType = "String", paramType = "query", example = "鍛�"),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataType = "Integer", paramType = "query", example = "3"),
+ @ApiImplicitParam(name = "start", value = "寮�濮嬫椂闂�", dataType = "Timestamp", paramType = "query", example = "2022-12-09 09:00:00"),
+ @ApiImplicitParam(name = "end", value = "缁撴潫鏃堕棿", dataType = "Timestamp", paramType = "query", example = "2022-12-25 17:00:00"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<DownlogEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<Object> selectByPageAndCount(String uname, Integer type, Timestamp start, Timestamp end, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- QueryWrapper wrapper = new QueryWrapper();
- if (!StringHelper.isEmpty(name)) {
- wrapper.like("name", name);
+ int count = downlogService.selectCount(uname, type, start, end);
+ if (count == 0) {
+ return success(0, null);
}
- Page<DownlogEntity> page = new Page<>(pageIndex, pageSize);
- page.addOrder(OrderItem.asc("id"));
- IPage<DownlogEntity> paged = downlogMapper.selectPage(page, wrapper);
+ List<DownlogEntity> rs = downlogService.selectByPage(uname, type, start, end, pageSize, pageSize * (pageIndex - 1));
- return success(paged.getTotal(), paged.getRecords());
+ return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3