diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java index e38b1c3..bb60141 100644 --- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java +++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java @@ -663,6 +663,7 @@ public class JobMainTask { .valueUnit(StringUtils.EMPTY) .build(); String recognitionType = algMapping(pointExecRecord.getPatrolPointId()); + log.info("----callRemoteSendMsgCtrlMode recognitionType: {}", recognitionType); patrolResult.setRecognitionType(recognitionType); List patrolResults = new ArrayList<>(); patrolResults.add(patrolResult); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java index 33adb20..42cd36f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java @@ -78,6 +78,28 @@ public class MessageUtils { return "Point status"; case "巡视图像": return "Patrol image"; + case "相机名": + return "Camera name"; + case "系统": + return "System"; + case "点位名称": + return "Point name"; + case "状态": + return "Status"; + case "算法名称": + return "Algorithm name"; + case "读数": + return "Reading"; + case "筛选图片": + return "Filter image"; + case "筛选结果": + return "Filter results"; + case "分析图片": + return "Analyze image"; + case "分析结果": + return "Analysis results"; + case "任务详情": + return "Task details"; default: return key; } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index 8c198d2..ccc5681 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -719,7 +719,7 @@ public class PatrolResultController extends BaseController { AnalyseReqItem analyseReqItem = new AnalyseReqItem(); analyseReqItem.setObjectId(patrolResult.getDeviceId()); - //根据basedata_patrolpoint中的patrol_type_id(对应patrol_result表中的device_id)查询该预置位配置的算法列表 + //根据basedata_patrolpoint中的patrol_point_id(对应patrol_result表中的device_id)查询该预置位配置的算法列表 Map algSubtypeIdMap = patrolResultService.selectAlgorithmType(patrolResult.getDeviceId()); List algSubtypeIdList = new ArrayList<>(); logger.info("callRemoteAlgorithm algorithmTypeMap: {}", algSubtypeIdMap); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 9ec4483..e3dd811 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -30,6 +30,7 @@ import com.inspect.base.redis.service.RedisService; import com.inspect.common.security.utils.DictUtils; import com.inspect.fegin.FeignBasedataAreaService; import com.inspect.fegin.FeignBasedataPatrolPointPresetService; +import com.inspect.message.MessageUtils; import com.inspect.partrolresult.controller.PatrolResultController; import com.inspect.partrolresult.domain.AlgInfo; import com.inspect.partrolresult.domain.PatrolResult; @@ -68,6 +69,7 @@ import org.apache.poi.ss.usermodel.Sheet; import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.dom4j.Element; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -91,6 +93,9 @@ public class PatrolTaskController extends BaseController { @Resource private SftpClient sftpClient; + @Autowired + private MessageUtils MessageUtils; + public PatrolTaskController( IPatrolTaskService patrolTaskService, IPatrolTaskStatusService patrolTaskStatusService, @@ -2436,32 +2441,32 @@ public class PatrolTaskController extends BaseController { response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setHeader("Content-Disposition", "attachment; filename=\"example.xlsx\""); HSSFWorkbook workbook = new HSSFWorkbook(); - Sheet sheet = workbook.createSheet("任务详情_" + System.currentTimeMillis()); + Sheet sheet = workbook.createSheet(MessageUtils.get("任务详情") + "_" + System.currentTimeMillis()); Row row = sheet.createRow(0); Cell cell = row.createCell(0); - cell.setCellValue("序号"); + cell.setCellValue(MessageUtils.get("编号")); Cell cell1 = row.createCell(1); - cell1.setCellValue("设备"); + cell1.setCellValue(MessageUtils.get("设备")); Cell cell2 = row.createCell(2); - cell2.setCellValue("相机名"); + cell2.setCellValue(MessageUtils.get("相机名")); Cell cell3 = row.createCell(3); - cell3.setCellValue("系统"); + cell3.setCellValue(MessageUtils.get("系统")); Cell cell4 = row.createCell(4); - cell4.setCellValue("点位名称"); + cell4.setCellValue(MessageUtils.get("点位名称")); Cell cell5 = row.createCell(5); - cell5.setCellValue("状态"); + cell5.setCellValue(MessageUtils.get("状态")); Cell cell6 = row.createCell(6); - cell6.setCellValue("算法名称"); + cell6.setCellValue(MessageUtils.get("算法名称")); Cell cell7 = row.createCell(7); - cell7.setCellValue("读数"); + cell7.setCellValue(MessageUtils.get("读数")); Cell cell8 = row.createCell(8); - cell8.setCellValue("筛选图片"); + cell8.setCellValue(MessageUtils.get("筛选图片")); Cell cell9 = row.createCell(9); - cell9.setCellValue("筛选结果"); + cell9.setCellValue(MessageUtils.get("筛选结果")); Cell cell10 = row.createCell(10); - cell10.setCellValue("分析图片"); + cell10.setCellValue(MessageUtils.get("分析图片")); Cell cell11 = row.createCell(11); - cell11.setCellValue("分析结果"); + cell11.setCellValue(MessageUtils.get("分析结果")); HSSFPatriarch patriarch = (HSSFPatriarch)sheet.createDrawingPatriarch(); for(int i = 0; i < newList.size(); ++i) { Row row1 = sheet.createRow(i + 1);