Browse Source

fix:巡视结果点位去掉重复的处理

master
WangGuangYuan 4 days ago
parent
commit
643d9deb95
1 changed files with 14 additions and 14 deletions
  1. +14
    -14
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

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

@ -1478,14 +1478,14 @@ public class PatrolResultController extends BaseController {
PatrolResult patrolResultParam = new PatrolResult();
patrolResultParam.setTaskPatrolledId(patrolResult.getTaskPatrolledId());
str = parseObject.getString("SendCode");
// str = parseObject.getString("SendCode");
String strfile;
if ("2".equals(datetype)) {
logger.info("feedback from robot");
Long patrolPointId = baseDataClient.queryPatrolPointId(str + "|" + patrolResult.getDeviceId());
if (patrolPointId != null) {
patrolResult.setDeviceId(patrolPointId.toString());
}
// if ("2".equals(datetype)) {
// logger.info("feedback from robot");
// Long patrolPointId = baseDataClient.queryPatrolPointId(str + "|" + patrolResult.getDeviceId());
// if (patrolPointId != null) {
// patrolResult.setDeviceId(patrolPointId.toString());
// }
// InputStream is = null;
// String filePath = patrolResult.getFilePath();
// if (filePath != null && !filePath.isEmpty()) {
@ -1511,15 +1511,15 @@ public class PatrolResultController extends BaseController {
// logger.info("ImageUtil.overlaying error: {}", e.getMessage());
// }
// }
}
// }
// 无人机点位id处理
if ("3".equals(datetype)) {
Long patrolPointId = baseDataClient.queryPatrolPointId(str + "|" + patrolResult.getDeviceId());
if (patrolPointId != null) {
patrolResult.setDeviceId(patrolPointId.toString());
}
}
// if ("3".equals(datetype)) {
// Long patrolPointId = baseDataClient.queryPatrolPointId(str + "|" + patrolResult.getDeviceId());
// if (patrolPointId != null) {
// patrolResult.setDeviceId(patrolPointId.toString());
// }
// }
patrolResultParam.setDeviceId(patrolResult.getDeviceId());
patrolResultParam.setDataType(datetype);


Loading…
Cancel
Save