Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/casic-robot-inspection into dev

Fork: 0

codedev / casic-robot-inspection

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/constants/RobotDictConstants.java dev
commit 35ce6e18c34e4d98936e39cf5a6f403a1e48c5ae 2 parents ef9e5c9 + 7fcc4d7 casic_zt authored on 7 Dec 2023

Patch

Unified Split

Showing 30 changed files

Ignore Space Show notes View casic-ptz/src/main/java/com/casic/missiles/modular/ptz/controller/PtzNetController.java

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

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/common/WebSocket.java

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/TaskInfoController.java

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

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

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

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/InstructStatusMsgEnums.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/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/PoseMessageResponseDTO.java

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

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

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/ITaskInfoService.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.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/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/PcdDownUtil.java

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/util/WordUtil.java 0 → 100644

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

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/report.docx 0 → 100644
Not supported

Show line notes below