Commit 0fdc10c2 authored by 黎博's avatar 黎博

新增保存测试流程时的同志

parent 6f4500ad
...@@ -6,9 +6,12 @@ import cn.qg.holmes.entity.auth.UserInfoVo; ...@@ -6,9 +6,12 @@ import cn.qg.holmes.entity.auth.UserInfoVo;
import cn.qg.holmes.entity.gitlab.DingRobotPipelineVo; import cn.qg.holmes.entity.gitlab.DingRobotPipelineVo;
import cn.qg.holmes.entity.gitlab.Pipeline; import cn.qg.holmes.entity.gitlab.Pipeline;
import cn.qg.holmes.entity.quality.DingRobot; import cn.qg.holmes.entity.quality.DingRobot;
import cn.qg.holmes.entity.quality.SubmitTestInstruction;
import cn.qg.holmes.service.auth.TokenService; import cn.qg.holmes.service.auth.TokenService;
import cn.qg.holmes.service.gitlab.PipelineService; import cn.qg.holmes.service.gitlab.PipelineService;
import cn.qg.holmes.service.quality.DingRobotService; import cn.qg.holmes.service.quality.DingRobotService;
import cn.qg.holmes.service.quality.SubmitTestInstructionService;
import cn.qg.holmes.utils.DingdingUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -42,6 +45,9 @@ public class PipelineController { ...@@ -42,6 +45,9 @@ public class PipelineController {
@Autowired @Autowired
TokenService tokenService; TokenService tokenService;
@Autowired
SubmitTestInstructionService submitTestInstructionService;
/** /**
* gitlab webhook * gitlab webhook
* @param request * @param request
...@@ -137,6 +143,15 @@ public class PipelineController { ...@@ -137,6 +143,15 @@ public class PipelineController {
} }
pipelineService.saveBatch(pipelineList); pipelineService.saveBatch(pipelineList);
} }
String dingUrl = dingRobot.getDingUrl();
Integer submitTestInstructionId = dingRobot.getSubmitTestInstructionId();
SubmitTestInstruction submitTestInstruction = submitTestInstructionService.getById(submitTestInstructionId);
if (submitTestInstruction != null) {
// TODO: 2021/11/5 提测说明url待前端定好之后再确定
String msg = DingdingUtils.buildTestSubmitInstructionMsg(projectName, "提测说明URL,等晓彤😂");
boolean sendToDingResult = DingdingUtils.sendToDingding(msg, dingUrl);
log.info("创建测试流程时,发送给数据组的通知结果:" + sendToDingResult);
}
return JsonResult.buildSuccessResult(true); return JsonResult.buildSuccessResult(true);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
...@@ -37,6 +37,12 @@ public class DingRobot { ...@@ -37,6 +37,12 @@ public class DingRobot {
* 1-进行中,2-已完成 * 1-进行中,2-已完成
*/ */
private Integer status; private Integer status;
/**
* 提测说明id
*/
private Integer submitTestInstructionId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
......
...@@ -240,8 +240,13 @@ public class DingdingUtils { ...@@ -240,8 +240,13 @@ public class DingdingUtils {
* @param submitTestUrl 提测说明地址 * @param submitTestUrl 提测说明地址
* @return * @return
*/ */
public String buildTestSubmitInstructionMsg(String projectName, String submitTestUrl) { public static String buildTestSubmitInstructionMsg(String projectName, String submitTestUrl) {
return null; String title = "新项目提测通知";
String content = "亲爱的数仓小伙伴,有新的项目提测啦。请关注:\n\n";
content += "- 项目名:" + projectName + "\n";
content += "- 项目详细信息:" + submitTestUrl + "\n\n";
content += "测试已经开始接手项目,正在紧急的测试中,项目上线后还会触发一个上线机器人。请根据实际情况,关注项目上线后的情况~";
return buildMarkdownMsg(title, content, true);
} }
public static void main(String[] args) { public static void main(String[] args) {
......
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