|
@@ -61,13 +61,13 @@ public class SceneCallCountHandler {
|
|
|
|
|
|
public static final String DINGTALK_MSG_PATTERN =
|
|
|
"**日期**: %s\n\n" +
|
|
|
- "**环境**: 国内\n\n" +
|
|
|
+ "**环境**: %s\n\n" +
|
|
|
"v4场景总数: %d, 成功: %d, 失败: %d, 计算中: %d\n\n" +
|
|
|
"%s" +
|
|
|
"**错误日志**: %s";
|
|
|
|
|
|
@XxlJob("sceneCallCountHandler")
|
|
|
- private void repairSceneUpXmlUrlOfVideos() throws SQLException, NoSuchAlgorithmException, ApiException, InvalidKeyException, UnsupportedEncodingException {
|
|
|
+ private void repairSceneUpXmlUrlOfVideos() throws Exception {
|
|
|
XxlJobHelper.log("sceneCallCountHandler start.....");
|
|
|
|
|
|
Date time = Calendar.getInstance().getTime();
|
|
@@ -88,7 +88,8 @@ public class SceneCallCountHandler {
|
|
|
|
|
|
//v3场景
|
|
|
String v3Msg = "";
|
|
|
- if(env.equals("eur")){
|
|
|
+ StringBuilder v3ErrorMsg = new StringBuilder();
|
|
|
+ if(env.equals("gn")){
|
|
|
int v3Count = 0; int v3success = 0; int v3Fail = 0; int v3Waiting = 0;
|
|
|
List<ScenePro> scenePros = sceneProService.list(new LambdaQueryWrapper<ScenePro>().ge(ScenePro::getCreateTime, dateStart).le(ScenePro::getCreateTime, dateEnd));
|
|
|
if(CollUtil.isNotEmpty(scenePros)){
|
|
@@ -96,6 +97,11 @@ public class SceneCallCountHandler {
|
|
|
v3success = (int) scenePros.stream().filter(plus -> plus.getStatus() == 1 || plus.getStatus() == -2).count();
|
|
|
v3Fail = (int)scenePros.stream().filter(plus -> plus.getStatus() == -1).count();
|
|
|
v3Waiting = (int)scenePros.stream().filter(plus -> plus.getStatus() == 0).count();
|
|
|
+ scenePros.stream().forEach(pro->{
|
|
|
+ if(pro.getStatus().equals(CommonOperStatus.FAILD.code())){
|
|
|
+ v3ErrorMsg.append(pro.getNum()).append(":").append("计算失败\n\n");
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
v3Msg = String.format("v3场景总数: %d, 成功: %d, 失败: %d, 计算中: %d\n\n", v3Count, v3success, v3Fail, v3Waiting);
|
|
|
}
|
|
@@ -111,8 +117,9 @@ public class SceneCallCountHandler {
|
|
|
logList.stream().forEach(item->{
|
|
|
errorMsg.append(item.getNum()).append(":").append(SceneBuildProcessType.get(item.getProcess()).message()).append("出错\n\n");
|
|
|
});
|
|
|
- }else{
|
|
|
- errorMsg.append("无");
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotBlank(v3ErrorMsg)){
|
|
|
+ errorMsg.append(v3ErrorMsg);
|
|
|
}
|
|
|
|
|
|
String ddMsg = String.format(DINGTALK_MSG_PATTERN, DateExtUtil.format(time, DateExtUtil.dateStyle4),
|