zoujiajian 3 tahun lalu
induk
melakukan
12332ebc1d

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/corp/CorpMsgBulkTaskService.java

@@ -16,7 +16,7 @@ import java.util.Map;
 public interface CorpMsgBulkTaskService extends IService<CorpMsgBulkTask> {
 	void saveOrUpdateMsgBulkTask(CorpMsgBulkTask corpMsgBulkTask) throws Exception;
 
-	void remindBulkTask(Long id);
+	void remindBulkTask(String msgid);
 
 	Map<String, List<CorpTag>> getTagDetail(Long id) throws Exception;
 }

+ 9 - 16
netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpMsgBulkTaskServiceImpl.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.task.GlobalThreadPoolTaskExecutor;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.StringUtil;
@@ -105,22 +104,16 @@ public class CorpMsgBulkTaskServiceImpl extends ServiceImpl<CorpMsgBulkTaskMappe
 	}
 
 	@Override
-	public void remindBulkTask(Long id) {
-		List<CorpMsgBulkTaskRecord> corpMsgBulkTaskRecords = corpMsgBulkTaskRecordMapper.selectList(Wrappers.lambdaQuery(CorpMsgBulkTaskRecord.class)
-				.eq(CorpMsgBulkTaskRecord::getTaskId, id)
-				.eq(CorpMsgBulkTaskRecord::getStatus, false));
-		if (CollUtil.isEmpty(corpMsgBulkTaskRecords)) {
-			throw BusinessRuntimeException.getInstance("该群发任务已发送");
+	public void remindBulkTask(String msgid) {
+		CorpMsgBulkTaskRecord corpMsgBulkTaskRecord = corpMsgBulkTaskRecordMapper.selectOne(Wrappers.lambdaQuery(CorpMsgBulkTaskRecord.class)
+				.eq(CorpMsgBulkTaskRecord::getMsgid, msgid).last("limit 1"));
+		if (corpMsgBulkTaskRecord == null) return;
+		WxCorpApp wxCorpApp = wxCorpAppMapper.selectById(corpMsgBulkTaskRecord.getCorpId());
+		try {
+			corpOps.remindBulkTask(msgid, wxCorpApp.getCorpId());
+		} catch (Exception e) {
+			log.error("提醒群发任务:{}失败:{}", msgid, StringUtil.getErrorText(e));
 		}
-		corpMsgBulkTaskRecords.forEach(corpMsgBulkTaskRecord -> {
-			String msgid = corpMsgBulkTaskRecord.getMsgid();
-			WxCorpApp wxCorpApp = wxCorpAppMapper.selectById(corpMsgBulkTaskRecord.getCorpId());
-			try {
-				corpOps.remindBulkTask(msgid, wxCorpApp.getCorpId());
-			} catch (Exception e) {
-				log.error("提醒群发任务:{}失败:{}", id, StringUtil.getErrorText(e));
-			}
-		});
 	}
 
 	@Override

+ 3 - 3
netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/CorpMsgBulkTaskController.java

@@ -161,9 +161,9 @@ public class CorpMsgBulkTaskController {
 	/**
 	 * 提醒群发
 	 */
-	@PutMapping("/remind/{id}")
-	public Result<String> remindBulkTask(@PathVariable Long id) {
-		corpMsgBulkTaskService.remindBulkTask(id);
+	@PutMapping("/remind/{msgid}")
+	public Result<String> remindBulkTask(@PathVariable String msgid) {
+		corpMsgBulkTaskService.remindBulkTask(msgid);
 		return GatewayResponse.SUCCESS.newBuilder().toResult("提醒群发成功");
 	}
 }