Browse Source

修改user+1

master
yinzuomei 5 years ago
parent
commit
187c344718
  1. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-user/epmet-user-server/pom.xml
  3. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

2
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-dev container_name: epmet-user-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.81 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.82
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.81</version> <version>0.3.82</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId> <artifactId>epmet-user</artifactId>

5
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@ -33,7 +33,6 @@ import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.UserWechatDTO; import com.epmet.dto.UserWechatDTO;
import com.epmet.dto.result.CustomerUserDetailResultDTO; import com.epmet.dto.result.CustomerUserDetailResultDTO;
import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO;
import com.epmet.dto.result.UserWechatResultDTO;
import com.epmet.entity.UserBaseInfoEntity; import com.epmet.entity.UserBaseInfoEntity;
import com.epmet.redis.UserBaseInfoRedis; import com.epmet.redis.UserBaseInfoRedis;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@ -133,14 +132,14 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
return new ArrayList<>(); return new ArrayList<>();
} }
List<UserBaseInfoResultDTO> userBaseInfoList=new ArrayList<>(); List<UserBaseInfoResultDTO> userBaseInfoList=new ArrayList<>();
for(String userId:userIdList){ /* for(String userId:userIdList){
UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userId); UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userId);
if(null!=userBaseInfoResultDTO){ if(null!=userBaseInfoResultDTO){
UserWechatResultDTO userWechatResultDTO=baseDao.selectUserWechatByUserId(userId); UserWechatResultDTO userWechatResultDTO=baseDao.selectUserWechatByUserId(userId);
userBaseInfoResultDTO.setUserWechatResultDTO(userWechatResultDTO); userBaseInfoResultDTO.setUserWechatResultDTO(userWechatResultDTO);
userBaseInfoList.add(userBaseInfoResultDTO); userBaseInfoList.add(userBaseInfoResultDTO);
} }
} }*/
userIdList.forEach(id -> { userIdList.forEach(id -> {
UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id); UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
//为了保证传过来的user数量与返回的一致,就算查出的用户信息为空也要添加进集合里 //为了保证传过来的user数量与返回的一致,就算查出的用户信息为空也要添加进集合里

Loading…
Cancel
Save