Browse Source

/*改云深处机器狗改出来的bug:任务周期执行*/

master
htjcAdmin 3 months ago
parent
commit
c8fedf695f
2 changed files with 6 additions and 4 deletions
  1. +3
    -1
      inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
  2. +3
    -3
      inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java

+ 3
- 1
inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java View File

@ -2022,7 +2022,9 @@ public class JobMainTask {
// 筛选出可见光任务
List<PatrolTask> patrolTaskListEx = new ArrayList<>();
for (PatrolTask patrolTask : patrolTaskList) {
if("2".equals(patrolTask.getDevType())) {
log.info("EXTRACT_REDIS_TASK devType: {}", patrolTask.getDevType());
if(StringUtils.isNotEmpty(patrolTask.getDevType())
&& patrolTask.getDevType().contains("2")) {
patrolTaskListEx.add(patrolTask);
}
}


+ 3
- 3
inspect-job/src/main/java/com/inspect/job/task/PatrolDeviceStatusSynTask.java View File

@ -114,18 +114,18 @@ public class PatrolDeviceStatusSynTask {
try {
JSONObject jsonObject = this.ivsFeign.channelListJson(new JSONObject());
String resultCode = jsonObject.getString("resultCode");
logger.info(Color.MAGENTA + "synPatrolEqpOnlineStatusFromGwbMedia2 resultCode: {}, result: {}" + Color.END, resultCode, jsonObject.toJSONString());
logger.debug(Color.MAGENTA + "synPatrolEqpOnlineStatusFromGwbMedia2 resultCode: {}, result: {}" + Color.END, resultCode, jsonObject.toJSONString());
if (null != resultCode && resultCode.equals("0")) {
JSONObject cameraBriefInfosV2 = jsonObject.getJSONObject("cameraBriefInfosV2");
if (null != cameraBriefInfosV2) {
int total = cameraBriefInfosV2.getInteger("total");
logger.info("synPatrolEqpOnlineStatusFromGwbMedia2 cameraBriefInfosV2.total: {}", total);
logger.debug("synPatrolEqpOnlineStatusFromGwbMedia2 cameraBriefInfosV2.total: {}", total);
if (total > 0) {
JSONArray ivsJsonObjectItems = cameraBriefInfosV2.getJSONObject("cameraBriefInfoList").getJSONArray("cameraBriefInfo");
if (!ivsJsonObjectItems.isEmpty()) {
Object basedata = basedataClient.list(new JSONObject()).getRows();
JSONArray patrolDeviceObjects = JSONArray.parseArray(JSONObject.toJSONString(basedata));
logger.info("synPatrolEqpOnlineStatusFromGwbMedia2 patrolDeviceObjects size: {}", patrolDeviceObjects.size());
logger.debug("synPatrolEqpOnlineStatusFromGwbMedia2 patrolDeviceObjects size: {}", patrolDeviceObjects.size());
Map<String, Boolean> ivsDeviceStatusMap = new HashMap<>();
if (!patrolDeviceObjects.isEmpty()) {
for (int i = 0; i < ivsJsonObjectItems.size(); ++i) {


Loading…
Cancel
Save