From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/api/LoginApi.java | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 27 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 7221a5f..aba20f3 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,12 +2,10 @@
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;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.panzhihua.auth.model.dos.LoginBody;
import com.panzhihua.auth.service.LoginService;
@@ -28,7 +26,7 @@
**/
@RestController
@RequestMapping("/")
-public class LoginApi {
+public class LoginApi extends BaseController {
@Resource
private LoginService loginService;
@@ -39,9 +37,10 @@
* 微信标识
* @return jwt
*/
+ @OperLog(operModul = "小程序登录")
@PostMapping("/loginApplets")
- public R loginApplets(@RequestParam("openId") String openId) {
- LoginReturnVO loginReturnVO = loginService.loginApplets(openId);
+ public R loginApplets(@RequestParam("openId") String openId,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginApplets(openId,appid);
return R.ok(loginReturnVO);
}
@@ -52,6 +51,7 @@
* 登录用户token
* @return 登出结果
*/
+ @OperLog(operModul = "用户退出登录")
@PostMapping("/logout")
public R logout(@RequestParam("token") String token) {
loginService.logoutApplets(token);
@@ -67,9 +67,10 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "运营后台登录")
@PostMapping("/loginAppletsBackStage")
- public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password);
+ public R loginAppletsBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginAppletsBackStage(account, password,appid);
return R.ok(loginReturnVO);
}
@@ -82,6 +83,7 @@
* @author manailin
* @date 2021-5-13 10:56
*/
+ @OperLog(operModul = "大数据统计平台（区、街道、社区三层登陆接口）")
@PostMapping("/loginBigDataBackStage")
public R loginBigDataBackStage(@RequestBody LoginBody loginBody) {
String account = loginBody.getAccount();
@@ -89,7 +91,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);
}
@@ -102,9 +104,10 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "社区后台登录")
@PostMapping("/loginCommunityBackage")
- public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password);
+ public R loginCommunityBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginCommunityBackage(account, password,appid);
return R.ok(loginReturnVO);
}
@@ -153,9 +156,10 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "商家后台登录")
@PostMapping("/loginShopBackStage")
- public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password);
+ public R loginShopBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginShopBackStage(account, password,appid);
return R.ok(loginReturnVO);
}
@@ -168,9 +172,10 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "网格综治app登录")
@PostMapping("/loginGridApp")
- public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password);
+ public R loginGridApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnsVO loginReturnVO = loginService.loginGridApp(account, password,appid);
return R.ok(loginReturnVO);
}
@@ -183,9 +188,10 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "网格综治后台登录")
@PostMapping("/loginGridBackstage")
- public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password);
+ public R loginGridBackstage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginGridBackstage(account, password,appid);
return R.ok(loginReturnVO);
}
@@ -195,9 +201,10 @@
* @param password 密码
* @return 登录结果
*/
+ @OperLog(operModul = "城管后台登录")
@PostMapping("/loginCgBackage")
- public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password);
+ public R loginCgBackage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginCgBackage(account, password,appid);
return R.ok(loginReturnVO);
}
@@ -207,9 +214,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);
+ public R loginAlarmApp(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnsVO loginReturnVO = loginService.loginAlarmApp(account, password,appid);
return R.ok(loginReturnVO);
}
@@ -222,9 +230,10 @@
* 密码
* @return 登录结果
*/
+ @OperLog(operModul = "便民服务商家后台登录 ")
@PostMapping("/loginMerchantBackStage")
- public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password);
+ public R loginMerchantBackStage(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginMerchantBackStage(account, password,appid);
return R.ok(loginReturnVO);
}
@@ -234,9 +243,47 @@
* @param password 密码
* @return 登录结果
*/
+ @OperLog(operModul = "西区大屏登录")
@PostMapping("/loginXQDP")
- public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password) {
- LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password);
+ public R loginXQDP(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginXQDP(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 微商业街用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginMcsUser")
+ @OperLog(operModul = "微商业街用户登录")
+ public R loginMcsUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginMcsUser(account, password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ @GetMapping("/tfLogin")
+ public R tfLogin(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("appid")String appid){
+ LoginReturnVO loginReturnVO=loginService.tfLogin(account,password,appid);
+ return R.ok(loginReturnVO);
+ }
+
+ /**
+ * 电动车商城后台用户登录
+ *
+ * @param account
+ * 账户
+ * @param password
+ * 密码
+ * @return 登录结果
+ */
+ @PostMapping("/loginBatteryUser")
+ public R loginBatteryUser(@RequestParam("account") String account, @RequestParam("password") String password,@RequestParam("appid")String appid) {
+ LoginReturnVO loginReturnVO = loginService.loginBatteryUser(account, password,appid);
return R.ok(loginReturnVO);
}
}
--
Gitblit v1.7.1