Browse Source

巡视任务详情导出报告语言修改

master
wangguangyuan 8 months ago
parent
commit
69707707c6
4 changed files with 42 additions and 14 deletions
  1. +1
    -0
      inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
  2. +22
    -0
      inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java
  3. +1
    -1
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
  4. +18
    -13
      inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

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

@ -663,6 +663,7 @@ public class JobMainTask {
.valueUnit(StringUtils.EMPTY) .valueUnit(StringUtils.EMPTY)
.build(); .build();
String recognitionType = algMapping(pointExecRecord.getPatrolPointId()); String recognitionType = algMapping(pointExecRecord.getPatrolPointId());
log.info("----callRemoteSendMsgCtrlMode recognitionType: {}", recognitionType);
patrolResult.setRecognitionType(recognitionType); patrolResult.setRecognitionType(recognitionType);
List<PatrolResult> patrolResults = new ArrayList<>(); List<PatrolResult> patrolResults = new ArrayList<>();
patrolResults.add(patrolResult); patrolResults.add(patrolResult);


+ 22
- 0
inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java View File

@ -78,6 +78,28 @@ public class MessageUtils {
return "Point status"; return "Point status";
case "巡视图像": case "巡视图像":
return "Patrol image"; 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: default:
return key; return key;
} }


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

@ -719,7 +719,7 @@ public class PatrolResultController extends BaseController {
AnalyseReqItem analyseReqItem = new AnalyseReqItem(); AnalyseReqItem analyseReqItem = new AnalyseReqItem();
analyseReqItem.setObjectId(patrolResult.getDeviceId()); analyseReqItem.setObjectId(patrolResult.getDeviceId());
//根据basedata_patrolpoint中的patrol_type_id(对应patrol_result表中的device_id)查询该预置位配置的算法列表
//根据basedata_patrolpoint中的patrol_point_id(对应patrol_result表中的device_id)查询该预置位配置的算法列表
Map<String, String> algSubtypeIdMap = patrolResultService.selectAlgorithmType(patrolResult.getDeviceId()); Map<String, String> algSubtypeIdMap = patrolResultService.selectAlgorithmType(patrolResult.getDeviceId());
List<String> algSubtypeIdList = new ArrayList<>(); List<String> algSubtypeIdList = new ArrayList<>();
logger.info("callRemoteAlgorithm algorithmTypeMap: {}", algSubtypeIdMap); logger.info("callRemoteAlgorithm algorithmTypeMap: {}", algSubtypeIdMap);


+ 18
- 13
inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java View File

@ -30,6 +30,7 @@ import com.inspect.base.redis.service.RedisService;
import com.inspect.common.security.utils.DictUtils; import com.inspect.common.security.utils.DictUtils;
import com.inspect.fegin.FeignBasedataAreaService; import com.inspect.fegin.FeignBasedataAreaService;
import com.inspect.fegin.FeignBasedataPatrolPointPresetService; import com.inspect.fegin.FeignBasedataPatrolPointPresetService;
import com.inspect.message.MessageUtils;
import com.inspect.partrolresult.controller.PatrolResultController; import com.inspect.partrolresult.controller.PatrolResultController;
import com.inspect.partrolresult.domain.AlgInfo; import com.inspect.partrolresult.domain.AlgInfo;
import com.inspect.partrolresult.domain.PatrolResult; import com.inspect.partrolresult.domain.PatrolResult;
@ -68,6 +69,7 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.dom4j.Document; import org.dom4j.Document;
import org.dom4j.DocumentHelper; import org.dom4j.DocumentHelper;
import org.dom4j.Element; import org.dom4j.Element;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -91,6 +93,9 @@ public class PatrolTaskController extends BaseController {
@Resource @Resource
private SftpClient sftpClient; private SftpClient sftpClient;
@Autowired
private MessageUtils MessageUtils;
public PatrolTaskController( public PatrolTaskController(
IPatrolTaskService patrolTaskService, IPatrolTaskService patrolTaskService,
IPatrolTaskStatusService patrolTaskStatusService, IPatrolTaskStatusService patrolTaskStatusService,
@ -2436,32 +2441,32 @@ public class PatrolTaskController extends BaseController {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("Content-Disposition", "attachment; filename=\"example.xlsx\""); response.setHeader("Content-Disposition", "attachment; filename=\"example.xlsx\"");
HSSFWorkbook workbook = new HSSFWorkbook(); HSSFWorkbook workbook = new HSSFWorkbook();
Sheet sheet = workbook.createSheet("任务详情_" + System.currentTimeMillis());
Sheet sheet = workbook.createSheet(MessageUtils.get("任务详情") + "_" + System.currentTimeMillis());
Row row = sheet.createRow(0); Row row = sheet.createRow(0);
Cell cell = row.createCell(0); Cell cell = row.createCell(0);
cell.setCellValue("序号");
cell.setCellValue(MessageUtils.get("编号"));
Cell cell1 = row.createCell(1); Cell cell1 = row.createCell(1);
cell1.setCellValue("设备");
cell1.setCellValue(MessageUtils.get("设备"));
Cell cell2 = row.createCell(2); Cell cell2 = row.createCell(2);
cell2.setCellValue("相机名");
cell2.setCellValue(MessageUtils.get("相机名"));
Cell cell3 = row.createCell(3); Cell cell3 = row.createCell(3);
cell3.setCellValue("系统");
cell3.setCellValue(MessageUtils.get("系统"));
Cell cell4 = row.createCell(4); Cell cell4 = row.createCell(4);
cell4.setCellValue("点位名称");
cell4.setCellValue(MessageUtils.get("点位名称"));
Cell cell5 = row.createCell(5); Cell cell5 = row.createCell(5);
cell5.setCellValue("状态");
cell5.setCellValue(MessageUtils.get("状态"));
Cell cell6 = row.createCell(6); Cell cell6 = row.createCell(6);
cell6.setCellValue("算法名称");
cell6.setCellValue(MessageUtils.get("算法名称"));
Cell cell7 = row.createCell(7); Cell cell7 = row.createCell(7);
cell7.setCellValue("读数");
cell7.setCellValue(MessageUtils.get("读数"));
Cell cell8 = row.createCell(8); Cell cell8 = row.createCell(8);
cell8.setCellValue("筛选图片");
cell8.setCellValue(MessageUtils.get("筛选图片"));
Cell cell9 = row.createCell(9); Cell cell9 = row.createCell(9);
cell9.setCellValue("筛选结果");
cell9.setCellValue(MessageUtils.get("筛选结果"));
Cell cell10 = row.createCell(10); Cell cell10 = row.createCell(10);
cell10.setCellValue("分析图片");
cell10.setCellValue(MessageUtils.get("分析图片"));
Cell cell11 = row.createCell(11); Cell cell11 = row.createCell(11);
cell11.setCellValue("分析结果");
cell11.setCellValue(MessageUtils.get("分析结果"));
HSSFPatriarch patriarch = (HSSFPatriarch)sheet.createDrawingPatriarch(); HSSFPatriarch patriarch = (HSSFPatriarch)sheet.createDrawingPatriarch();
for(int i = 0; i < newList.size(); ++i) { for(int i = 0; i < newList.size(); ++i) {
Row row1 = sheet.createRow(i + 1); Row row1 = sheet.createRow(i + 1);


Loading…
Cancel
Save