From 0947c349e79d437dfb056bb2c622cba478c882f0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 21 七月 2022 15:40:56 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
index bf7e204..e074d06 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.interfaces.OperLog;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,7 +30,7 @@
  **/
 @RestController
 @RequestMapping("/")
-public class LoginApi {
+public class LoginApi extends BaseController {
     @Resource
     private LoginService loginService;
 
@@ -73,7 +74,7 @@
     @OperLog(operModul = "运营后台登录")
     @PostMapping("/loginAppletsBackStage")
     public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -94,7 +95,7 @@
         if (ObjectUtils.isEmpty(account) || ObjectUtils.isEmpty(password)) {
             return R.fail("账户密码不能为空");
         }
-        LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginBigDataBackStage(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -110,7 +111,7 @@
     @OperLog(operModul = "社区后台登录")
     @PostMapping("/loginCommunityBackage")
     public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -162,7 +163,7 @@
     @OperLog(operModul = "商家后台登录")
     @PostMapping("/loginShopBackStage")
     public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -178,7 +179,7 @@
     @OperLog(operModul = "网格综治app登录")
     @PostMapping("/loginGridApp")
     public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password);
+        LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -194,7 +195,7 @@
     @OperLog(operModul = "网格综治后台登录")
     @PostMapping("/loginGridBackstage")
     public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -207,7 +208,7 @@
     @OperLog(operModul = "城管后台登录")
     @PostMapping("/loginCgBackage")
     public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -217,9 +218,10 @@
      * @param password  密码
      * @return  登录结果
      */
+    @OperLog(operModul = "一键报警APP登录 ")
     @PostMapping("/loginAlarmApp")
     public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password);
+        LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -232,10 +234,10 @@
      *            密码
      * @return 登录结果
      */
-    @OperLog(operModul = "便民服务商家后台登录")
+    @OperLog(operModul = "便民服务商家后台登录 ")
     @PostMapping("/loginMerchantBackStage")
     public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -248,7 +250,7 @@
     @OperLog(operModul = "西区大屏登录")
     @PostMapping("/loginXQDP")
     public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 
@@ -262,8 +264,9 @@
      * @return 登录结果
      */
     @PostMapping("/loginMcsUser")
+    @OperLog(operModul = "微商业街用户登录")
     public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password) {
-        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password);
+        LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password,this.getAppId());
         return R.ok(loginReturnVO);
     }
 }

--
Gitblit v1.7.1