diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java index fdded64..24fa9f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java @@ -96,6 +96,7 @@ } if (robotInfo.getAlarmThreshold() != null) { update.set(RobotInfo::getAlarmThreshold, robotInfo.getAlarmThreshold()); + update.set(RobotInfo::getMaxThreshold, robotInfo.getAlarmThreshold()); } if (robotInfo.getGridHeight() != null && robotInfo.getGridWidth() != null) { update.set(RobotInfo::getGridHeight, robotInfo.getGridHeight()); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java index fdded64..24fa9f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java @@ -96,6 +96,7 @@ } if (robotInfo.getAlarmThreshold() != null) { update.set(RobotInfo::getAlarmThreshold, robotInfo.getAlarmThreshold()); + update.set(RobotInfo::getMaxThreshold, robotInfo.getAlarmThreshold()); } if (robotInfo.getGridHeight() != null && robotInfo.getGridWidth() != null) { update.set(RobotInfo::getGridHeight, robotInfo.getGridHeight()); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 603262b..f666126 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -341,19 +341,17 @@ * @param robotId 机器人ID */ private void pathPlaning(Long longId, RobotInfo robotInfo, GridPointDTO pointDTO, Long taskId, String robotId, TaskInfo taskInfo,PoseMessageResponseDTO curPoint) { - log.info("curr point:{}",curPoint); if (taskId != null) { //规划节点 PointNextDTO pointNextDTO = CacheUtil.get(RobotDictConstants.CACHE_SCHEMA, RobotDictConstants.KEY_CUR_ESTIMATE_GRID + robotId); GridPointDTO oldEstimateGrid = GridPointDTO.convertGridPoint(pointNextDTO); Boolean flag = lockPlanIngFlag(robotId); - //是否到达预期栅格 if (!flag) { - log.info("未获取到规划任务,直接结束:{}",pointDTO); return; } - log.debug("pointDTO:{}", pointDTO); + log.info("curr point:{}",curPoint); + log.debug("curr pointGrid:{}", pointDTO); log.debug("oldEstimateGrid:{}", oldEstimateGrid); try { if (pointNextDTO == null || oldEstimateGrid==null || isEquals(pointDTO, oldEstimateGrid,robotInfo)) { @@ -401,7 +399,6 @@ //是否触发停止状态 if (!response.isEnd()) { - log.debug("task planning-- xun dian robotId:{},taskId:{}", robotId, taskId); //机器人寻点指令下发 sendTargetPoint(robotInfo, response,curPoint); } else { diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java index fdded64..24fa9f5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java @@ -96,6 +96,7 @@ } if (robotInfo.getAlarmThreshold() != null) { update.set(RobotInfo::getAlarmThreshold, robotInfo.getAlarmThreshold()); + update.set(RobotInfo::getMaxThreshold, robotInfo.getAlarmThreshold()); } if (robotInfo.getGridHeight() != null && robotInfo.getGridWidth() != null) { update.set(RobotInfo::getGridHeight, robotInfo.getGridHeight()); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java index 603262b..f666126 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java @@ -341,19 +341,17 @@ * @param robotId 机器人ID */ private void pathPlaning(Long longId, RobotInfo robotInfo, GridPointDTO pointDTO, Long taskId, String robotId, TaskInfo taskInfo,PoseMessageResponseDTO curPoint) { - log.info("curr point:{}",curPoint); if (taskId != null) { //规划节点 PointNextDTO pointNextDTO = CacheUtil.get(RobotDictConstants.CACHE_SCHEMA, RobotDictConstants.KEY_CUR_ESTIMATE_GRID + robotId); GridPointDTO oldEstimateGrid = GridPointDTO.convertGridPoint(pointNextDTO); Boolean flag = lockPlanIngFlag(robotId); - //是否到达预期栅格 if (!flag) { - log.info("未获取到规划任务,直接结束:{}",pointDTO); return; } - log.debug("pointDTO:{}", pointDTO); + log.info("curr point:{}",curPoint); + log.debug("curr pointGrid:{}", pointDTO); log.debug("oldEstimateGrid:{}", oldEstimateGrid); try { if (pointNextDTO == null || oldEstimateGrid==null || isEquals(pointDTO, oldEstimateGrid,robotInfo)) { @@ -401,7 +399,6 @@ //是否触发停止状态 if (!response.isEnd()) { - log.debug("task planning-- xun dian robotId:{},taskId:{}", robotId, taskId); //机器人寻点指令下发 sendTargetPoint(robotInfo, response,curPoint); } else { diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 22d4aa9..f54377c 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -4,7 +4,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.83.36:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true username: root password: 123456 druid: