|
@@ -126,7 +126,12 @@ public class WeComNotificationService implements NotificationService {
|
|
|
if (task != null && task.path("taskType").asInt() == 20) {
|
|
if (task != null && task.path("taskType").asInt() == 20) {
|
|
|
String taskName = task.path("taskName").asText(instanceTitle);
|
|
String taskName = task.path("taskName").asText(instanceTitle);
|
|
|
String taskTypeName = findItemValue(task, "任务信息", "任务类型");
|
|
String taskTypeName = findItemValue(task, "任务信息", "任务类型");
|
|
|
- String sceneName = findItemValue(task, "任务信息", "场景");
|
|
|
|
|
|
|
+ String mainSceneName = findItemValue(task, "任务信息", "主场景");
|
|
|
|
|
+ // 新快照 label 为「子场景」,存量快照仍为「场景」
|
|
|
|
|
+ String sceneName = findItemValue(task, "任务信息", "子场景");
|
|
|
|
|
+ if (!StringUtils.hasText(sceneName)) {
|
|
|
|
|
+ sceneName = findItemValue(task, "任务信息", "场景");
|
|
|
|
|
+ }
|
|
|
String sendTime = findItemValue(task, "发送设置", "发送时间");
|
|
String sendTime = findItemValue(task, "发送设置", "发送时间");
|
|
|
if (!StringUtils.hasText(sendTime)) {
|
|
if (!StringUtils.hasText(sendTime)) {
|
|
|
sendTime = findItemValue(task, "触发设置", "生效时间");
|
|
sendTime = findItemValue(task, "触发设置", "生效时间");
|
|
@@ -137,6 +142,9 @@ public class WeComNotificationService implements NotificationService {
|
|
|
if (StringUtils.hasText(taskTypeName)) {
|
|
if (StringUtils.hasText(taskTypeName)) {
|
|
|
sb.append("<div class=\"gray\">任务类型:").append(taskTypeName).append("</div>");
|
|
sb.append("<div class=\"gray\">任务类型:").append(taskTypeName).append("</div>");
|
|
|
}
|
|
}
|
|
|
|
|
+ if (StringUtils.hasText(mainSceneName)) {
|
|
|
|
|
+ sb.append("<div class=\"gray\">主场景:").append(mainSceneName).append("</div>");
|
|
|
|
|
+ }
|
|
|
if (StringUtils.hasText(sceneName)) {
|
|
if (StringUtils.hasText(sceneName)) {
|
|
|
sb.append("<div class=\"gray\">场景:").append(sceneName).append("</div>");
|
|
sb.append("<div class=\"gray\">场景:").append(sceneName).append("</div>");
|
|
|
}
|
|
}
|