Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev Conflicts: casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java dev
commit cec534ae7cbb76dbfee2658f3565157b53597eee 2 parents 705fcc2 + b862c7c casic_zt authored on 8 Apr 2024

Showing 36 changed files

• casic-server/pom.xml
• casic-server/src/main/java/com/casic/missiles/modular/constants/RobotDictConstants.java
• casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotOptController.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dto/GridDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dto/GridPushDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dto/RobotInfoSetDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dto/TaskEndMsg.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.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/StopStateMsgHandler.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/VoltageResponseMsgHandler.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/TargetGridRequest.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/TaskModeRequest.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotInfoService.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/RobotCacheServiceImpl.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/TaskInfoServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/utils/AlgorithmUtils.java
• casic-web/pom.xml
• casic-web/src/main/resources/config/application-dev.yml
• casic-web/src/main/resources/config/application-test.yml
• casic-web/src/main/resources/config/application.yml
• casic-web/src/main/resources/config/path/Mission1/admatrix.txt
• casic-web/src/main/resources/config/path/Mission1/expandmap.txt
• casic-web/src/main/resources/config/path/Mission1/separate_img.png
• casic-web/src/main/resources/config/path/Mission1/separate_img.txt
• casic-web/src/main/resources/config/path/map.txt
• casic-web/src/main/resources/config/path/map2.txt
• casic-web/src/main/resources/config/path/map3.txt

Ignore Space Show notes View casic-server/pom.xml

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/neutron/service/impl/PsdServiceImpl.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.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/dto/GridDTO.java 0 → 100644

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

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

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

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

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/enums/InstructStatusMsgEnums.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/StopStateMsgHandler.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/msg/VoltageResponseMsgHandler.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/TargetGridRequest.java 0 → 100644

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

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotInfoService.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/RobotCacheServiceImpl.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/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-web/pom.xml

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

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

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

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

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

Ignore Space Show notes View casic-web/src/main/resources/config/path/Mission1/separate_img.png 0 → 100644

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

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

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

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

Show line notes below