From 84bf62e86220ec8c1f5672666f1fbaf4618f55a9 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 10:49:27 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 insertions(+), 28 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index fcfafd8..a403e43 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -331,6 +331,9 @@
return R.fail();
}
LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+ if (nonNull(sysUserDO.getStreetId())){
+ loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
+ }
loginUserInfoVO.setUserId(sysUserDO.getUserId());
loginUserInfoVO.setName(sysUserDO.getName());
loginUserInfoVO.setPassword(sysUserDO.getPassword());
@@ -360,6 +363,13 @@
roleDOList.forEach(sysRoleDO -> {
set.add(sysRoleDO.getRoleKey());
});
+ }
+ //是否为人大代表
+ if (StringUtils.isNotEmpty(sysUserDO.getPhone()) && StringUtils.isNotEmpty(sysUserDO.getName())){
+ int i = userDao.isDpcMember(sysUserDO.getPhone(), sysUserDO.getName());
+ if (i>0){
+ loginUserInfoVO.setIsDpcMember(1);
+ }
}
return R.ok(loginUserInfoVO);
}
@@ -484,31 +494,53 @@
if(countSocialOrg>0){
loginUserInfoVO.setUserType(3);
}
- else {
- if(loginUserInfoVO.getStreetId()!=null){
- loginUserInfoVO.setUserType(1);
+ if (nonNull(sysUserDO.getAccount())){
+ if (isStreetAccount(sysUserDO.getAccount())){
+ //街道账号
loginUserInfoVO.setLevel(3);
}
- else {
- loginUserInfoVO.setUserType(2);
- loginUserInfoVO.setLevel(4);
+ if (sysUserDO.getAccount().equals("admin")){
+ loginUserInfoVO.setLevel(1);
}
}
+ if (loginUserInfoVO.getType().equals(3)){
+ loginUserInfoVO.setLevel(4);
+ }
if (sysUserDO.getType().equals(11)){
+ //专家
loginUserInfoVO.setLevel(5);
}else if (sysUserDO.getType().equals(12)){
+ //行业分中心
loginUserInfoVO.setLevel(2);
- }else if (isNull(loginUserInfoVO.getLevel())){
- loginUserInfoVO.setLevel(1);
}
//是否为三说会堂专家
ComSanshuoExpertVO expertVO=userDao.isExpert(loginUserInfoVO.getPhone());
if (nonNull(expertVO)){
loginUserInfoVO.setType(13);
}
+ //是否为人大代表
+ if (StringUtils.isNotEmpty(phone) && StringUtils.isNotEmpty(sysUserDO.getName())){
+ int i = userDao.isDpcMember(phone, sysUserDO.getName());
+ if (i>0){
+ loginUserInfoVO.setIsDpcMember(1);
+ }
+ }
return R.ok(loginUserInfoVO);
}
+ /**
+ * 是否为综治后台街道账号
+ * */
+ public Boolean isStreetAccount(String name){
+ Boolean flag=false;
+ String[] account={"glpz","qxpjd","tjdjd","dbdjd","yqjd","bcg","hmkjd","dhjd","jsgyy","dzhljd"};
+ if (nonNull(name)){
+ if (ArrayUtil.contains(account,name)){
+ flag=true;
+ }
+ }
+ return flag;
+ }
/**
@@ -1552,11 +1584,11 @@
|| operlog.getTitle().equals(UPDATEACIDRECORD));
if (flag) {
//保存数据
- try {
- operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog));
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
+// try {
+//// operlog.setBeforeUpdateData(saveBeforeUpdateData(operlog));
+// } catch (JsonProcessingException e) {
+// e.printStackTrace();
+// }
}
SysOperLogDO sysOperLogDO = new SysOperLogDO();
BeanUtils.copyProperties(operlog, sysOperLogDO);
@@ -3268,16 +3300,19 @@
@Override
public R updateUserPartyStatus(Long userId) {
- SysUserDO sysUserDO = userDao.selectById(userId);
- if (sysUserDO != null) {
- sysUserDO.setIsPartymember(1);
- int updated = userDao.updateById(sysUserDO);
- if (updated > 0) {
- // 删除用户信息缓存
- String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
- stringRedisTemplate.delete(userKey);
+ List<SysUserDO> sysUserDOs = userDao.selectByUserId(userId);
+ for (SysUserDO sysUserDO : sysUserDOs) {
+ if (sysUserDO != null) {
+ sysUserDO.setIsPartymember(1);
+ int updated = userDao.updateById(sysUserDO);
+ if (updated > 0) {
+ // 删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ }
}
}
+
return R.ok();
}
@@ -3598,7 +3633,7 @@
String accessToken = "";
WxXCXTempSend util = new WxXCXTempSend();
try {
- accessToken = util.getAccessToken();
+ accessToken = util.getAccessToken("wx118de8a734d269f0");
} catch (Exception e) {
e.printStackTrace();
}
@@ -3608,15 +3643,15 @@
WxUtil.sendUuWash3(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "sU18zbyzxFldHAdOREaQCR5uq_uMvCKTmGtklO1xw-w");
break;
case 4:
- status = "车美已开始服务";
+ status = "开始服务";
WxUtil.sendUuWash4(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "Eft5ksvsnOQANy2uNOGY43CC3pb33eDGA_lgCEoxuiw");
break;
case 6:
- status = "订单确认完成";
+ status = "订单完成";
WxUtil.sendUuWash6(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "k1aV97H3pDNNcNcDTeZBD9jQemNDADnRE801HhTXweI");
break;
case 9:
- status = "订单已取消";
+ status = "订单取消";
WxUtil.sendUuWash(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "9_2FhQPDxZoUqmAuIZ1L1zjjYXokdNvu7A0gzKfvruI");
break;
}
@@ -3644,15 +3679,15 @@
WxUtil.sendWsWash3(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "sNj6m-JBvW6rOokKGDX9X3-XH1AD0GY5_X0jA9JSLwc");
break;
case 4:
- status = "车美已开始服务";
+ status = "开始服务";
WxUtil.sendWsWash4(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "Eft5ksvsnOQANy2uNOGY43CC3pb33eDGA_lgCEoxuiw");
break;
case 6:
- status = "订单确认完成";
+ status = "订单完成";
WxUtil.sendWsWash6(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "iPS8yrsGDqy76hiP8bIbxkosveoX1xTFhdusSiGp-XM");
break;
case 9:
- status = "订单已取消";
+ status = "订单取消";
WxUtil.sendWsWash(sysUserDO.getOpenid(), accessToken, status, washName, washPhone, phone, "z_ysGXz9JWBc2rXuYZzVCXKJTyLf0w0WerrohuNoEng");
break;
}
--
Gitblit v1.7.1