Skip to content

H
holmes
Commit bca2cb7e authored by 黎博's avatar 黎博
Browse files
Options

修改qa_process洗数据

parent d56d16c6
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 77 deletions
src/main/java/cn/qg/holmes/controller/effect/EffectController.java
View file @ bca2cb7e
...@@ -75,11 +75,12 @@ public class EffectController { ...@@ -75,11 +75,12 @@ public class EffectController {
@GetMapping("/qa/transfer") @GetMapping("/qa/transfer")
public JsonResult transferData() { public JsonResult transferData() {
String doraemonUrl = "https://doraemon.quantgroups.cn/qa/process/transfer"; String doraemonUrl = "https://doraemon.quantgroups.cn/qa/process/transfer";
List<DingRobot> dingRobotList = dingRobotService.list(); // String doraemonUrl = "http://localhost:8086/qa/process/transfer";
for (DingRobot dingRobot: dingRobotList) { List<SubmitTestInstruction> submitTestInstructionList = submitTestInstructionService.list();
for (SubmitTestInstruction submitTestInstruction: submitTestInstructionList) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("projectName", dingRobot.getProjectName()); jsonObject.put("projectName", submitTestInstruction.getProjectName());
String jiraKey = dingRobot.getJiraProjectKey(); String jiraKey = submitTestInstruction.getJiraProjectKey();
// 1-toc, 2-tob, 3-金融，4-大数据 // 1-toc, 2-tob, 3-金融，4-大数据
int bizLineId; int bizLineId;
switch (jiraKey) { switch (jiraKey) {
...@@ -105,83 +106,84 @@ public class EffectController { ...@@ -105,83 +106,84 @@ public class EffectController {
} }
jsonObject.put("businessLineId", bizLineId); jsonObject.put("businessLineId", bizLineId);
jsonObject.put("jiraKey", jiraKey); jsonObject.put("jiraKey", jiraKey);
jsonObject.put("dingUrl", dingRobot.getDingUrl()); // 服务与分支
Integer insId = dingRobot.getSubmitTestInstructionId(); List<Map<String, String>> newMapList = new ArrayList<>();
if (insId != null) { String serviceAndBranch = submitTestInstruction.getServiceAndBranch();
SubmitTestInstruction testInstruction = submitTestInstructionService.getById(insId); if (!StringUtils.isEmpty(serviceAndBranch)) {
if (testInstruction != null) { List<Map<String, String>> mapList = JSON.parseObject(serviceAndBranch, List.class);
// 服务与分支 for (Map<String, String> map: mapList) {
List<Map<String, String>> newMapList = new ArrayList<>(); Map<String, String> newMap = new HashMap<>();
String serviceAndBranch = testInstruction.getServiceAndBranch(); newMap.put("serviceName", map.get("serviceName"));
if (!StringUtils.isEmpty(serviceAndBranch)) { newMap.put("branchName", map.get("branch"));
List<Map<String, String>> mapList = JSON.parseObject(serviceAndBranch, List.class); newMap.put("developer", map.get("developer"));
for (Map<String, String> map: mapList) { newMapList.add(newMap);
Map<String, String> newMap = new HashMap<>(); }
newMap.put("serviceName", map.get("serviceName")); }
newMap.put("branchName", map.get("branch")); jsonObject.put("serviceAndBranchList", newMapList);
newMap.put("developer", map.get("developer"));
newMapList.add(newMap); // apollo
} Map<String, Object> apolloMap = new HashMap<>();
} String apollo = submitTestInstruction.getApollo();
jsonObject.put("serviceAndBranchList", newMapList); if (!StringUtils.isEmpty(apollo)) {
List<Map<String, String>> oldApolloList = JSON.parseObject(apollo, List.class);
// apollo for (Map<String, String> map: oldApolloList) {
Map<String, Object> apolloMap = new HashMap<>(); String projectName = map.get("projectName");
String apollo = testInstruction.getApollo(); if (apolloMap.containsKey(projectName)) {
if (!StringUtils.isEmpty(apollo)) { List<Map<String, String>> alreadyList = (List<Map<String, String>>) apolloMap.get(projectName);
List<Map<String, String>> oldApolloList = JSON.parseObject(apollo, List.class); Map<String, String> tempMap = new HashMap<>();
for (Map<String, String> map: oldApolloList) { tempMap.put("key", map.get("key"));
String projectName = map.get("projectName"); tempMap.put("value", map.get("value"));
if (apolloMap.containsKey(projectName)) { alreadyList.add(tempMap);
List<Map<String, String>> alreadyList = (List<Map<String, String>>) apolloMap.get(projectName); apolloMap.put(projectName, alreadyList);
Map<String, String> tempMap = new HashMap<>(); } else {
tempMap.put("key", map.get("key")); List<Map<String, String>> newList = new ArrayList<>();
tempMap.put("value", map.get("value")); Map<String, String> tempMap = new HashMap<>();
alreadyList.add(tempMap); tempMap.put("key", map.get("key"));
apolloMap.put(projectName, alreadyList); tempMap.put("value", map.get("value"));
} else { newList.add(tempMap);
List<Map<String, String>> newList = new ArrayList<>(); apolloMap.put(projectName, newList);
Map<String, String> tempMap = new HashMap<>();
tempMap.put("key", map.get("key"));
tempMap.put("value", map.get("value"));
newList.add(tempMap);
apolloMap.put(projectName, newList);
}
}
}
jsonObject.put("apolloUpdate", apolloMap);
// 数据库
StringBuilder sb = new StringBuilder();
String database = testInstruction.getDatabase();
if (!StringUtils.isEmpty(database)) {
List<Map<String, String>> dbList = JSON.parseObject(database, List.class);
for (Map<String, String> map: dbList) {
sb.append(map.get("sql"));
sb.append("\n");
}
} }
jsonObject.put("databaseUpdate", sb.toString());
jsonObject.put("prodDocument", testInstruction.getRequirement());
jsonObject.put("interfaceDocument", testInstruction.getApi());
jsonObject.put("remark", testInstruction.getScope());
} }
} }
jsonObject.put("env", dingRobot.getNamespace()); jsonObject.put("apolloUpdate", apolloMap);
jsonObject.put("refuseNum", dingRobot.getRepulseNum());
// 项目状态 // 数据库
Integer oldStatus = dingRobot.getStatus(); StringBuilder sb = new StringBuilder();
if (oldStatus == 1) { String database = submitTestInstruction.getDatabase();
jsonObject.put("status", 1); if (!StringUtils.isEmpty(database)) {
} else if (oldStatus == 2) { List<Map<String, String>> dbList = JSON.parseObject(database, List.class);
jsonObject.put("progress", 100D); for (Map<String, String> map: dbList) {
jsonObject.put("status", 3); sb.append(map.get("sql"));
} else { sb.append("\n");
jsonObject.put("progress", 100D); }
jsonObject.put("status", 3); }
jsonObject.put("databaseUpdate", sb.toString());
jsonObject.put("prodDocument", submitTestInstruction.getRequirement());
jsonObject.put("interfaceDocument", submitTestInstruction.getApi());
jsonObject.put("remark", submitTestInstruction.getScope());
jsonObject.put("status", 1);
QueryWrapper<DingRobot> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("submit_test_instruction_id", submitTestInstruction.getId());
DingRobot dingRobot = dingRobotService.getOne(queryWrapper);
if (dingRobot != null) {
jsonObject.put("dingUrl", dingRobot.getDingUrl());
jsonObject.put("env", dingRobot.getNamespace());
jsonObject.put("refuseNum", dingRobot.getRepulseNum());
// 项目状态
Integer oldStatus = dingRobot.getStatus();
if (oldStatus == 1) {
jsonObject.put("status", 1);
} else if (oldStatus == 2) {
jsonObject.put("progress", 100D);
jsonObject.put("status", 3);
} else {
jsonObject.put("progress", 100D);
jsonObject.put("status", 3);
}
jsonObject.put("creator", dingRobot.getCreator());
} }
jsonObject.put("creator", dingRobot.getCreator());
String response = HttpClientUtils.doPostJson(doraemonUrl, null, jsonObject.toJSONString()); String response = HttpClientUtils.doPostJson(doraemonUrl, null, jsonObject.toJSONString());
log.info(response); log.info(response);
......
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