forked from ard/ruoyi-api
parent: 2df696 | patch | commitdiff
aijinhui
2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c
refs
author aijinhui <aijinhui>
Friday, February 23, 2024 14:07 +0800
committer aijinhui <aijinhui>
Friday, February 23, 2024 14:07 +0800
commit0abccf5e570dce53a802bca4ce25118dd900692c
tree f0e85190d9a22a06b6f84bdda810d22b4586cb56 tree | zip | gz
parent 2df696b07d0ffdf7829d4d9cd3da23162dec8799 view | diff
d160214ce508d55dc64b3ea6656ac13c4fa7ecdc view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java
#	ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml
2 files added
23 files modified
1414 ■■■■■ changed files
ard-work/pom.xml 9 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java 16 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarmpoints/well/mapper/ArdAlarmpointsWellMapper.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/IArdAlarmpointsWellService.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarmpoints/well/service/impl/ArdAlarmpointsWellServiceImpl.java 262 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/application/controller/ArdAppApplicationController.java 14 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/application/service/impl/ArdAppApplicationServiceImpl.java 184 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/appcontainer/AppContainer.java 19 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java 65 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/mapper/ArdAppPositionMapper.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java 9 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java 159 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java 386 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/uav/websocketclient/UAVWebsocketClient.java 45 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java 85 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/forest/SYClient.java 3 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/alarmpoints/ArdAlarmpointsWellMapper.xml 40 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml 12 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java 1 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-dev.yml 36 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-prod.yml 11 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java 4 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 29 ●●●●● diff | view | raw | blame | history