qinyanlei
/
inspect
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

联合巡视任务报告优化

master
lijiuwei 8 months ago
parent
b349e021ce
commit
ef6a332a7d
3 changed files with 20 additions and 56 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -8
      inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
  2. +9
    -3
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
  3. +2
    -45
      inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml

+ 9
- 8
inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java View File

@ -92,8 +92,8 @@ public class JobMainTask {
private String activeProfile;
//private static final ExecutorService threadPool = Executors.newFixedThreadPool(2);
private static final int corePoolSize = 2;
private static final int maximumPoolSize = 5;
private static final int corePoolSize = 20;
private static final int maximumPoolSize = 50;
private static final int keepAliveTime = 100;
private static final ExecutorService threadPool = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTime, TimeUnit.SECONDS, new LinkedBlockingQueue<>(1000));
@ -557,7 +557,7 @@ public class JobMainTask {
String patrolId = taskExecRecord.getTaskPatrolId();
String[] ids = patrolId.split(StringUtils.UNDERLINE);
String taskPatrolIdRemote = ids[1] + "_" + ids[2];
callRemoteSendMsgCtrlMode(taskPatrolIdRemote, pointExecRecord);
callRemoteSendMsgCtrlMode(taskPatrolIdRemote, pointExecRecord);/*上报巡视结果*/
}
}
@ -656,7 +656,7 @@ public class JobMainTask {
taskExecRecord.getTaskName(),
taskExecRecord.getTaskPatrolId(),
totalProgress,
TaskStatus.RUNNING.getCode()
TaskStatus.RUNNING.getCode()/*运行中百分比上报*/
);
}
taskExecClient.updatePatrolTaskExecRecord(taskExecRecord);
@ -703,7 +703,7 @@ public class JobMainTask {
execRecord.getTaskName(),
execRecord.getTaskPatrolId(),
totalProgress,
TaskStatus.DONE.getCode()
TaskStatus.DONE.getCode()/*点位全部执行成功,上报进度100%*/
);
final Integer redisRecCnt = redisService.getCacheObject(RedisConst.TASK_RECORD_CNT);
log.info(Color.MAGENTA + "RECORD ROUND, patrolId: {}, recordCounter: {}, redisRecCnt: {}" + Color.END, taskPatrolId, execRecordCounter, redisRecCnt);
@ -724,7 +724,7 @@ public class JobMainTask {
execRecord.getTaskName(),
execRecord.getTaskPatrolId(),
totalProgress,
TaskStatus.DONE.getCode()
TaskStatus.DONE.getCode()/*点位全部执行成功,上报进度100%*/
);
//在不知道其它record是否执行完毕的情况下，不能把TASK_CURRENT_CODE锁删除
final int redisRecCnt = redisService.getCacheObject(RedisConst.TASK_RECORD_CNT);
@ -851,7 +851,7 @@ public class JobMainTask {
assembleVideoTask(patrolTaskList, cameraPatrolTasks);
String redisImmediatelyExecTaskTime = redisService.getCacheObject(RedisConst.IMMEDIATELY_EXEC_TASK_TIME);
if (redisImmediatelyExecTaskTime != null) {
log.info(Color.RED + "[JOB IMMEDIATE] IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime);
log.info(Color.CYAN + "[JOB IMMEDIATE] IMMEDIATELY_EXEC_TASK_TIME TASK TAKEN :{}" + Color.END, redisImmediatelyExecTaskTime);
return;
}
@ -865,7 +865,7 @@ public class JobMainTask {
log.info(Color.CYAN + "[JOB IMMEDIATE] TASK_CURRENT_CODE: {}, value: {}" + Color.END, RedisConst.TASK_CURRENT_CODE, RedisConst.TASK_CODE + patrolTask.getTaskCode() + StringUtils.AT + immediatelyExecTaskTime);
redisService.setCacheObject(RedisConst.TASK_CURRENT_CODE, RedisConst.TASK_CODE + patrolTask.getTaskCode() + StringUtils.AT + immediatelyExecTaskTime);
resetRecordCounter();
log.info(Color.CYAN + "[JOB IMMEDIATE] TASK REC CNT: {}" + Color.END, cameraPatrolTasks.size());
log.info(Color.CYAN + "[JOB IMMEDIATE] TASK REC CNT: {}" + Color.END, cameraPatrolTasks.size());//TASK REC CNT: 1
setRedisRecordCount(cameraPatrolTasks.size());
for (PatrolTask task : cameraPatrolTasks) {
List<PatrolTaskInfo> taskInfos = getInfosByRecord(PatrolTaskExecRecord.builder().devNo(task.getDevNo()).taskId(task.getTaskId()).build());
@ -986,6 +986,7 @@ public class JobMainTask {
private void prePointExecImmediate(final PatrolTaskExecRecord patrolTaskExecRecord) {
final List<PatrolTaskInfo> patrolTaskInfoList = getInfosByRecord(patrolTaskExecRecord);
//patrolTaskInfoList size: 12 devNo: camera, taskId: 10032
log.info(Color.CYAN + "[JOB] EXEC patrolTaskInfoList size: {} devNo: {}, taskId: {}" + Color.END, patrolTaskInfoList.size(), patrolTaskExecRecord.getDevNo(), patrolTaskExecRecord.getTaskId());
for (final PatrolTaskInfo taskInfo : patrolTaskInfoList) {
log.info(Color.CYAN + "[JOB] EXEC Immediate Progress: {}, id: {}, taskInfo: {}" + Color.END, patrolTaskExecRecord.getTaskProgress(), patrolTaskExecRecord.getTaskPatrolId() + "@@@" + patrolTaskExecRecord.getTaskPatrolId(), "deviceId:" + taskInfo.getDeviceId() + " LineId=" + taskInfo.getLineId());


+ 9
- 3
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java View File

@ -1194,9 +1194,15 @@ public class PatrolResultController extends BaseController {
List<PatrolTask> tasks = patrolTaskService.selectPatrolTaskList(PatrolTask.builder().taskCode(code).build());
String datetype;
if (!tasks.isEmpty()) {
int devCount = tasks.get(0).getDevNo().split(",").length;
PatrolTaskResultMain taskResultMain = new PatrolTaskResultMain();
taskResultMain.setTaskId(String.valueOf(tasks.get(0).getTaskId()));
taskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId());
if(devCount > 1) {
taskResultMain.setFileStatus("0");
} else {
taskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId());
}
logger.info("taskResultMain: {}", taskResultMain);
listEqpBook = iPatrolTaskResultMainService.selectPatrolTaskResultMainList(taskResultMain);
if (!listEqpBook.isEmpty()) {
@ -1231,7 +1237,7 @@ public class PatrolResultController extends BaseController {
patrolTaskResultMain.setDevType(tasks.get(0).getDevType());
}
mainID = iPatrolTaskResultMainService.insertPatrolTaskResultMain(patrolTaskResultMain);
mainID = iPatrolTaskResultMainService.insertPatrolTaskResultMain(patrolTaskResultMain);//
logger.info("insert PatrolTaskResultMain Id: {}", mainID);
}
}
@ -1391,7 +1397,7 @@ public class PatrolResultController extends BaseController {
}
}
i = patrolResultService.insertPatrolResult(arr);
i = patrolResultService.insertPatrolResult(arr);//
resultStatistics.compare(arr);
// if (!"2".equals(Jqtype)) {
resultList.add(arr);


+ 2
- 45
inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml View File

@ -45,50 +45,7 @@
from patrol_task_result_main
</sql>
<select id="selectPatrolTaskResultMainList" parameterType="PatrolTaskResultMain"
resultMap="PatrolTaskResultMainResult">
<!-- SELECT-->
<!-- a.line_id,-->
<!-- a.task_id,-->
<!-- a.task_patrolled_id,-->
<!-- a.task_name,-->
<!-- a.task_code,-->
<!-- a.create_time,-->
<!-- a.create_by,-->
<!-- a.file_status,-->
<!-- a.area_name,-->
<!-- a.task_type,-->
<!-- a.task_time,-->
<!-- a.interval_name,-->
<!-- a.dev_type,-->
<!-- a.task_result,-->
<!-- a.request_id,-->
<!-- a.check_person,-->
<!-- a.check_time-->
<!-- FROM-->
<!-- patrol_task_result_main a,-->
<!-- patrol_task_status b-->
<!-- WHERE-->
<!-- a.task_patrolled_id = b.task_patrolled_id-->
<!-- AND b.task_state = '1'-->
<!-- <where>-->
<!-- <if test="taskId != null and taskId != ''"> and a.task_id = #{taskId}</if>-->
<!-- <if test="taskName != null and taskName != ''"> and a.task_name like concat('%', #{taskName}, '%')</if>-->
<!-- <if test="taskCode != null and taskCode != ''"> and a.task_code = #{taskCode}</if>-->
<!-- <if test="createBy != null and createBy != ''"> and a.create_by = #{createBy}</if>-->
<!-- <if test="fileStatus != null and fileStatus != ''"> and a.file_status = #{fileStatus}</if>-->
<!-- <if test="areaName != null and areaName != ''"> and a.area_name like concat('%', #{areaName}, '%')</if>-->
<!-- <if test="taskType != null and taskType != ''"> and a.task_type = #{taskType}</if>-->
<!-- <if test="taskTime != null "> and a.task_time = #{taskTime}</if>-->
<!-- <if test="intervalName != null and intervalName != ''"> and a.interval_name like concat('%', #{intervalName}, '%')</if>-->
<!-- <if test="devType != null and devType != ''"> and a.dev_type = #{devType}</if>-->
<!-- <if test="taskResult != null and taskResult != ''"> and a.task_result = #{taskResult}</if>-->
<!-- <if test="requestId != null and requestId != ''"> and a.request_id = #{requestId}</if>-->
<!-- <if test="checkPerson != null and checkPerson != ''"> and a.check_person = #{checkPerson}</if>-->
<!-- <if test="checkTime != null "> and a.check_time = #{checkTime}</if>-->
<!-- <if test="taskPatrolledId != null "> and a.task_patrolled_id = #{taskPatrolledId}</if>-->
<!-- </where>-->
<!-- ORDER BY a.line_id desc-->
<select id="selectPatrolTaskResultMainList" parameterType="PatrolTaskResultMain" resultMap="PatrolTaskResultMainResult">
<include refid="selectPatrolTaskResultMainVo"/>
<where>
<if test="taskId != null and taskId != ''">and task_id = #{taskId}</if>
@ -109,7 +66,7 @@
<if test="checkTime != null ">and check_time = #{checkTime}</if>
<if test="taskPatrolledId != null ">and task_patrolled_id = #{taskPatrolledId}</if>
</where>
ORDER BY line_id desc
ORDER BY line_id desc limit 1
</select>
<select id="selectPatrolTaskResultMain" parameterType="PatrolTaskResultMain" resultMap="PatrolTaskResultMainResult">


Write Preview
Loading…
Cancel
Save