From c6232cfc36e373f83f45c95d400e09466cc2a7d3 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 17:41:45 +0800
Subject: [PATCH] #feat 修改运营平台统计登录人数和新增人员
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 92 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 3 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 09480d4..5a51434 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
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -45,7 +46,7 @@
*/
@PostMapping("/addOrUpdate")
R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
- @RequestParam("unionid") String unionid);
+ @RequestParam("unionid") String unionid,@RequestParam("appId")String appId);
/**
* 维护小程序用户基本信息 头像 昵称 性别
@@ -143,6 +144,9 @@
*/
@GetMapping("resetPassword")
R resetPassword(@RequestParam("userId") Long userId);
+
+ @GetMapping("/resetPasswordAccount")
+ R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account,@RequestParam("appId")String appId);
/**
* 批量重置密码用户登录密码默认admin123456
@@ -536,7 +540,15 @@
* @return 协议内容
*/
@PostMapping("useragreement")
- R userAgreement(@RequestParam("type") int type);
+ R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId);
+
+ /**
+ * uu洗车登录
+ * @param uuLoginVO
+ * @return
+ */
+ @PostMapping("uuLogin")
+ R uuLogin(@RequestBody UuLoginVO uuLoginVO);
/**
* 意见反馈
@@ -655,6 +667,13 @@
R updateUserIsPartymember(@RequestParam("idCard") String idCard);
/**
+ * 修改党员状态
+ * @param phone
+ * @return
+ */
+ @PostMapping("updateuserispartymemberByPhone")
+ R updateUserIsPartymemberByPhone(@RequestParam("phone") String phone);
+ /**
* 修改用户的为非党员状态
*
* @param idCard
@@ -682,7 +701,7 @@
* @return 协议内容
*/
@PostMapping("agreement")
- R agreement(@RequestParam("type") Integer type);
+ R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);
/**
* 维护用户最后登录时间
@@ -1206,4 +1225,71 @@
*/
@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/totalData")
+ R newIndexData(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "type",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId);
+
+ @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,@RequestParam(value = "appId",required = false) String appId);
+
+
+ @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,@RequestParam(value = "appId",required = false) String appId);
+
+ @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, @RequestParam(value = "appId",required = false) String appId);
+
+ @GetMapping("/indexData/getAreaAndStreet")
+ R getAreaAndStreet();
+ /**
+ * uu洗车推送
+ * @param washPhone
+ * @param phone
+ * @param washName
+ * @param orderStatus
+ * @return
+ */
+ @GetMapping("/uuPush")
+ R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+ /**
+ * 无水洗车推送
+ * @param washPhone
+ * @param phone
+ * @param washName
+ * @param orderStatus
+ * @return
+ */
+ @GetMapping("/wsPush")
+ R wsPush(@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);
+
+
+ @GetMapping("/accept")
+ R accept(@RequestParam("userId")Long userId);
+
+ @PostMapping("/addComPbCheckUser")
+ R addComPbCheckUser(@RequestBody ComPbCheckUserDTO comPbCheckUserDTO);
+
}
--
Gitblit v1.7.1