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/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 39f2244..47e13a6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -12,6 +12,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.PageDTO;
@@ -1358,15 +1359,51 @@
return userService.uuLogin(uuLoginVO);
}
- @GetMapping("/indexData")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "type",value = "数据范围,1:所有区县，2：所有街道，3：所有社区，4：跟据街道筛选",dataType = "Integer"),
- @ApiImplicitParam(name = "streetId",value = "街道ID",dataType = "Long")
- })
+
+ /**
+ * 数据看板：数据总览
+ * @return
+ */
+ @GetMapping("/indexData/totalData")
public R indexData(@RequestParam(value = "type",required = false) Integer type,
- @RequestParam(value = "type",required = false) Long streetId){
- return userService.newIndexData(type,streetId);
+ @RequestParam(value = "streetId",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode){
+ return userService.newIndexData(type,streetId,areaCode);
}
+
+ /**
+ * 数据看板：用户占比
+ * @return
+ */
+ @GetMapping("/indexData/userRate")
+ public 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){
+ return userService.userRate(type,streetId,areaCode,range);
+ }
+
+ /**
+ * 数据看板：真实用户统计
+ * @return
+ */
+ @GetMapping("/indexData/realUser")
+ public 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){
+ return userService.realUser(type,streetId,areaCode,range);
+ }
+
+
+ @GetMapping("/indexData/userActivity")
+ public 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){
+ return userService.userActivity(type,streetId,areaCode,range);
+ }
+
/**
*导出验证密码
@@ -1388,4 +1425,9 @@
public R uuPush(@RequestParam(value = "washPhone",required = false)String washPhone,@RequestParam("phone")String phone,@RequestParam(value = "washName",required = false)String washName,@RequestParam("orderStatus")Integer orderStatus){
return userService.uuPush(washPhone,phone,washName,orderStatus);
}
+
+ @GetMapping("/indexData/getAreaAndStreet")
+ public R getAreaAndStreet(){
+ return userService.getAreaAndStreet();
+ }
}
--
Gitblit v1.7.1