Browse Source

修改获取当前登录用户ID的方法

ligang134 3 năm trước cách đây
mục cha
commit
ffcc13e872

+ 12 - 11
src/main/java/com/ydtech/core/page/BaseController.java

@@ -69,17 +69,18 @@ public class BaseController {
     }
 
 
-    /**
-     * 新加 可用
-     *
-     * @author: lig
-     * @date: 2023年05月18日 0018
-     */
-    public String getUserId() {
-        Authentication authentication = SecurityUtils.getAuthentication();
-        JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
-        return JwtTokenUtils.getUserIdFromToken(j.getToken());
-    }
+//    /**
+//     * 新加 可用
+//     *
+//     * @author: lig
+//     * @date: 2023年05月18日 0018
+//     */
+//    public String getUserId() {
+//        Authentication authentication = SecurityUtils.getAuthentication();
+//
+//        JwtAuthenticatioToken j = (JwtAuthenticatioToken) authentication;
+//        return JwtTokenUtils.getUserIdFromToken(j.getToken());
+//    }
 
     /**
      * 获取用户名

+ 8 - 4
src/main/java/com/ydtech/modules/inv/controller/InvCompanyController.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.inv.controller;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.inv.model.InvCompany;
 import com.ydtech.modules.inv.service.InvCompanyService;
 import com.ydtech.modules.inv.model.vo.req.InvCompanyReqVO;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
 
@@ -44,18 +46,17 @@ public class InvCompanyController extends BaseController {
     })
     @PostMapping(value = "/save")
 //    @ApiOperationSupport(ignoreParameters = {"id"})
-    public HttpResult save(@RequestBody InvCompany invCompany) {
-
+    public HttpResult save(@RequestBody InvCompany invCompany, HttpServletRequest request) {
 
         if(StringUtils.isNotEmpty(invCompany.getId())){
             //更新
-            invCompany.setUpdateBy(getUserId());
+            invCompany.setUpdateBy(getUserId(request));
             invCompany.setUpdateTime(new Date());
 
         }else{
             //新增
             invCompany.setDelFlag(0);
-            invCompany.setCreateBy(getUserId());
+            invCompany.setCreateBy(getUserId(request));
             invCompany.setCreateTime(new Date());
         }
 
@@ -86,4 +87,7 @@ public class InvCompanyController extends BaseController {
     }
 
 
+
+
+
 }

+ 3 - 3
src/main/java/com/ydtech/modules/inv/controller/InvInvoiceInfoController.java

@@ -45,7 +45,7 @@ public class InvInvoiceInfoController extends BaseController {
             @ApiResponse(code = 200, message = "请求成功")
     })
     @PostMapping(value = "/save")
-    public HttpResult save(@RequestBody InvInvoiceInfo invInvoiceInfo) {
+    public HttpResult save(@RequestBody InvInvoiceInfo invInvoiceInfo, HttpServletRequest request) {
 
 
 
@@ -58,12 +58,12 @@ public class InvInvoiceInfoController extends BaseController {
                 return HttpResult.error("审核通过的不允许修改");
             }
 
-            invInvoiceInfo.setUpdateBy(getUserId());
+            invInvoiceInfo.setUpdateBy(getUserId(request));
             invInvoiceInfo.setUpdateTime(new Date());
 
         }else{
             //新增
-            invInvoiceInfo.setCreateBy(getUserId());
+            invInvoiceInfo.setCreateBy(getUserId(request));
             invInvoiceInfo.setCreateTime(new Date());
         }
 

+ 4 - 2
src/main/java/com/ydtech/modules/order/controller/RenewalController.java

@@ -13,6 +13,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author wenks
  * @version 0.0.2
@@ -35,8 +37,8 @@ public class RenewalController extends BaseController {
 
     @PostMapping("/queryRenewal")
     @ApiOperation("查询续保")
-    public HttpResult queryRenewal(@RequestBody QueryRenewalVo queryRenewalVo) {
-        String userId = getUserId();
+    public HttpResult queryRenewal(@RequestBody QueryRenewalVo queryRenewalVo, HttpServletRequest request) {
+        String userId = getUserId(request);
         SysUser sysUser = sysUserService.getById(userId);
         YaQuoteInfoVo quoteInfoVo = insRenewalService.queryRenewal(sysUser, queryRenewalVo);
         return HttpResult.ok(quoteInfoVo);