From bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 08 九月 2022 15:23:37 +0800
Subject: [PATCH] Merge branch 'huacheng_push' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 96 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 17 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..c40c77f 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
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.StrUtil;
import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
@@ -12,6 +13,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;
@@ -55,8 +57,8 @@
*/
@PostMapping("/addOrUpdate")
public R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
- @RequestParam("unionid") String unionid) {
- return userService.updateInsertUser(openid, sessionKey, unionid);
+ @RequestParam("unionid") String unionid,@RequestParam("appId")String appId) {
+ return userService.updateInsertUser(openid, sessionKey, unionid,appId);
}
/**
@@ -102,10 +104,13 @@
*/
@PostMapping("/getUserInfo")
public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName) {
- int index = userName.lastIndexOf("_");
- String type = userName.substring(index + 1);
- String name = userName.substring(0, index);
- return userService.getUserInfo(name, Integer.parseInt(type));
+ int index2 = userName.lastIndexOf("_");
+ String appid=userName.substring(index2+1);
+ String username=userName.substring(0,index2);
+ int index = username.lastIndexOf("_");
+ String type = username.substring(index + 1);
+ String name = username.substring(0, index);
+ return userService.getUserInfo(name, Integer.parseInt(type),appid);
}
/**
@@ -563,8 +568,8 @@
* @return 协议内容
*/
@PostMapping("useragreement")
- public R userAgreement(@RequestParam("type") int type) {
- return userService.userAgreement(type);
+ public R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId) {
+ return userService.userAgreement(type,appId);
}
/**
@@ -720,8 +725,8 @@
* @return 协议内容
*/
@PostMapping("agreement")
- public R agreement(@RequestParam("type") Integer type) {
- return userService.agreement(type);
+ public R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId) {
+ return userService.agreement(type,appId);
}
/**
@@ -1358,15 +1363,52 @@
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,@RequestParam("appId")String appId){
+ return userService.newIndexData(type,streetId,areaCode,appId);
}
+
+ /**
+ * 数据看板：用户占比
+ * @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,@RequestParam("appId")String appId){
+ return userService.userRate(type,streetId,areaCode,range,appId);
+ }
+
+ /**
+ * 数据看板：真实用户统计
+ * @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,@RequestParam(value = "appId",required = false)String appId){
+ return userService.realUser(type,streetId,areaCode,range,appId);
+ }
+
+
+ @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,
+ @RequestParam(value = "appId",required = false) String appId){
+ return userService.userActivity(type,streetId,areaCode,range, appId);
+ }
+
/**
*导出验证密码
@@ -1388,4 +1430,24 @@
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();
+ }
+
+ @GetMapping("/communityList")
+ public R getCommunityList(@RequestParam("name") String name, @RequestParam(value = "id",required = false) Long id){
+ return userService.getCommunityList(name,id);
+ }
+
+ @GetMapping("/resetPasswordAccount")
+ public R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId){
+ return userService.resetPassword(type,account,appId);
+ }
+
+ @PostMapping("/tfLogin")
+ public R tfLogin(@RequestBody UuLoginVO uuLoginVO){
+ return userService.tfLogin(uuLoginVO);
+ }
}
--
Gitblit v1.7.1