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 5ddf73d5a6032c35b9eda45dc7ebcea36f55e978 2 parents c016cf6 + 57ae0cd casic_zt authored on 28 Nov 2023

Showing 42 changed files

• casic-ptz/src/main/java/com/casic/missiles/config/HiLibProperty.java
• casic-ptz/src/main/java/com/casic/missiles/config/HikLibConfig.java
• casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java
• casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.java
• casic-server/src/main/java/com/casic/missiles/modular/constants/RobotDictConstants.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.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/RobotSystemConfigController.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RouteInfoController.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml
• casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotInfo.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotStatusInfo.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.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/enums/InstructStatusMsgEnums.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/cmd/ChangPcdCmdHandler.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/handler/cmd/SoftwareStopCmdHandler.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/SensorStatusMsgHandler.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/SoftwareStopRequest.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/dto/SpeedResponseDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/opt/instruct/response/SpeedResponseDTO.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/opt/instruct/response/VoltageResponseDTO.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/IRobotSystemConfigService.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/RobotSystemConfigServiceImpl.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/vo/IdsDTO.java
• casic-server/src/main/java/com/casic/missiles/modular/robot/vo/RobotSystemConfigVO.java
• casic-server/src/main/java/com/casic/missiles/mqtt/MsgUtils.java
• casic-web/src/main/build/bin/start.bat
• casic-web/src/main/java/com/casic/missiles/CasicApplication.java
• casic-web/src/main/resources/config/application-dev.yml
• casic-web/src/main/resources/config/application.yml

Show notes View casic-ptz/src/main/java/com/casic/missiles/config/HiLibProperty.java 100644 → 0

Ignore Space Show notes View casic-ptz/src/main/java/com/casic/missiles/config/HikLibConfig.java

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

Ignore Space Show notes View casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/impl/HCNetServiceImpl.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/AlarmRecordController.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/RobotSystemConfigController.java 0 → 100644

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

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

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml 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/model/RobotStatusInfo.java

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

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

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

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

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

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

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/SoftwareStopRequest.java 0 → 100644

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

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

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

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

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/IRobotSystemConfigService.java 0 → 100644

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/RobotSystemConfigServiceImpl.java 0 → 100644

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/vo/IdsDTO.java 0 → 100644

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

Ignore Space Show notes View casic-server/src/main/java/com/casic/missiles/mqtt/MsgUtils.java

Ignore Space Show notes View casic-web/src/main/build/bin/start.bat

Ignore Space Show notes View casic-web/src/main/java/com/casic/missiles/CasicApplication.java

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.yml

Show line notes below