From c87e44fb1a97619711d84eecba0136f1ec88b95c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:27:06 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java | 7 +++++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java | 2 ++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 10 +---------
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java | 15 +++++++++++----
6 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
index a2c4935..d52071f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
@@ -15,6 +15,7 @@
import com.panzhihua.auth.config.MyAESUtil;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.helper.AESUtil;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.AES;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
@@ -47,6 +48,8 @@
private UserService userService;
@Resource
private RedisTemplate redisTemplate;
+ @Resource
+ private CommunityService communityService;
private static String LOGIN_FAIL="LOGIN_FAIL_";
@@ -99,7 +102,7 @@
// 维护最后登录时间
userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
//是否为专家登陆
- R r1 = userService.isExpert(loginUserInfoVO.getPhone());
+ R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
if (r1.getCode()== Constants.SUCCESS){
loginUserInfoVO.setType(13);
}
@@ -133,7 +136,7 @@
// 维护最后登录时间
userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
//是否为专家登陆
- R r1 = userService.isExpert(loginUserInfoVO.getPhone());
+ R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
if (r1.getCode()== Constants.SUCCESS){
loginUserInfoVO.setType(13);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java
index a5e2310..6a1adc3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java
@@ -60,7 +60,7 @@
/**
* 是否重名，重复手机号，重复账号
* */
- ComSanshuoExpert selectExpertByNameOrPhoneOrAccount(@Param("dto") ComSanshuoExpertDTO comSanshuoExpertDTO);
+ List<ComSanshuoExpert> selectExpertByNameOrPhoneOrAccount(@Param("dto") ComSanshuoExpertDTO comSanshuoExpertDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java
index 7b3cab0..bfabcb7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java
@@ -120,6 +120,8 @@
*/
private String unit;
+ private String unitId;
+
@TableField(exist = false)
private Integer count;
@TableField(exist = false)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
index 7b87026..fee4da7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.NumberUtil;
+import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.digest.MD5;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,26 +62,28 @@
@Override
public R addExpert(ComSanshuoExpertDTO comSanshuoExpertDTO) {
//是否重名
- ComSanshuoExpert checkExpert=comSanshuoExpertDao.selectExpertByNameOrPhoneOrAccount(comSanshuoExpertDTO);
- if (nonNull(checkExpert)){
+ List<ComSanshuoExpert> checkExpert=comSanshuoExpertDao.selectExpertByNameOrPhoneOrAccount(comSanshuoExpertDTO);
+ if (checkExpert.size() != 0){
return R.fail("账号信息有重复");
}
ComSanshuoExpert expert=new ComSanshuoExpert();
BeanUtil.copyProperties(comSanshuoExpertDTO,expert);
- //处理id
if (nonNull(comSanshuoExpertDTO.getUnit())){
String id = comSanshuoExpertDTO.getUnit();
String[] split = id.split(",");
- comSanshuoExpertDTO.setUnitId(split[split.length-1]);
+ expert.setUnitId(split[split.length-1]);
}
expert.setId(Snowflake.getId());
expert.setCreateTime(new Date());
if (expert.getLevel()==2){
expert.setIndustryCenterId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName()+"调解站");
}else if(expert.getLevel()==3){
expert.setStreetId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
}else if(expert.getLevel()==4){
expert.setCommunityId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
+ expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
}
expert.setStatus(1);
expert.setDelFlag(1);
@@ -183,15 +186,19 @@
vo.setLevel(i);
if (i==2){
//设置行业分中心为childList
+ vo.setId(2L);
vo.setChildList(comSanshuoIndustryCenterDao.indstryList());
vo.setName("行业分中心");
}else if (i==3){
+ vo.setId(3L);
vo.setChildList(comSanshuoIndustryCenterDao.streetList());
vo.setName("街道调解站");
}else if (i==4){
+ vo.setId(4L);
vo.setChildList(comSanshuoIndustryCenterDao.communityList());
vo.setName("社区调解站");
}else if(i==1){
+ vo.setId(1L);
vo.setName("三说会堂");
}
list.add(vo);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
index c9f7c6c..4c38a61 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
@@ -91,5 +91,6 @@
<select id="selectExpertByNameOrPhoneOrAccount"
resultType="com.panzhihua.service_community.entity.ComSanshuoExpert">
select * from com_sanshuo_expert where name=#{dto.name} or phone=#{dto.phone} or account=#{dto.account}
+ where stutas=1 and del_flag=1
</select>
</mapper>
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 31ac34c..3106aa7 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
@@ -44,8 +44,6 @@
private UserService userService;
@Resource
private SysUserInputService sysUserInputService;
- @Resource
- private CommunityService communityService;
/**
* 新增微信用户
@@ -1470,11 +1468,5 @@
return userService.resetPassExpertOrIndustryCenter(account,password);
}
- /**
- * 是否为专家登陆小程序
- * */
- @GetMapping("/isSanShuoExpert")
- public R isExpert(@RequestParam("number") String number){
- return communityService.isExpert(number);
- }
+
}
--
Gitblit v1.7.1