hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-12 20:36:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加批次操作

Browse Source
This commit is contained in:
Guava
2023-07-03 15:43:11 +08:00
parent 7c2a0fc15d
commit 476d79fa7e
5 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java
View File

@@ -269,7 +269,7 @@ public class CasesRecommendApi extends ApiBaseController {
if (StringUtils.isEmpty(casesRecommendPushVo.getCasesRecommendId())) { if (StringUtils.isEmpty(casesRecommendPushVo.getCasesRecommendId())) {
throw new RuntimeException("缺少必要参数"); throw new RuntimeException("缺少必要参数");
} }
iCasesRecommendService.rePushOrWithdraw(casesRecommendPushVo); iCasesRecommendService.rePushOrWithdraw(casesRecommendPushVo,getCurrent().getAccountId());
return success(true); return success(true);
} }

2
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendService.java
View File

@@ -32,6 +32,6 @@ public interface ICasesRecommendService {
* 撤回或者重新推送 * 撤回或者重新推送
* @param casesRecommendPushVo * @param casesRecommendPushVo
*/ */
void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo); void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo,String userId);
} }

2
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java
View File

@@ -217,6 +217,7 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
message.setIsRead(false); message.setIsRead(false);
message.setMsgTime(LocalDateTime.now()); message.setMsgTime(LocalDateTime.now());
message.setRefId(pushRecords.get(0).getRecommendId()); message.setRefId(pushRecords.get(0).getRecommendId());
message.setBatchId(pushRecords.get(0).getRecommendId());
message.setRefType("99"); message.setRefType("99");
message.setSendName(pushRecords.get(0).getSysCreateBy()); message.setSendName(pushRecords.get(0).getSysCreateBy());
message.setSendType(1); message.setSendType(1);
@@ -258,6 +259,7 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
message.setIsRead(false); message.setIsRead(false);
message.setMsgTime(LocalDateTime.now()); message.setMsgTime(LocalDateTime.now());
message.setRefId(casesRecommendPushRecord.getId()); message.setRefId(casesRecommendPushRecord.getId());
message.setBatchId(casesRecommendPushRecord.getRecommendId());
message.setRefType("99"); message.setRefType("99");
message.setSendName(casesRecommendPushRecord.getSysCreateBy()); message.setSendName(casesRecommendPushRecord.getSysCreateBy());
message.setSendType(1); message.setSendType(1);

