From 4477c2e8c82c520094955e5da67dabed9072d239 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Tue, 22 Aug 2023 13:34:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E9=A6=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CsDeviceUserPOServiceImpl.java | 4 +-- .../cssystem/pojo/po/CsFeedbackChatPO.java | 2 ++ cs-system/cs-system-boot/pom.xml | 6 ++++ .../service/impl/CsFeedbackServiceImpl.java | 29 +++++++++++++++---- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java index 7107e2f..8f398b0 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDeviceUserPOServiceImpl.java @@ -202,8 +202,8 @@ public class CsDeviceUserPOServiceImpl extends ServiceImpl list = this.lambdaQuery().eq(CsDeviceUserPO::getDeviceId, deviceId).eq(CsDeviceUserPO::getStatus, "1").eq(CsDeviceUserPO::getPrimaryUserId, userIndex).list(); + String number = CollectionUtils.isEmpty(list) ? "0" : "1"; return number; } diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackChatPO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackChatPO.java index e0bb00e..9c3d436 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackChatPO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackChatPO.java @@ -24,6 +24,8 @@ public class CsFeedbackChatPO extends BaseEntity { @TableField(value = "user_id") private String userId; + @TableField(exist = false) + private String userName; /** * 消息内容 */ diff --git a/cs-system/cs-system-boot/pom.xml b/cs-system/cs-system-boot/pom.xml index 919a4a0..dd4bd84 100644 --- a/cs-system/cs-system-boot/pom.xml +++ b/cs-system/cs-system-boot/pom.xml @@ -60,6 +60,12 @@ dynamic-datasource-spring-boot-starter 3.5.1 + + com.njcn + user-api + 1.0.0 + compile + diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java index f621b8e..4504c85 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java @@ -17,16 +17,17 @@ import com.njcn.cssystem.service.CsFeedbackService; import com.njcn.cssystem.service.CsFilePathService; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; +import com.njcn.user.api.UserFeignClient; +import com.njcn.user.pojo.po.User; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -45,6 +46,8 @@ public class CsFeedbackServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<> (); queryWrapper.eq ("user_id",RequestUtil.getUserIndex()). eq (StringUtils.isNotBlank (csFeedbackQueryParm.getType ()),"type",csFeedbackQueryParm.getType ()). - eq (StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ()); + eq (StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ()).orderByDesc("create_time"); Page csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper); QueryWrapper csFeedbackChatPOQueryWrapper = new QueryWrapper<> (); List collect = csFeedbackPOPage.getRecords ( ).stream ( ).map (temp -> { @@ -113,9 +116,23 @@ public class CsFeedbackServiceImpl extends ServiceImpl csFeedbackChatPOQueryWrapper = new QueryWrapper(); - csFeedbackChatPOQueryWrapper.eq ("id", id).eq ("status", "1").orderByAsc ("create_time"); + csFeedbackChatPOQueryWrapper.eq ("id", id).eq ("status", "1").orderByDesc ("create_time"); List list1 = csFeedbackChatService.list (csFeedbackChatPOQueryWrapper); - csFeedbackDetailVO.setCsFeedbackChatPOList (list1); + + List collect1 = list1.stream().map(CsFeedbackChatPO::getUserId).distinct().collect(Collectors.toList()); + Map collect2; + if(!CollectionUtils.isEmpty(collect1)){ + List userTem = userFeignClient.getUserByIdList(collect1).getData(); + collect2 = userTem.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2)); + + } else { + collect2 = new HashMap<>(); + } + list1.stream().forEach(temp ->{ + temp.setUserName(collect2.get(temp.getUserId())); + }); + + csFeedbackDetailVO.setCsFeedbackChatPOList (list1); return csFeedbackDetailVO; } }