|
@@ -1,16 +1,19 @@
|
|
|
package com.fdkankan.job.job;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.img.ImgUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.fdkankan.common.constant.CommonOperStatus;
|
|
|
+import com.fdkankan.common.constant.CommonSuccessStatus;
|
|
|
import com.fdkankan.common.constant.SceneSource;
|
|
|
import com.fdkankan.common.util.DateExtUtil;
|
|
|
import com.fdkankan.dingtalk.DingTalkSendUtils;
|
|
|
-import com.fdkankan.job.entity.SceneBuildProcessLog;
|
|
|
-import com.fdkankan.job.entity.ScenePlus;
|
|
|
-import com.fdkankan.job.entity.ScenePro;
|
|
|
+import com.fdkankan.job.dto.SceneBean;
|
|
|
+import com.fdkankan.job.entity.*;
|
|
|
+import com.fdkankan.job.mapper.ISceneBuildStatusMapper;
|
|
|
+import com.fdkankan.job.mapper.IScenePlusMapper;
|
|
|
import com.fdkankan.job.service.ISceneBuildProcessLogService;
|
|
|
import com.fdkankan.job.service.IScenePlusService;
|
|
|
import com.fdkankan.job.service.ISceneProService;
|
|
@@ -24,10 +27,7 @@ import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.io.File;
|
|
|
import java.sql.SQLException;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Calendar;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -54,13 +54,18 @@ public class SceneCallCountHandler {
|
|
|
private ISceneBuildProcessLogService sceneBuildProcessLogService;
|
|
|
@Autowired
|
|
|
private DingTalkSendUtils dingTalkSendUtils;
|
|
|
+ @Autowired
|
|
|
+ private ISceneBuildStatusMapper sceneBuildStatusMapper;
|
|
|
+ @Autowired
|
|
|
+ private IScenePlusMapper scenePlusMapper;
|
|
|
|
|
|
public static final String DINGTALK_MSG_PATTERN =
|
|
|
"**日期**: %s\n\n" +
|
|
|
"**环境**: %s\n\n" +
|
|
|
"%s" +
|
|
|
"%s" +
|
|
|
- "**错误日志**: \n\n%s";
|
|
|
+ "**当日计算失败**: \n\n%s" +
|
|
|
+ "**现存异常场景**: \n\n%s";
|
|
|
|
|
|
@XxlJob("sceneCallCountHandler")
|
|
|
public void sceneCallCountHandler() throws Exception {
|
|
@@ -247,6 +252,23 @@ public class SceneCallCountHandler {
|
|
|
errorMsg.append(v3ErrorMsg);
|
|
|
}
|
|
|
|
|
|
+ StringBuilder abnormalMsg = new StringBuilder();
|
|
|
+ List<SceneBean> timeOutScenes = scenePlusMapper.selectTimeOutScene();
|
|
|
+ if(CollUtil.isNotEmpty(timeOutScenes)){
|
|
|
+ for (SceneBean sceneBean : timeOutScenes) {
|
|
|
+ abnormalMsg.append(sceneBean.getNum());
|
|
|
+ abnormalMsg.append(":计算超时\n\n");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ List<SceneBean> failBeans = scenePlusMapper.selectTimeOutScene();
|
|
|
+ if(CollUtil.isNotEmpty(failBeans)){
|
|
|
+ for (SceneBean sceneBean : failBeans) {
|
|
|
+ abnormalMsg.append(sceneBean.getNum());
|
|
|
+ abnormalMsg.append(":计算失败\n\n");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
String envName = "";
|
|
|
if(env.equals("gn")){
|
|
|
envName = "国内";
|
|
@@ -264,13 +286,15 @@ public class SceneCallCountHandler {
|
|
|
envName,
|
|
|
v4Msg,
|
|
|
v3Msg,
|
|
|
- errorMsg);
|
|
|
+ errorMsg,
|
|
|
+ abnormalMsg);
|
|
|
|
|
|
XxlJobHelper.log(ddMsg);
|
|
|
dingTalkSendUtils.sendActioncardMsgToDingRobot(ddMsg, "场景计算统计");
|
|
|
XxlJobHelper.log("sceneCallCountHandler end.....");
|
|
|
}
|
|
|
|
|
|
+
|
|
|
public static void main(String[] args) throws SQLException {
|
|
|
|
|
|
System.out.println("ggg 123123");
|