From 8e974a88e3aee769da2c0e61e5854814c5ca5f3e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 11:15:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 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 4eaf898..e5c091c 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
@@ -1222,7 +1222,37 @@
@PostMapping("/update/user/party/status")
R updateUserPartyStatus(@RequestParam("userId") Long userId);
- @GetMapping("/indexData")
+
+ /**
+ *导出验证密码
+ */
+ @GetMapping("/checkExport")
+ R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
+
+ @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();
}
--
Gitblit v1.7.1