suntianwu před 3 roky
rodič
revize
a8d4d0a94c

+ 1 - 1
src/main/java/com/iden/bms/controller/CameraController.java

@@ -194,7 +194,7 @@ public class CameraController {
             @ApiImplicitParam(paramType = "query", name = "type", value = "摄像头类型,1摄像机,2抓拍设备"),
     })
     @PostMapping(value = "/importWithExcel",  headers = "content-type=multipart/form-data")
-    public Result<Object> importWithExcel(  @RequestHeader(name = "token") String token,
+    public Result<Object> importWithExcel( HttpServletRequest request, @RequestHeader(value = "token") String token,
                                             @RequestParam(value = "type", required = true) String type,
                                             @RequestParam(value = "file") MultipartFile multipartFile) {
         try {

+ 1 - 1
src/main/java/com/iden/bms/controller/CommunityController.java

@@ -127,7 +127,7 @@ public class CommunityController {
     @ApiOperation(value = "导入Excel")
     @PostMapping(value = "/importWithExcel",  headers = "content-type=multipart/form-data")
     public Result<Object> importWithExcel(
-            @RequestHeader(name = "token") String token,
+            HttpServletRequest request, @RequestHeader(value = "token") String token,
             @RequestParam(value = "file") MultipartFile multipartFile) {
         try {
             boolean flag = communityService.importWithExcel(multipartFile);

+ 1 - 1
src/main/java/com/iden/bms/controller/CrowdController.java

@@ -68,7 +68,7 @@ public class CrowdController {
 
     @ApiOperation(value = "导入Excel")
     @PostMapping(value = "/importWithExcel",  headers = "content-type=multipart/form-data")
-    public Result<List<Long>> importWithExcel( @RequestHeader(name = "token") String token,
+    public Result<List<Long>> importWithExcel(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                            @RequestParam(value = "file") MultipartFile multipartFile) {
         try {
             List<Long>  personIdList = personService.importWithExcel(multipartFile);

+ 3 - 3
src/main/java/com/iden/bms/controller/PersonController.java

@@ -159,7 +159,7 @@ public class PersonController {
 
     @ApiOperation(value = "导入Excel")
     @PostMapping(value = "/importWithExcel",  headers = "content-type=multipart/form-data")
-    public Result<Object> importWithExcel( @RequestHeader(name = "token") String token,
+    public Result<Object> importWithExcel( HttpServletRequest request, @RequestHeader(value = "token") String token,
                              @RequestParam(value = "file") MultipartFile multipartFile) {
         try {
             personService.importWithExcel(multipartFile);
@@ -182,7 +182,7 @@ public class PersonController {
     @CrossOrigin
     @PostMapping(value = "/uploadImage", headers="content-type=multipart/form-data",produces = "application/json;charset=UTF-8")
     public Result<String> uploadImage(
-                                    @RequestHeader(name = "token") String token,
+                                    HttpServletRequest request, @RequestHeader(value = "token") String token,
                                     @ApiParam(value="图像", required=true) MultipartFile file,
                                     @RequestParam(value = "communityId", required = true) Long communityId
                                      ) {
@@ -228,7 +228,7 @@ public class PersonController {
             moduleName = "修改人员",
             description = "修改人员"
     )
-    public Result<Object> updatePerson(@RequestHeader("token") String token,
+    public Result<Object> updatePerson(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                  @RequestBody PersonVO vo){
         try {
             this.personService.updatePerson(vo);

+ 2 - 1
src/main/java/com/iden/bms/controller/SysDictController.java

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 
@@ -39,7 +40,7 @@ public class SysDictController {
     })
     @GetMapping(value = "/queryDictItemsByType", produces = "application/json;charset=utf-8")
     public Result<List<SysDictItemVO>> queryDictItemsByType(
-            @RequestHeader(name = "token", required = true) String token,
+            HttpServletRequest request, @RequestHeader(value = "token") String token,
             @RequestParam(name = "dictType", required = true) String dictType
             ) {
         try {

+ 2 - 2
src/main/java/com/iden/bms/controller/SysRoleController.java

@@ -95,7 +95,7 @@ public class SysRoleController {
             moduleName = "修改角色",
             description = "修改角色"
     )
-    public Result<Object> updateSysRole(@RequestHeader("token") String token,
+    public Result<Object> updateSysRole(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                         @RequestBody SysRoleVO vo){
         try {
             this.sysRoleService.updateSysRole(vo);
@@ -116,7 +116,7 @@ public class SysRoleController {
             moduleName = "启用停用",
             description = "启用停用"
     )
-    public Result<Object> invalidSysRole(@RequestHeader("token") String token,
+    public Result<Object> invalidSysRole(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                               @RequestBody SysRoleVO vo){
         try {
             sysRoleService.invalidSysRole(vo);

+ 2 - 2
src/main/java/com/iden/bms/controller/SysUserController.java

@@ -125,7 +125,7 @@ public class SysUserController {
             moduleName = "启用停用",
             description = "启用停用"
     )
-    public Result<Object> invalidSysUser(@RequestHeader("token") String token,
+    public Result<Object> invalidSysUser(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                          @RequestBody SysUserVO vo){
         try {
             sysUserService.invalidSysUser(vo);
@@ -176,7 +176,7 @@ public class SysUserController {
             moduleName = "重置密码",
             description = "重置密码"
     )
-    public Result<Object> resetPassword(@RequestHeader("token") String token,
+    public Result<Object> resetPassword(HttpServletRequest request, @RequestHeader(value = "token") String token,
                                                       @PathVariable("id") Long id){
         try {
 

+ 2 - 3
src/main/java/com/iden/bms/controller/TraceController.java

@@ -52,7 +52,7 @@ public class TraceController {
             description = "上传图像获取目标轨迹"
     )
     public Result<String> uploadImage(@ApiParam(value="图像",required=true) MultipartFile file,
-                                      @RequestHeader(name = "token") String token) {
+                                      HttpServletRequest request, @RequestHeader(name = "token") String token) {
         try {
             String imageName = traceService.uploadImage(file);
             return  Result.success("上传成功!",imageName);
@@ -122,8 +122,7 @@ public class TraceController {
             moduleName = "轨迹下载",
             description = "轨迹下载"
     )
-    public void exportToExcel( @RequestHeader(name = "token", required = true) String token,
-                               HttpServletRequest request,
+    public void exportToExcel( HttpServletRequest request,@RequestHeader(name = "token", required = true) String token,
                               HttpServletResponse response,
                               @RequestBody List<TraceVO> traceVOS) {
         try {

+ 1 - 1
src/main/java/com/iden/bms/controller/WarningPersonController.java

@@ -104,7 +104,7 @@ public class WarningPersonController {
             moduleName = "处理预警",
             description = "处理预警"
     )
-    public Result<Object> handleWarning(@RequestHeader("token") String token,
+    public Result<Object> handleWarning( HttpServletRequest request,@RequestHeader("token") String token,
                                          @RequestBody WarningPersonVO vo){
         try {
             if(warningPersonService.handleWarning(vo)){