27
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.xboe.module.boecase.service.ICasesRecommendPushRecordService;
import com.xboe.module.boecase.service.ICasesRecommendService; import com.xboe.module.boecase.service.ICasesRecommendService;
import com.xboe.module.boecase.vo.CasesRecommendPushVo; import com.xboe.module.boecase.vo.CasesRecommendPushVo;
import com.xboe.module.boecase.vo.CasesRecommendVo; import com.xboe.module.boecase.vo.CasesRecommendVo;
import com.xboe.system.user.dao.MessageDao;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -25,19 +26,22 @@ public class CasesRecommendServiceImpl implements ICasesRecommendService {
@Resource @Resource
private CasesRecommendDao casesRecommendDao; private CasesRecommendDao casesRecommendDao;
@Resource
private MessageDao dao;
@Resource @Resource
private ICasesRecommendPushRecordService iCasesRecommendPushRecordService; private ICasesRecommendPushRecordService iCasesRecommendPushRecordService;
@Override @Override
public PageList<CasesRecommend> page(int pageIndex, int pageSize, CasesRecommendVo casesRecommendVo) { public PageList<CasesRecommend> page(int pageIndex, int pageSize, CasesRecommendVo casesRecommendVo) {
QueryBuilder query=QueryBuilder.from(CasesRecommend.class); QueryBuilder query = QueryBuilder.from(CasesRecommend.class);
query.addFilter(FieldFilters.eq("deleted",false)); query.addFilter(FieldFilters.eq("deleted", false));
if(StringUtils.isNotBlank(casesRecommendVo.getRecommendName())){ if (StringUtils.isNotBlank(casesRecommendVo.getRecommendName())) {
query.addFilter(FieldFilters.like("recommend_by", LikeMatchMode.ANYWHERE, casesRecommendVo.getRecommendName())); query.addFilter(FieldFilters.like("recommend_by", LikeMatchMode.ANYWHERE, casesRecommendVo.getRecommendName()));
} }
if(!CollectionUtils.isEmpty(casesRecommendVo.getRecommendTimeList())){ if (!CollectionUtils.isEmpty(casesRecommendVo.getRecommendTimeList())) {
query.addFilter(FieldFilters.ge("recommend_time",casesRecommendVo.getRecommendTimeList().get(0))); query.addFilter(FieldFilters.ge("recommend_time", casesRecommendVo.getRecommendTimeList().get(0)));
query.addFilter(FieldFilters.le("recommend_time",casesRecommendVo.getRecommendTimeList().get(1))); query.addFilter(FieldFilters.le("recommend_time", casesRecommendVo.getRecommendTimeList().get(1)));
} }
query.addOrder(OrderCondition.desc("sys_create_time")); query.addOrder(OrderCondition.desc("sys_create_time"));
@@ -58,19 +62,22 @@ public class CasesRecommendServiceImpl implements ICasesRecommendService {
} }
@Override @Override
public void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo) { public void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo, String userId) {
// 查询 // 查询
CasesRecommend db = casesRecommendDao.get(casesRecommendPushVo.getCasesRecommendId()); CasesRecommend db = casesRecommendDao.get(casesRecommendPushVo.getCasesRecommendId());
if (CasesPushStatusEnum.PUSH_SUCCESS.getStatus().equals(db.getPushProgress()) if (CasesPushStatusEnum.PUSH_SUCCESS.getStatus().equals(db.getPushProgress())
|| CasesPushStatusEnum.WAIT_PUSH.getStatus().equals(db.getPushProgress()) || CasesPushStatusEnum.WAIT_PUSH.getStatus().equals(db.getPushProgress())
|| CasesPushStatusEnum.PUSH_ING.getStatus().equals(db.getPushProgress()) || CasesPushStatusEnum.PUSH_ING.getStatus().equals(db.getPushProgress())
){ ) {
// 当为推送成功时为 // 当为推送成功时为
iCasesRecommendPushRecordService.rePushOrWithdraw(true, db); iCasesRecommendPushRecordService.rePushOrWithdraw(true, db);
db.setPushProgress(CasesPushStatusEnum.PUSH_REVOKE.getStatus()); db.setPushProgress(CasesPushStatusEnum.PUSH_REVOKE.getStatus());
casesRecommendDao.update(db); casesRecommendDao.update(db);
}else if (CasesPushStatusEnum.PUSH_FAIL.getStatus().equals(db.getPushProgress()) dao.deleteByFilter(FieldFilters.eq("acceptId", userId), FieldFilters.eq("refType", "99"),
|| CasesPushStatusEnum.PUSH_REVOKE.getStatus().equals(db.getPushProgress())){ FieldFilters.eq("batchId", casesRecommendPushVo.getCasesRecommendId()));
} else if (CasesPushStatusEnum.PUSH_FAIL.getStatus().equals(db.getPushProgress())
|| CasesPushStatusEnum.PUSH_REVOKE.getStatus().equals(db.getPushProgress())) {
// 推送失败或者已撤回时 // 推送失败或者已撤回时
iCasesRecommendPushRecordService.rePushOrWithdraw(false, db); iCasesRecommendPushRecordService.rePushOrWithdraw(false, db);
} }

18
servers/boe-server-all/src/main/java/com/xboe/system/user/entity/Message.java
View File

@@ -1,18 +1,16 @@
package com.xboe.system.user.entity; package com.xboe.system.user.entity;
import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.xboe.core.SysConstant; import com.xboe.core.SysConstant;
import com.xboe.core.orm.IdEntity; import com.xboe.core.orm.IdEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@@ -120,4 +118,10 @@ public class Message extends IdEntity {
@Column(name = "is_read") @Column(name = "is_read")
private Boolean isRead; private Boolean isRead;
/**
* 批次号
*/
@Column(name = "batch_id")
private String batchId;
} }