Skip to content

D
device-back
提交 a0d70d0c authored 作者: 邓砥奕's avatar 邓砥奕
浏览文件
操作

更新

上级 87c9f36a
显示空白字符变更
内嵌 并排
正在显示 包含 45 行增加 和 301 行删除
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBackBillController.java deleted 100644 → 0
浏览文件 @ 87c9f36a
package com.tykj.dev.device.allot.controller;
import com.tykj.dev.config.swagger.AutoDocument;
import com.tykj.dev.device.allot.service.AllotBackBillService;
import com.tykj.dev.device.allot.service.AllotBillService;
import com.tykj.dev.device.allot.subject.domin.AllotBackBill;
import com.tykj.dev.device.allot.subject.domin.AllotBill;
import com.tykj.dev.device.allot.subject.vo.AllotBackBillSaveVo;
import com.tykj.dev.device.allot.subject.vo.AllotBackReceiveVo;
import com.tykj.dev.device.allot.subject.vo.AllotReceiveConfirmVo;
import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
import com.tykj.dev.device.library.subject.vo.FileVo;
import com.tykj.dev.device.task.service.TaskService;
import com.tykj.dev.device.task.subject.bto.TaskBto;
import com.tykj.dev.device.user.read.service.MessageService;
import com.tykj.dev.device.user.read.subject.bto.MessageBto;
import com.tykj.dev.device.user.subject.dao.UserDao;
import com.tykj.dev.device.user.subject.entity.User;
import com.tykj.dev.device.user.subject.service.UserPublicService;
import com.tykj.dev.device.user.util.UserUtils;
import com.tykj.dev.misc.base.ResultObj;
import com.tykj.dev.misc.utils.Snowflake;
import com.tykj.dev.misc.utils.StringSplitUtil;
import com.tykj.dev.rfid.service.InputOutputDeviceService;
import com.tykj.dev.socket.MyWebSocket;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author dengdiyi
*/
@RestController
@RequestMapping(value = "/allot")
@AutoDocument
@Api(tags = "装备配发模块", description = "装备配发接口")
@Slf4j
public class AllotBackBillController {
@Autowired
private TaskService taskService;
@Autowired
private UserUtils userUtils;
@Autowired
private AllotBackBillService allotBackBillService;
@Autowired
private UserPublicService userPublicService;
@Autowired
private DeviceLibraryService deviceLibraryService;
@Autowired
private DeviceLogService deviceLogService;
@Autowired
private MyWebSocket myWebSocket;
@Autowired
private AllotBillService allotBillService;
@Autowired
private Snowflake snowflake;
@Autowired
private InputOutputDeviceService inputOutputDeviceService;
@Autowired
private UserDao userDao;
@Autowired
private MessageService messageService;
@ApiOperation(value = "发起配发退回业务", notes = "可以通过这个接口发起配发退回任务")
@PostMapping(value = "/back")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity allotBack(@RequestBody @Validated AllotBackBillSaveVo allotBackBillSaveVo) {
//获取当前配发退回task
TaskBto taskBto = taskService.get(allotBackBillSaveVo.getTaskId());
//获取父配发业务
TaskBto fatherTask = taskService.get(taskBto.getParentTaskId());
//获取配发单
AllotBill allotBill = allotBillService.getOne(fatherTask.getBillId());
//更改未勾选装备的状态
List<Integer> receiveDeviceIds = StringSplitUtil.split(allotBill.getReceiveCheckDetail());
List<Integer> backDeviceIds = StringSplitUtil.split(allotBackBillSaveVo.getBackCheckDetail());
receiveDeviceIds.removeAll(backDeviceIds);
receiveDeviceIds.forEach(integer -> {
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(integer);
deviceLibraryEntity.setLifeStatus(2);
deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
deviceLibraryEntity.setManageStatus(1);
DeviceLogDto deviceLogDto = new DeviceLogDto(integer, "审核成功并入库", null);
deviceLogService.addLog(deviceLogDto);
deviceLibraryService.update(deviceLibraryEntity);
});
//生成发件单位电子签章id
Long signId = snowflake.creatNextId();
Long signId2 = snowflake.creatNextId();
//存储退回单
AllotBackBill allotBackBill = allotBackBillSaveVo.toDo();
allotBackBill.setAllotBillId(taskBto.getBillId());
allotBackBill.setSendUseraId(userUtils.getCurrentUserId());
allotBackBill.setLeftSignatureId(signId.toString());
allotBackBill.setRightSignatureId(signId2.toString());
AllotBackBill allotBackBill1 = allotBackBillService.addEntity(allotBackBill);
Calendar calendar = Calendar.getInstance();
calendar.setTime(allotBackBill1.getCreateTime());
int year = calendar.get(Calendar.YEAR);
String num = "NO:第" + year + "TH" + allotBackBill1.getId() + "号";
allotBackBill1.setNum(num);
//发起子任务
taskBto.setBillId(allotBackBill1.getId());
taskBto.setOwnUnit(userPublicService.findUnitIdByName(allotBackBill1.getReceiveUnit()));
TaskBto taskBto1 = taskService.moveToNext(taskBto, allotBackBill1.getReceiveUseraId());
//改变装备状态
List<FileVo> fileVoList = new ArrayList<>();
if (allotBackBillSaveVo.getFileName() != null && allotBackBillSaveVo.getFileUrl() != null) {
fileVoList.add(new FileVo("出库确认单", allotBackBillSaveVo.getFileName(), allotBackBillSaveVo.getFileUrl()));
}
String[] strings = allotBackBill1.getBackCheckDetail().split("x");
List<Integer> ids = new ArrayList<>();
for (String s : strings) {
//改变出库无误的装备的状态
if (s.length() >= 2 && "1".equals(s.substring(s.length() - 1))) {
Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
ids.add(id);
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLifeStatus(3);
//记录装备日志
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "配发退回出库", fileVoList);
deviceLogService.addLog(deviceLogDto);
deviceLibraryService.update(deviceLibraryEntity);
}
}
//添加出库白名单
inputOutputDeviceService.addWhiteDevices(ids,userUtils.getCurrentUnitId(),1);
log.info("[配发模块]:配发退回出库");
myWebSocket.sendMessage1();
return ResponseEntity.ok(new ResultObj<>(taskBto1, signId.toString()));
}
@ApiOperation(value = "配发退回接收", notes = "可以通过这个接口配发退回接收")
@PostMapping(value = "/back/receive")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity allotBackReceive(@RequestBody @Validated AllotBackReceiveVo allotBackReceiveVo) {
//获取当前任务和账单
TaskBto taskBto = taskService.get(allotBackReceiveVo.getTaskId());
taskService.addInvolveUser(taskBto, userUtils.getCurrentUserId());
AllotBackBill allotBackBill = allotBackBillService.getOne(taskBto.getBillId());
//更改账单状态
allotBackBill.setBackStatus(3);
allotBackBill.setReceiveUseraId(userUtils.getCurrentUserId());
BeanUtils.copyProperties(allotBackReceiveVo, allotBackBill);
//任务推至完结
taskService.moveToEnd(taskBto);
// taskService.moveToNext(taskBto, allotBackReceiveVo.getReceiveUserbId());
//分隔装备id信息
List<FileVo> fileVoList = new ArrayList<>();
if (allotBackReceiveVo.getBillFileName()!=null&&allotBackReceiveVo.getBillFileUrl()!=null) {
fileVoList.add(new FileVo("退回单", allotBackReceiveVo.getBillFileName(), allotBackReceiveVo.getBillFileUrl()));
}
// fileVoList.add(new FileVo("入库确认单", allotBackReceiveVo.getReceiveFileName(), allotBackReceiveVo.getReceiveFileUrl()));
String deviceIdDetail = allotBackReceiveVo.getReceiveCheckDetail();
if (deviceIdDetail != null) {
String[] strings = deviceIdDetail.split("x");
for (String s : strings) {
if (s.length() >= 2) {
//接收无误
if ("1".equals(s.substring(s.length() - 1))) {
Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
//改变装备状态
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLifeStatus(2);
deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
deviceLibraryEntity.setManageStatus(1);
deviceLibraryEntity.setLocationUnit(userUtils.getCurrentUserUnitName());
//存装备日志
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收配发退回装备", fileVoList);
deviceLogService.addLog(deviceLogDto);
deviceLibraryService.update(deviceLibraryEntity);
}
//接收缺失
if ("0".equals(s.substring(s.length() - 1))) {
Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
//改变装备状态
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLifeStatus(11);
//存装备日志
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "接收配发退回装备丢失", fileVoList);
deviceLogService.addLog(deviceLogDto);
deviceLibraryService.update(deviceLibraryEntity);
}
}
}
}
//发送阅知信息
List<Integer> ids = userPublicService.findOtherUser(userUtils.getCurrentUserId());
ids.addAll(userDao.findAllByUnitsId(userPublicService.findUnitIdByName(allotBackBill.getSendUnit())).stream()
.map(User::getUserId)
.collect(Collectors.toList()));
MessageBto messageBto = new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"接收配发退回装备",ids,1);
messageService.add(messageBto);
log.info("[配发模块]:配发退回接收入库");
myWebSocket.sendMessage1();
return ResponseEntity.ok("配发退回接收入库");
}
@ApiOperation(value = "配发退回接收审核", notes = "可以通过这个接口配发退回接收审核")
@PostMapping(value = "/back/receive/confirm")
@Transactional(rollbackFor = Exception.class)
public ResponseEntity backReceiveConfirm(@RequestBody @Validated AllotReceiveConfirmVo allotReceiveConfirmVo) {
//获取当前的账单和任务
TaskBto taskBto = taskService.get(allotReceiveConfirmVo.getTaskId());
AllotBackBill allotBackBill = allotBackBillService.getOne(taskBto.getBillId());
String deviceIdDetail = allotBackBill.getReceiveCheckDetail();
String[] strings = deviceIdDetail.split("x");
//审核通过
if (allotReceiveConfirmVo.getStatus() == 0) {
//业务完结
taskService.update(taskService.moveToEnd(taskBto));
//更新账单
allotBackBill.setBackStatus(3);
allotBackBillService.update(allotBackBill);
for (String s : strings) {
//改变接收无误的装备的状态
if (s.length() >= 2 && "1".equals(s.substring(s.length() - 1))) {
Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLifeStatus(2);
deviceLibraryEntity.setOwnUnit(userUtils.getCurrentUserUnitName());
deviceLibraryEntity.setManageStatus(1);
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "审核成功并入库", null);
deviceLogService.addLog(deviceLogDto);
deviceLibraryService.update(deviceLibraryEntity);
}
}
log.info("[配发模块]:配发退回审核成功并入库");
myWebSocket.sendMessage1();
return ResponseEntity.ok("审核成功");
}
//审核失败
if (allotReceiveConfirmVo.getStatus() == 1) {
//业务封存
taskService.update(taskService.moveToArchive(taskBto));
//更新账单状态
AllotBackBill allotBackBill1 = allotBackBillService.getOne(taskBto.getBillId());
allotBackBill1.setBackStatus(2);
allotBackBillService.update(allotBackBill1);
for (String s : strings) {
//改变接收无误的装备的状态
if (s.length() >= 2 && "1".equals(s.substring(s.length() - 1))) {
Integer id = Integer.parseInt(s.substring(0, s.length() - 1));
DeviceLibrary deviceLibraryEntity = deviceLibraryService.getOne(id);
deviceLibraryEntity.setLifeStatus(1);
DeviceLogDto deviceLogDto = new DeviceLogDto(id, "配发退回入库审核失败", null);
deviceLogService.addLog(deviceLogDto);
deviceLibraryService.update(deviceLibraryEntity);
}
}
log.info("[配发模块]:配发退回入库审核失败");
myWebSocket.sendMessage1();
return ResponseEntity.ok("配发退回接收入库审核失败");
} else {
return ResponseEntity.ok("status只能为0或1");
}
}
}
dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java
浏览文件 @ a0d70d0c
......@@ -232,9 +232,9 @@ public class AllotBillController {
if (allotBillSaveVo.getAllotType() == 1){
if (deviceLibraryEntity.getMatchingRange()!=1){
PackingLibrary packingLibrary = packingLibraryService.getOne(deviceLibraryEntity.getPackingId());
PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(),1);
PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(),1,packingLibrary.getType(),packingLibrary.getStyle(),packingLibrary.getName(),packingLibrary.getSecretLevel(),packingLibrary.getInvisibleRange());
if (packingLibrary1==null){
throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为"+deviceLibraryEntity.getSeqNumber()+"的装备所属列装不存在配用范围为省对下纵向的列装装备")));
throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为"+deviceLibraryEntity.getSeqNumber()+"的装备所属列装不存在配用范围为省对下纵向的相同列装装备")));
}
else {
deviceLibraryEntity.setPackingId(packingLibrary1.getId());
......@@ -255,9 +255,9 @@ public class AllotBillController {
}
else {
PackingLibrary packingLibrary = packingLibraryService.getOne(deviceLibraryEntity.getPackingId());
PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(), 3);
PackingLibrary packingLibrary1 = packingLibraryService.findSamePacking(packingLibrary.getPartParentId(), 3,packingLibrary.getType(),packingLibrary.getStyle(),packingLibrary.getName(),packingLibrary.getSecretLevel(),packingLibrary.getInvisibleRange());
if (packingLibrary1 == null) {
throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为" + deviceLibraryEntity.getSeqNumber() + "的装备所属列装不存在配用范围为省对下横向的列装装备")));
throw new ApiException(ResponseEntity.status(20000).body(new ResultObj("序列号为" + deviceLibraryEntity.getSeqNumber() + "的装备所属列装不存在配用范围为省对下横向的相同列装装备")));
}
else {
changeMap.put(deviceLibraryEntity.getPackingId(),packingLibrary1.getId());
......
dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBackBillServiceImpl.java
浏览文件 @ a0d70d0c
......@@ -152,7 +152,7 @@ public class AllotBackBillServiceImpl implements AllotBackBillService {
predicateBuilder.gt("sendTime", allotBillSelectVo.getStartTime());
}
if (allotBillSelectVo.getEndTime() != null) {
predicateBuilder.lt("receiveTime", allotBillSelectVo.getEndTime());
predicateBuilder.lt("sendTime", allotBillSelectVo.getEndTime());
}
predicateBuilder.eq("backStatus", 3);
}
......
dev-allot/src/main/java/com/tykj/dev/device/allot/service/impl/AllotBillServiceImpl.java
浏览文件 @ a0d70d0c
......@@ -155,7 +155,7 @@ public class AllotBillServiceImpl implements AllotBillService {
predicateBuilder.gt("sendTime", allotBillSelectVo.getStartTime());
}
if (allotBillSelectVo.getEndTime() != null) {
predicateBuilder.lt("receiveTime", allotBillSelectVo.getEndTime());
predicateBuilder.lt("sendTime", allotBillSelectVo.getEndTime());
}
predicateBuilder.eq("allotStatus", 5);
}
......
dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBillSaveVo.java
浏览文件 @ a0d70d0c
......@@ -102,25 +102,38 @@ public class AllotBillSaveVo {
@ApiModelProperty(value = "是否盖章(1:是，0:否)")
private Integer isSigned;
@ApiModelProperty(value = "单据保存vo")
private List<ScriptSaveVo> scriptSaveVos;
/**
* 转为配发单实体
*/
public AllotBill toDo() {
AllotBill allotBillEntity = new AllotBill();
//相同属性复制
BeanUtils.copyProperties(this, allotBillEntity);
//批复文号文件
if(this.replyFiles!=null){
allotBillEntity.setReplyFiles(FilesUtil.stringFileToList(this.replyFiles));
}
//申请文号文件
if(this.applyFiles!=null){
allotBillEntity.setApplyFiles(FilesUtil.stringFileToList(this.applyFiles));
}
//配发状态为配发中
allotBillEntity.setAllotStatus(2);
//发件时间为当前时间
allotBillEntity.setSendTime(TimestampUtil.getCurrentTimestamp());
//单据数据保存
if (this.scriptSaveVos!=null){
allotBillEntity.setScriptJson(JacksonUtil.toJSon(scriptSaveVos));
}
return allotBillEntity;
}
/**
* 转为退回单实体
*/
public AllotBackBill toBackDo() {
AllotBackBill allotBillEntity = new AllotBackBill();
BeanUtils.copyProperties(this, allotBillEntity);
......
dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java
浏览文件 @ a0d70d0c
......@@ -137,5 +137,14 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
@Query("update DeviceLibrary o set o.rfidSurfaceId = o.seqNumber ,o.updateTime=current_timestamp where o.id in :idList")
int upDateRfidSurfaceIdAsSeqNumber(@Param("idList") List<Integer> idList);
@Transactional
@Modifying
@Query("update DeviceLibrary o set o.name = :name ,o.updateTime=current_timestamp where o.packingId = :packingId")
int upDateName(String name,Integer packingId);
@Transactional
@Modifying
@Query("update DeviceLibrary o set o.matchingRange = :matchingRange ,o.updateTime=current_timestamp where o.packingId = :packingId")
int upDateMatchingRange(Integer matchingRange,Integer packingId);
}
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceChangeServiceImpl.java
浏览文件 @ a0d70d0c
......@@ -2,6 +2,7 @@ package com.tykj.dev.device.library.service.impl;
import com.tykj.dev.blockcha.subject.entity.BcHash;
import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
import com.tykj.dev.config.TaskBeanConfig;
import com.tykj.dev.device.library.repository.DeviceChangeDao;
import com.tykj.dev.device.library.service.DeviceChangeService;
import com.tykj.dev.device.library.subject.domin.DeviceChange;
......@@ -14,6 +15,7 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
/**
* @author dengdiyi
......@@ -30,11 +32,14 @@ public class DeviceChangeServiceImpl implements DeviceChangeService {
@Override
public DeviceChange add(DeviceChange deviceChange) {
DeviceChange deviceChange1 = deviceChangeDao.save(deviceChange);
BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceChange1));
CompletableFuture.runAsync(()->{
DeviceChange deviceChange2 = getOne(deviceChange1.getId());
BcHash bcText = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(deviceChange2));
String recordId = bcText.getData().getRecordID();
deviceChange1.setRecordId(recordId);
// blockChainUtil.appendHash(JacksonUtil.toJSon(deviceChange1),deviceChange1.getRecordId());
return deviceChangeDao.save(deviceChange1);
deviceChange2.setRecordId(recordId);
deviceChangeDao.save(deviceChange2);
}, TaskBeanConfig.getThreadPoolTaskScheduler());
return deviceChange1;
}
@Override
......
dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairController.java
浏览文件 @ a0d70d0c
......@@ -1758,6 +1758,7 @@ public class RepairController {
MessageBto messageBto1 = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为签发人", Collections.singletonList(fileVo.getStartUserbId()), 1);
messageService.add(messageBto1);
}
repairBackBill.setBackStatus(5);
deviceRepairBackBillService.update(repairBackBill);
List<Integer> ids = StringSplitUtil.split(repairBackBill.getBackCheckDetail());
//业务完结
......@@ -1867,6 +1868,8 @@ public class RepairController {
repairSendBill.setRepairUserbId(fileVo.getReceiveUserbId());
idList.add(fileVo.getReceiveUserbId());
}
repairBill.setRepairStatus(4);
repairSendBill.setRepairStatus(5);
deviceRepairBillService.update(repairBill);
deviceRepairSendBillService.update(repairSendBill);
List<Integer> ids = StringSplitUtil.split(repairSendBill.getRepairDeviceCheckDetail());
......
dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java
浏览文件 @ a0d70d0c
......@@ -139,7 +139,7 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
predicateBuilder.lt("createTime", deviceRepairBillSelectVo.getEndTime());
}
}
// predicateBuilder.eq("repairStatus", 5);
predicateBuilder.eq("backStatus", 5);
return predicateBuilder.build();
}
}
dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBillServiceImpl.java
浏览文件 @ a0d70d0c
......@@ -125,7 +125,7 @@ public class RepairBillServiceImpl implements RepairBillService {
predicateBuilder.lt("createTime", deviceRepairBillSelectVo.getEndTime());
}
}
// predicateBuilder.eq("repairStatus", 5);
predicateBuilder.eq("repairStatus", 4);
return predicateBuilder.build();
}
}
dev-user/src/main/java/com/tykj/dev/device/user/read/service/impl/MessageServiceImpl.java
浏览文件 @ a0d70d0c
......@@ -128,11 +128,12 @@ public class MessageServiceImpl implements MessageService {
public List<MessageUserVo> getNewList() {
List<MessageUserVo> messageUserVos = new ArrayList<>();
Integer userId = userUtils.getCurrentUserId();
UserRecord userRecord = userRecordDao.findByUserId(userId);
if (userRecord==null){
List<UserRecord> userRecords = userRecordDao.findAllByUserId(userId);
if (userRecords.isEmpty()){
return messageUserVos;
}
else {
UserRecord userRecord = userRecords.get(0);
List<Integer> newTaskIds = StringSplitUtil.userIdSplit(userRecord.getNewReadIds());
//筛选出新id的阅知
messageUserVos = messageDao.findAll().stream()
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论