Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev Conflicts: casic-web/src/main/resources/config/application-dev.yml dev
commit 1d77a2454ef13d7dbe017c922de6e5e297d992bc 2 parents 402a621 + e1f5269 casic_zt authored on 22 Mar 2024

Showing 40 changed files

• .gitignore
• casic-server/src/main/java/com/casic/missiles/modular/constants/RobotDictConstants.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/controller/TaskGridInfoController.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/controller/TaskInfoController.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dao/TaskGridInfoMapper.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/TaskGridInfoMapper.xml
• casic-server/src/main/java/com/casic/missiles/modular/robot/dto/AlgorithmResponse.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dto/GridPointDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dto/PathInitDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dto/PathPlanDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/model/TaskGridInfo.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/model/TaskInfo.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructCodeEnums.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/cmd/TargetPointCmdHandler.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/AppCostMapHandler.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/StopStateMsgHandler.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/impl/RobotOptServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/BaseRobotCmdDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/response/StopStateResponseDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlgorithmService.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotStatusInfoService.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskGridInfoService.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotStatusInfoServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotTrajectoryInfoServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskGridInfoServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/utils/AlgorithmUtils.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/vo/TaskGridInfoVO.java
• casic-web/src/main/resources/config/application.yml
• casic-web/src/main/resources/config/path/PathPlanning.exe
• casic-web/src/main/resources/config/path/PathPlanning_init.exe
• casic-web/src/main/resources/config/path/map.txt
• casic-web/src/main/resources/config/path/report.docx

Ignore Space Show notes View .gitignore

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/constants/RobotDictConstants.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/controller/TaskGridInfoController.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/controller/TaskInfoController.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/dao/TaskGridInfoMapper.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/TaskGridInfoMapper.xml 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/dto/AlgorithmResponse.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/dto/GridPointDTO.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/dto/PathInitDTO.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/dto/PathPlanDTO.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/model/TaskGridInfo.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/model/TaskInfo.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructCodeEnums.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/AbstractSocketHandler.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/cmd/TargetPointCmdHandler.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/AppCostMapHandler.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/PoseMessageMsgHandler.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/StopStateMsgHandler.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/impl/RobotOptServiceImpl.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/BaseRobotCmdDTO.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/StartTrackRequest.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/response/StopStateResponseDTO.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlgorithmService.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotStatusInfoService.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskGridInfoService.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/ITaskInfoService.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlgorithmServiceImpl.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotInfoServiceImpl.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotStatusInfoServiceImpl.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotTrajectoryInfoServiceImpl.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskGridInfoServiceImpl.java 0 → 100644

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/TaskInfoServiceImpl.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/utils/AlgorithmUtils.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/vo/TaskGridInfoVO.java 0 → 100644

Ignore Space Show notes View casic-web/src/main/resources/config/application.yml

Show notes View casic-web/src/main/resources/config/path/PathPlanning.exe 100644 → 0
Not supported

Show notes View casic-web/src/main/resources/config/path/PathPlanning_init.exe 100644 → 0
Not supported

Ignore Space Show notes View casic-web/src/main/resources/config/path/map.txt 0 → 100644

Ignore Space Show notes View casic-web/src/main/resources/config/path/report.docx
Not supported

Show line notes below