判断是否为手动执行区域

inspect-job/src/main/java/com/inspect/job/client/TaskExecClient.java

@@ -22,6 +22,9 @@ public interface TaskExecClient {
    @PostMapping({"/exec/selectTaskInfoList"})
    List<PatrolTaskInfo> selectTaskInfoList(PatrolTaskInfo taskInfo);
 
+   @PostMapping({"/exec/getConfigByKey"})
+   String getConfigByKey(String key);
+
    @PostMapping({"/exec/selectPatrolPresetPosList"})
    List<PatrolPresetPos> selectPatrolPresetPosList(PatrolPresetPos presetPos);
 

inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java

@@ -844,10 +844,10 @@ public class JobMainTask {
     @PostMapping({"/immediatelyExecTask"})
     public void immediatelyExecTask(@RequestBody PatrolTask patrolTask) {
         String taskCode = redisService.getCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, patrolTask.getTaskCode());
-        if (StringUtils.isNotEmpty(taskCode)) {
-            log.info(Color.CYAN + "TASK SLOT IS TAKEN BY: {}" + Color.END, taskCode);
-            return;
-        }
+//        if (StringUtils.isNotEmpty(taskCode)) {
+//            log.info(Color.CYAN + "TASK SLOT IS TAKEN BY: {}" + Color.END, taskCode);
+//            return;
+//        }
 
         PatrolTaskInfo patrolTaskInfo = new PatrolTaskInfo();
         List<PatrolTask> patrolTaskList = new ArrayList<>();
@@ -855,10 +855,10 @@ public class JobMainTask {
         List<PatrolTask> cameraPatrolTasks = new ArrayList<>();
         assembleVideoTask(patrolTaskList, cameraPatrolTasks);
         String redisImmediatelyExecTaskTime = redisService.getCacheObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, patrolTask.getTaskCode());
-        if (redisImmediatelyExecTaskTime != null) {
-            log.info(Color.CYAN + "IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime);
-            return;
-        }
+//        if (redisImmediatelyExecTaskTime != null) {
+//            log.info(Color.CYAN + "IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime);
+//            return;
+//        }
 
         if (shaoXinBigModel.isSwitchStatus()) {
             log.info("[BIG] Temporary gathering, close bigSwitch in nacos");
@@ -936,13 +936,24 @@ public class JobMainTask {
 
     private void assembleVideoTask(List<PatrolTask> patrolTaskList, List<PatrolTask> cameraPatrolTasks) {
         if (patrolTaskList != null) {
+            String jobAreas = taskExecClient.getConfigByKey("JOB_AREAS");
+            log.info("jobAreas: {}", jobAreas);
+            List<String> jobAreaList = new ArrayList<>();
+            if(StringUtils.isNotBlank(jobAreas)) {
+                String[] jobAreaArr = jobAreas.split(",");
+                for(int i = 0; i < jobAreaArr.length; i++) {
+                    jobAreaList.add(jobAreaArr[i]);
+                }
+            }
+            log.info("jobAreaList: {}", JSONObject.toJSONString(jobAreaList));
+
             for (PatrolTask task : patrolTaskList) {
                 if (!StringUtils.isEmpty(task.getDevType())) {
                     String[] devTypes = task.getDevType().split(StringUtils.COMMA);
                     String[] devNos = task.getDevNo().split(StringUtils.COMMA);
                     for (int i = 0; i < devTypes.length; ++i) {
                         if ("2".equals(devTypes[i])) {
-                            if("camera".equals(devNos[i])) {//武汉站手动任务台账编码
+                            if(jobAreaList.size() == 0 || jobAreaList.contains(devNos[i])) {
                                 PatrolTask cameraPatrolTask = new PatrolTask();
                                 cameraPatrolTask.setTaskId(task.getTaskId());
                                 cameraPatrolTask.setStationName(task.getStationName());

inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java

@@ -719,6 +719,17 @@ public class PatrolTaskExecController extends BaseController {
         return CollectionUtils.isNotEmpty(list) ? list.get(0) : null;
     }
 
+    @PostMapping({"/getConfigByKey"})
+    public String getConfigByKey(@RequestBody String key) {
+        String value = patrolTaskService.selectConfigByKey(key);
+        logger.info("-------------------getConfigByKey key: {}, value: {}", key, value);
+        if(StringUtils.isBlank(value)) {
+            return "";
+        } else {
+            return value.trim();
+        }
+    }
+
     public static void main(String[] args) {
         String dateString = DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date());
         System.out.println(dateString);

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java

@@ -657,13 +657,13 @@ public class PatrolTaskStatusController extends BaseController {
                     String str = JSONObject.toJSONString(sendTask);
                     this.feignTaskClient.sendCommand(str);
                 } else {
-                    String taskCode = redisService.getCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, String.valueOf(patrolTask.getTaskId()));
-                    if (!StringUtils.isEmpty(taskCode)) {
-                        log.info("[TASK] CURRENT EXEC TASK: {}", taskCode);
-                        return AjaxResult.error(501, "THERE TASK IS RUNNING!");
-                    } else {
+//                    String taskCode = redisService.getCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, String.valueOf(patrolTask.getTaskId()));
+//                    if (!StringUtils.isEmpty(taskCode)) {
+//                        log.info("[TASK] CURRENT EXEC TASK: {}", taskCode);
+//                        return AjaxResult.error(501, "THERE TASK IS RUNNING!");
+//                    } else {
                         sendTaskToVideo(patrolTask);
-                    }
+//                    }
                 }
             }
         }