From 284bb7da704a333ef92e32610107e95749a3e0b0 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 15:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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..93ecfa8 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
@@ -1229,8 +1229,32 @@
@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 = "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();
@RequestParam(value = "type",required = false) Long streetId);
/**
--
Gitblit v1.7.1