From a12e09a5bc73672dcd4665d35a1ef8c9d1c534b0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 16 十月 2023 18:47:11 +0800
Subject: [PATCH] 修改三说会堂
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 138 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 133 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 165afd4..48a9b80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.grid.*;
+import com.panzhihua.common.model.dtos.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -18,6 +19,7 @@
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import org.springframework.web.bind.annotation.RequestParam;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -37,7 +39,7 @@
* 用户在开放平台的唯一标识符
* @return token
*/
- R updateInsertUser(String openid, String sessionKey, String unionid);
+ R updateInsertUser(String openid, String sessionKey, String unionid,String appId);
/**
* 维护小程序用户基本信息 头像 昵称 性别
@@ -74,7 +76,7 @@
* @param type
* 用户类型 用户类型 1 小程序 2 运营平台 3 社区平台
*/
- R<LoginUserInfoVO> getUserInfo(String name, int type);
+ R<LoginUserInfoVO> getUserInfo(String name, int type,String appId);
/**
* 三端获取登录用户信息
@@ -355,7 +357,7 @@
* 所属app 1居民端app 2网格员端app 3商家端app
* @return 协议内容
*/
- R userAgreement(int type);
+ R userAgreement(int type,String appId);
/**
* 意见反馈
@@ -477,7 +479,7 @@
* 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
* @return 协议内容
*/
- R agreement(Integer type);
+ R agreement(Integer type,String appId);
/**
* 维护用户最后登录时间
@@ -845,5 +847,131 @@
*/
R uuLogin(UuLoginVO uuLoginVO);
- R newIndexData(Integer type, Long streetId);
+ /**
+ * 导出验证密码
+ * @param account
+ * @param password
+ * @return
+ */
+ R checkExport(@RequestParam("account")String account, @RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
+
+ /**
+ * 数据看板：数据总览
+ * @param type 查看类型
+ * @param streetId 街道id
+ * @param areaCode 区县code
+ * */
+ R newIndexData(Integer type, Long streetId,Long areaCode,String appid);
+
+ /**
+ * 用户占比统计
+ * @param type 查看类型
+ * @param streetId 街道id
+ * @param areaCode 区县code
+ * @param range */
+ R userRate(Integer type, Long streetId, Long areaCode, Integer range,String appId);
+
+ /**
+ * 真实用户占比统计
+ * @param type 查看类型
+ * @param streetId 街道id
+ * @param areaCode 区县code
+ * @param range */
+ R realUser(Integer type, Long streetId, Long areaCode, Integer range,String appId);
+
+
+ /**
+ * 用户行为折线图
+ * @param type 查看类型
+ * @param streetId 街道id
+ * @param areaCode 区县code
+ * @param range
+ * @param appId */
+ R userActivity(Integer type, Long streetId, Long areaCode, Integer range, String appId);
+
+ /**
+ * 获取区县即下属街道名
+ * */
+ R getAreaAndStreet();
+
+ /**
+ * uu洗车通知推送
+ * @param phone
+ * @param orderStatus
+ * @return
+ */
+ R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+
+ /**
+ * 无水洗车通知推送
+ * @param phone
+ * @param orderStatus
+ * @return
+ */
+ R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+
+ /**
+ * 获取城镇或村落列表
+ * */
+ R getCommunityList(String name,Long id);
+
+ /**
+ * 获取所有城镇或村落列表
+ * @return
+ */
+ R getAllCommunityList();
+
+ /**
+ * 重置密码
+ * @param type
+ * @param account
+ * @return
+ */
+ R resetPassword(Integer type,String account,String appId);
+
+ /**
+ * 天府通办登录
+ * @param uuLoginVO
+ * @return
+ */
+ R tfLogin(UuLoginVO uuLoginVO);
+
+ /**
+ * 三说会堂新增业务中心或专家账号
+ * */
+ R addExpertOrIndustryCenter(AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 三说会堂后台重置密码
+ * */
+ R resetPassExpertOrIndustryCenter(String account,String password);
+
+ /**
+ * 用户授权
+ * @param userId
+ * @return
+ */
+ R accept(Long userId);
+
+ R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO);
+
+ /**
+ * 移除专家权限
+ * */
+ R removeExpertRole(String phone);
+
+ /**
+ * 回复用户反馈
+ * */
+ R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO);
+
+ /**
+ * 查看我的问题留言或者问题留言记录
+ * */
+ R myFeedBack(Long id,Integer type,Long propertyId);
+
+ /**
+ * 是否为物业公司登录
+ * */
+ R propertyCheck(String phone);
}
--
Gitblit v1.7.1