From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 1de8467..1504213 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -144,6 +144,9 @@
@GetMapping("resetPassword")
R resetPassword(@RequestParam("userId") Long userId);
+ @GetMapping("/resetPasswordAccount")
+ R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account);
+
/**
* 批量重置密码用户登录密码默认admin123456
*
@@ -536,7 +539,7 @@
* @return 协议内容
*/
@PostMapping("useragreement")
- R userAgreement(@RequestParam("type") int type);
+ R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId);
/**
* uu洗车登录
@@ -697,7 +700,7 @@
* @return 协议内容
*/
@PostMapping("agreement")
- R agreement(@RequestParam("type") Integer type);
+ R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);
/**
* 维护用户最后登录时间
@@ -1222,17 +1225,38 @@
@PostMapping("/update/user/party/status")
R updateUserPartyStatus(@RequestParam("userId") Long userId);
-
/**
*导出验证密码
*/
@GetMapping("/checkExport")
R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
- @GetMapping("/indexData")
+ @GetMapping("/indexData/totalData")
R newIndexData(@RequestParam(value = "type",required = false) Integer type,
- @RequestParam(value = "type",required = false) Long streetId);
+ @RequestParam(value = "type",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode);
+ @GetMapping("/indexData/userRate")
+ R userRate(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode,
+ @RequestParam(value = "range",required = false) Integer range);
+
+
+ @GetMapping("/indexData/realUser")
+ R realUser(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode,
+ @RequestParam(value = "range",required = false) Integer range);
+
+ @GetMapping("/indexData/userActivity")
+ R userActivity(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode,
+ @RequestParam(value = "range",required = false) Integer range);
+
+ @GetMapping("/indexData/getAreaAndStreet")
+ R getAreaAndStreet();
/**
* uu洗车推送
* @param washPhone
@@ -1243,4 +1267,11 @@
*/
@GetMapping("/uuPush")
R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+
+ @GetMapping("/communityList")
+ R communityList(@RequestParam("name") String name, @RequestParam("id") Long id);
+
+
+ @PostMapping("/tfLogin")
+ R tfLogin(@RequestBody UuLoginVO uuLoginVO);
}
--
Gitblit v1.7.1