Commit 73089d39 by guojuxing

3.0需求同步4。0

parent b3fe8217
...@@ -128,7 +128,8 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService { ...@@ -128,7 +128,8 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService {
JSONObject udeskTicketUpdate = new JSONObject(); JSONObject udeskTicketUpdate = new JSONObject();
JSONObject customFields = new JSONObject(); JSONObject customFields = new JSONObject();
//suspended:跟踪 PM_audited:pm审核 变成已处理状态 //suspended:跟踪 PM_audited:pm审核 变成已处理状态
if ("suspended".equals(latestBugFromTAPD.getStatus()) || "PM_audited".equals(latestBugFromTAPD.getStatus())) { boolean needToBeResolved = "suspended".equals(latestBugFromTAPD.getStatus()) || "PM_audited".equals(latestBugFromTAPD.getStatus());
if (needToBeResolved) {
udeskTicketUpdate.put("status_id", udeskTapdRelMap.get("resolved" + UdeskConstant.MAP_UDESK_ID_VALUE_SUFFIX)); udeskTicketUpdate.put("status_id", udeskTapdRelMap.get("resolved" + UdeskConstant.MAP_UDESK_ID_VALUE_SUFFIX));
} else { } else {
udeskTicketUpdate.put("status_id", udeskTapdRelMap.get(latestBugFromTAPD.getStatus() + UdeskConstant.MAP_UDESK_ID_VALUE_SUFFIX)); udeskTicketUpdate.put("status_id", udeskTapdRelMap.get(latestBugFromTAPD.getStatus() + UdeskConstant.MAP_UDESK_ID_VALUE_SUFFIX));
...@@ -150,8 +151,12 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService { ...@@ -150,8 +151,12 @@ public class TapdMessageApiServiceImpl implements TapdMessageApiService {
udeskEnterpriseService.updateStatus(dataBaseTicket.getId(), statusEn); udeskEnterpriseService.updateStatus(dataBaseTicket.getId(), statusEn);
} }
// 更新数据库中的数据 注: 放在udesk操作完成之后 // 更新数据库中的数据 注: 放在udesk操作完成之后
if (needToBeResolved) {
dataBaseTicket.setStatusEn(udeskTapdRelMap.get("resolved" + UdeskConstant.MAP_UDESK_NAME_SUFFIX));
} else {
dataBaseTicket dataBaseTicket
.setStatusEn(udeskTapdRelMap.get(latestBugFromTAPD.getStatus() + UdeskConstant.MAP_UDESK_NAME_SUFFIX)); .setStatusEn(udeskTapdRelMap.get(latestBugFromTAPD.getStatus() + UdeskConstant.MAP_UDESK_NAME_SUFFIX));
}
dataBaseTicket.setPriority(priorityCN); dataBaseTicket.setPriority(priorityCN);
dataBaseTicket.setSeverity(severityCN); dataBaseTicket.setSeverity(severityCN);
dataBaseTicket.setStatusTapd(latestBugFromTAPD.getStatus()); dataBaseTicket.setStatusTapd(latestBugFromTAPD.getStatus());
......
...@@ -105,16 +105,7 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService { ...@@ -105,16 +105,7 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
tabUdeskTicket.setWorkspaceId( tabUdeskTicket.setWorkspaceId(
udeskTapdRelMap.get(UdeskConstant.UDESK_FIELD_WORKSPACE + ":" + workspaceValue)); udeskTapdRelMap.get(UdeskConstant.UDESK_FIELD_WORKSPACE + ":" + workspaceValue));
//TPAD当前处理人 //TPAD当前处理人
String transactorValue = customFields.get(UdeskConstant.UDESK_FIELD_TRANSACTOR); tabUdeskTicket.setCurrentOwner(getCurrentOwner(customFields));
if (StringUtils.isNotBlank(transactorValue)) {
String[] transactors = transactorValue.split(",");
StringBuilder builder = new StringBuilder();
for (String transactor : transactors) {
builder.append(udeskTapdRelMap.get(UdeskConstant.UDESK_FIELD_TRANSACTOR + ":" + transactor))
.append(";");
}
tabUdeskTicket.setCurrentOwner(builder.toString());
}
//发现版本添加 //发现版本添加
String versionReportCode = customFields.get(UdeskConstant.UDESK_FIELD_VERSION_3); String versionReportCode = customFields.get(UdeskConstant.UDESK_FIELD_VERSION_3);
...@@ -170,6 +161,8 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService { ...@@ -170,6 +161,8 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
tapdBug.setStatus(tabUdeskTicket.getStatusTapd()); tapdBug.setStatus(tabUdeskTicket.getStatusTapd());
this.setDescription(ticket, tapdBug); this.setDescription(ticket, tapdBug);
//udesk创建到tapd的缺陷,发现阶段值写死
tapdBug.setOriginphase("生产环境");
String bugStr = JSON.toJSONString(tapdBug); String bugStr = JSON.toJSONString(tapdBug);
logger.info("添加TAPDbug入参为{}", bugStr); logger.info("添加TAPDbug入参为{}", bugStr);
...@@ -472,6 +465,9 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService { ...@@ -472,6 +465,9 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
} else if ("1".equals(value)) { } else if ("1".equals(value)) {
value = "否"; value = "否";
} }
} else if (UdeskConstant.UDESK_FIELD_TRANSACTOR.equals(tabUdeskTapdRel.getUdeskIdKey())) {
//测试负责人
value = getCurrentOwner(customFields);
} else { } else {
Method udeskMethod = TabUdeskTicket.class.getMethod(tabUdeskTapdRel.getUdeskIdKey()); Method udeskMethod = TabUdeskTicket.class.getMethod(tabUdeskTapdRel.getUdeskIdKey());
value = (String) udeskMethod.invoke(tabUdeskTicket); value = (String) udeskMethod.invoke(tabUdeskTicket);
...@@ -512,6 +508,9 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService { ...@@ -512,6 +508,9 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
} else if ("1".equals(value)) { } else if ("1".equals(value)) {
value = "否"; value = "否";
} }
} else if (UdeskConstant.UDESK_FIELD_TRANSACTOR.equals(tabUdeskTapdRel.getUdeskIdKey())) {
//测试负责人
value = getCurrentOwner(customFields);
} else { } else {
Method udeskMethod = TabUdeskTicket.class.getMethod(udeskIdKey); Method udeskMethod = TabUdeskTicket.class.getMethod(udeskIdKey);
value = (String) udeskMethod.invoke(tabUdeskTicket); value = (String) udeskMethod.invoke(tabUdeskTicket);
...@@ -596,4 +595,22 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService { ...@@ -596,4 +595,22 @@ public class UdeskMessageApiServiceImpl implements UdeskMessageApiService {
udeskEnterpriseService.updateStatus(ticketId, status); udeskEnterpriseService.updateStatus(ticketId, status);
} }
} }
/**
* 获取处理人
* @param customFields
* @return
*/
private String getCurrentOwner(Map<String, String> customFields) {
String transactorValue = customFields.get(UdeskConstant.UDESK_FIELD_TRANSACTOR);
if(StringUtils.isNotBlank(transactorValue)){
String[] transactors = transactorValue.split(",");
StringBuilder builder = new StringBuilder();
for (String transactor : transactors) {
builder.append(udeskTapdRelMap.get(UdeskConstant.UDESK_FIELD_TRANSACTOR + ":" + transactor)).append(";");
}
return builder.toString();
}
return null;
}
} }
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