rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 一些调整

This commit is contained in:
曹鹏飞 2025-02-12 20:30:31 +08:00
parent eaa887e417
commit 7690c9128e
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.nflg.mobilebroken.repository.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -7,10 +8,16 @@ import com.nflg.mobilebroken.common.pojo.request.AppMessageSearchRequest;
import com.nflg.mobilebroken.common.pojo.vo.AppMessageVO;
import com.nflg.mobilebroken.repository.entity.AppMessage;
import com.nflg.mobilebroken.repository.mapper.AppMessageMapper;
import com.nflg.mobilebroken.repository.service.IAdminUserService;
import com.nflg.mobilebroken.repository.service.IAppMessageService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@ -23,6 +30,9 @@ import java.util.List;
@Service
public class AppMessageServiceImpl extends ServiceImpl<AppMessageMapper, AppMessage> implements IAppMessageService {
@Resource
private IAdminUserService adminUserService;
@Override
public IPage<AppMessageVO> getNotReadMessage(Integer userId, Integer num) {
return baseMapper.getNotReadMessage(userId, num, new Page<>(1, num));
@ -30,7 +40,24 @@ public class AppMessageServiceImpl extends ServiceImpl<AppMessageMapper, AppMess
@Override
public IPage<AppMessageVO> search(Integer userId, AppMessageSearchRequest request) {
return baseMapper.search(userId, request.getTitle(), new Page<>(request.getPage(), request.getPageSize()));
IPage<AppMessageVO> datas = baseMapper.search(userId, request.getTitle(), new Page<>(request.getPage(), request.getPageSize()));
Map<Integer, String> userMap = new HashMap<>();
datas.getRecords().forEach(d -> {
if (StrUtil.isNotBlank(d.getTicketHandleBy())) {
List<Integer> userIds = StrUtil.split(d.getTicketHandleBy(), ",").stream().map(Integer::parseInt).collect(Collectors.toList());
List<String> handers = new ArrayList<>();
userIds.forEach(uId -> {
String name = userMap.get(uId);
if (StrUtil.isBlank(name)) {
name = adminUserService.getById(uId).getUserName();
userMap.put(uId, name);
}
handers.add(name);
});
d.setTicketHandleBy(StrUtil.join(",", handers));
}
});
return datas;
}
@Override

2
nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
View File

@ -4,7 +4,7 @@
<sql id="searchWhereCondition">
<if test="request.title!=null and request.title!=''">
AND t.title LIKE CONCAT('%', #{request.title}, '%')
AND (t.title LIKE CONCAT('%', #{request.title}, '%') OR t.no LIKE CONCAT('%', #{request.title}, '%'))
</if>
<if test="request.deviceNo!=null and request.deviceNo!=''">
AND t.device_no LIKE CONCAT('%', #{request.deviceNo}, '%')