forked from ard/ruoyi-api
parent: 90edbd | patch | commitdiff
艾金辉
2023-07-22 64c7668818aa8272c0aae206a3c0f7007ca38e5d
refs
author 艾金辉 <1144154118@qq.com>
Saturday, July 22, 2023 16:37 +0800
committer 艾金辉 <1144154118@qq.com>
Saturday, July 22, 2023 16:37 +0800
commit64c7668818aa8272c0aae206a3c0f7007ca38e5d
tree ca46eeb381b328ca6564eeda20167b1bf71ab603 tree | zip | gz
parent 90edbd96c576947debb7cdc7739c05a0c74b2748 view | diff
e03adc9fa7d0bc2fbb9c78b67de3c734e5d9a643 view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
#	ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
#	ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
19 files added
22 files modified
5 files renamed
2295 ■■■■■ changed files
ard-work/pom.xml 58 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java 7 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java 87 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/domain/ArdAppPosition.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/mapper/ArdAppPositionMapper.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java 104 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTask.java 149 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskDetail.java 149 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/domain/ArdAppTaskPic.java 65 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java 113 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java 61 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java 190 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/tasktext/controller/ArdAppTaskTextController.java 104 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/tasktext/domain/ArdAppTaskText.java 65 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/tasktext/mapper/ArdAppTaskTextMapper.java 61 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/tasktext/service/IArdAppTaskTextService.java 61 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/tasktext/service/impl/ArdAppTaskTextServiceImpl.java 89 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/util/minio/MinioUtils.java 74 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java 8 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java 22 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java 1 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java 42 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/gps31/PositionContainer.java 19 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImpl.java 109 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java 160 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java 7 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java 11 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/test/ReadAccessDatabase.java 85 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml 190 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/app/ArdAppTaskTextMapper.xml 63 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml 8 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml 3 ●●●●● diff | view | raw | blame | history
lib/mediamtx/ffmpeg.exe diff | view | raw | blame | history
lib/mediamtx/mediamtx.yml 24 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java 8 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java 10 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 12 ●●●●● diff | view | raw | blame | history