提交 09c5e342 作者: yanxin

删除数据、启用专题逻辑修改

上级 be833953
...@@ -324,11 +324,12 @@ public class SubjectManageController { ...@@ -324,11 +324,12 @@ public class SubjectManageController {
@PostMapping("/updateStatus") @PostMapping("/updateStatus")
public Result<?> updateStatus(@RequestBody Subject subject) { public Result<?> updateStatus(@RequestBody Subject subject) {
subjectService.updateStatus(subject); subjectService.updateStatus(subject);
Subject byId = subjectService.getById(subject.getId());
xxlJobInfoService.update(Wrappers.<XxlJobInfo>lambdaUpdate() xxlJobInfoService.update(Wrappers.<XxlJobInfo>lambdaUpdate()
.eq(XxlJobInfo::getInfoSourceCode, subject.getSubjectCode()) .eq(XxlJobInfo::getInfoSourceCode, byId.getSubjectCode())
.set(XxlJobInfo::getTriggerStatus, subject.getStatus())); .set(XxlJobInfo::getTriggerStatus, byId.getStatus()));
if (subject.getStatus() == 1) { if (subject.getStatus() == 1) {
kafkaTemplate.send(SUBJECT_MODEL_KAFKA_CHANNEL, subject.getSubjectCode()); kafkaTemplate.send(SUBJECT_MODEL_KAFKA_CHANNEL, byId.getSubjectCode());
} }
return Result.OK(); return Result.OK();
} }
......
...@@ -29,5 +29,5 @@ public interface RemoteModelService { ...@@ -29,5 +29,5 @@ public interface RemoteModelService {
* @date 2025/2/7 * @date 2025/2/7
*/ */
@GetMapping("/modelArrange/clbBiz/delMiddelDataBySubjectId") @GetMapping("/modelArrange/clbBiz/delMiddelDataBySubjectId")
String removeMiddleDataRequest(@RequestParam("subjectId") String subjectId,@RequestHeader HttpHeaders headers); String removeMiddleDataRequest(@RequestParam("subjectId") String subjectId);
} }
...@@ -442,13 +442,8 @@ public class SubjectSimpleServiceImpl implements SubjectSimpleService { ...@@ -442,13 +442,8 @@ public class SubjectSimpleServiceImpl implements SubjectSimpleService {
boolQuery.must(QueryBuilders.termQuery("subjectId.keyword", subjectId)); boolQuery.must(QueryBuilders.termQuery("subjectId.keyword", subjectId));
esOpUtil.docDeleteByQuery(Constants.SUBJECT_INDEX, boolQuery); esOpUtil.docDeleteByQuery(Constants.SUBJECT_INDEX, boolQuery);
}); });
UserVo loginUser = UserUtil.getLoginUser(); remoteModelService.removeMiddleDataRequest(subjectId);
CompletableFuture.runAsync(() ->{ log.info("专题-{},删除中间库数据请求发送成功", subjectId);
HttpHeaders headers = new HttpHeaders();
headers.set("loginUser", JSON.toJSONString(loginUser));
remoteModelService.removeMiddleDataRequest(subjectId, headers);
log.info("专题-{},删除中间库数据请求发送成功", subjectId);
});
} }
//目标集合按照另一个集合的顺序排序 //目标集合按照另一个集合的顺序排序
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论