From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/SystemBulletinController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/SystemBulletinController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/SystemBulletinController.java
index fae9936..efb0a2b 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/SystemBulletinController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/SystemBulletinController.java
@@ -40,14 +40,14 @@
@ResponseBody
@PostMapping("/api/systemBulletin/querySystemBulletinList")
- @ServiceLog(name = "获取系统公告列表", url = "/api/systemBulletin/querySystemBulletinList")
+// @ServiceLog(name = "获取系统公告列表", url = "/api/systemBulletin/querySystemBulletinList")
@ApiOperation(value = "获取系统公告列表", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper<List<SystemBulletinListWarpper>> querySystemBulletinList(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResponseWarpper<List<SystemBulletinListWarpper>> querySystemBulletinList(Integer pageNum, Integer size){
if(ToolUtil.isEmpty(pageNum)){
return ResponseWarpper.success(ResultUtil.paranErr("pageNum"));
}
@@ -55,9 +55,9 @@
return ResponseWarpper.success(ResultUtil.paranErr("size"));
}
try {
- Integer uid = driverService.getUserByRequset(request);
+ Integer uid = driverService.getUserByRequest();
if(null == uid){
- return ResponseWarpper.success(ResultUtil.tokenErr());
+ return ResponseWarpper.tokenErr();
}
List<SystemBulletinListWarpper> systemBulletinListWarppers = systemBulletinService.querySystemBulletinList(uid, pageNum, size);
return ResponseWarpper.success(systemBulletinListWarppers);
@@ -70,20 +70,20 @@
@ResponseBody
@PostMapping("/api/systemBulletin/querySystemBulletinInfo")
- @ServiceLog(name = "获取系统公告详情", url = "/api/systemBulletin/querySystemBulletinInfo")
+// @ServiceLog(name = "获取系统公告详情", url = "/api/systemBulletin/querySystemBulletinInfo")
@ApiOperation(value = "获取系统公告详情", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "公告id", name = "id", required = true, dataType = "long"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper<SystemBulletinInfo> querySystemBulletinInfo(Long id, HttpServletRequest request){
+ public ResponseWarpper<SystemBulletinInfo> querySystemBulletinInfo(Long id){
if(ToolUtil.isEmpty(id)){
return ResponseWarpper.success(ResultUtil.paranErr("id"));
}
try {
- Integer uid = driverService.getUserByRequset(request);
+ Integer uid = driverService.getUserByRequest();
if(null == uid){
- return ResponseWarpper.success(ResultUtil.tokenErr());
+ return ResponseWarpper.tokenErr();
}
SystemBulletinInfo systemBulletinInfo = systemBulletinService.querySystemBulletinInfo(id);
return ResponseWarpper.success(systemBulletinInfo);
--
Gitblit v1.7.1