Commit 53c02d66 authored by 黎博's avatar 黎博

定时任务新增apollo配置判断

parent c0647aac
...@@ -5,12 +5,9 @@ import cn.qg.holmes.entity.jira.SendScheduleVo; ...@@ -5,12 +5,9 @@ import cn.qg.holmes.entity.jira.SendScheduleVo;
import cn.qg.holmes.service.jira.JiraIssueService; import cn.qg.holmes.service.jira.JiraIssueService;
import cn.qg.holmes.utils.DingdingUtils; import cn.qg.holmes.utils.DingdingUtils;
import com.atlassian.jira.rest.client.api.domain.Issue; import com.atlassian.jira.rest.client.api.domain.Issue;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@Slf4j
@CrossOrigin @CrossOrigin
@RestController @RestController
@RequestMapping("/jira") @RequestMapping("/jira")
...@@ -19,9 +16,6 @@ public class JiraController { ...@@ -19,9 +16,6 @@ public class JiraController {
@Autowired @Autowired
JiraIssueService jiraIssueService; JiraIssueService jiraIssueService;
@Value("${task.debug}")
private String taskDebug;
@GetMapping("/report/project") @GetMapping("/report/project")
public void sendReportToDingdingGroup(String project, String webhook) throws Exception { public void sendReportToDingdingGroup(String project, String webhook) throws Exception {
Iterable<Issue> issues = jiraIssueService.getUnsolvedIssueListByProject(project); Iterable<Issue> issues = jiraIssueService.getUnsolvedIssueListByProject(project);
...@@ -41,13 +35,4 @@ public class JiraController { ...@@ -41,13 +35,4 @@ public class JiraController {
String markdownMsg = DingdingUtils.buildTestScheduleMarkdownMsg(issues, sendScheduleVo.getProgress(), sendScheduleVo.getRisk()); String markdownMsg = DingdingUtils.buildTestScheduleMarkdownMsg(issues, sendScheduleVo.getProgress(), sendScheduleVo.getRisk());
return JsonResult.buildSuccessResult(DingdingUtils.sendToDingding(markdownMsg, sendScheduleVo.getWebhook())); return JsonResult.buildSuccessResult(DingdingUtils.sendToDingding(markdownMsg, sendScheduleVo.getWebhook()));
} }
@GetMapping("/test")
public void test() {
if (taskDebug.equals("true")) {
log.info("true");
} else {
log.info("false");
}
}
} }
...@@ -22,15 +22,22 @@ public class JiraToDingding { ...@@ -22,15 +22,22 @@ public class JiraToDingding {
@Value("${sjgd.ding.url}") @Value("${sjgd.ding.url}")
private String sjgdDingUrl; private String sjgdDingUrl;
@Value("${task.debug}")
private String taskDebug;
/** /**
* 数据工单bug统计 * 数据工单bug统计
* @throws Exception * @throws Exception
*/ */
@Scheduled(cron = "0 0 19 * * ?") @Scheduled(cron = "0 0 19 * * ?")
public void SJGDJiraIssueStatisticsTimedJob() throws Exception { public void SJGDJiraIssueStatisticsTimedJob() throws Exception {
log.info("开始执行数据工单BUG统计定时任务!"); if (taskDebug.equals("true")) {
Iterable<Issue> issues = jiraIssueService.getUnsolvedIssueListByProject("SJGD"); log.info("开始执行数据工单BUG统计定时任务!");
String markdownMsg = DingdingUtils.buildMarkdownMsgForUnsolvedIssueList(issues); Iterable<Issue> issues = jiraIssueService.getUnsolvedIssueListByProject("SJGD");
DingdingUtils.sendToDingding(markdownMsg, sjgdDingUrl); String markdownMsg = DingdingUtils.buildMarkdownMsgForUnsolvedIssueList(issues);
DingdingUtils.sendToDingding(markdownMsg, sjgdDingUrl);
} else {
log.info("当前部署的是mock,不执行定时任务!");
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment