forked from ard/ruoyi-api
parent: de3d8b | patch | commitdiff
艾金辉
2023-07-24 651186d7fce51274500b66d7ed8a53bedc6a1339
refs
author 艾金辉 <1144154118@qq.com>
Monday, July 24, 2023 12:47 +0800
committer 艾金辉 <1144154118@qq.com>
Monday, July 24, 2023 12:47 +0800
commit651186d7fce51274500b66d7ed8a53bedc6a1339
tree 1c708b6bb5340fae33237fb5bdb84fce13161b27 tree | zip | gz
parent de3d8be611f31118ae5dee533d22bb054670d21b view | diff
1744329b3f9c3726936a1e1542620dd2780111b6 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/impl/ArdSyCarServiceImpl.java
2 files added
15 files modified
331 ■■■■■ changed files
ard-work/pom.xml 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java 14 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java 1 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java 7 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java 19 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplAlarm.java 128 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java 39 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/forest/SYClient.java 14 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/forest/UavAuthLifeCircle.java 1 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java 1 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml 75 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java 2 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java 6 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 7 ●●●●● diff | view | raw | blame | history