parent: d8a01a | patch | commitdiff
cjl
2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551
refs
author cjl <276999030@qq.com>
Wednesday, November 1, 2023 16:56 +0800
committer cjl <276999030@qq.com>
Wednesday, November 1, 2023 16:56 +0800
commit23ad681499f8652fe4e2084e6492ececb6fc7551
tree 96c2288970b424a63346672761630de808210fed tree | zip | gz
parent d8a01a15bf6f310734a18eb7740c7f5ef2d19736 view | diff
2744ca3c268b64b3245d274b2979a047817d4402 view | diff 
Merge remote-tracking branch 'origin/cjl' into qa
5 files added
42 files modified
1093 ■■■■■ changed files
screen-api/pom.xml 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AllocationController.java 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AppAllocationController.java 13 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AppDevicController.java 72 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AppUserController.java 36 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/CruiserController.java 106 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/UAVController.java 19 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/HistorySecondUavMapper.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/MonitorPointMapper.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/SpecialDeviceMapper.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVGetBD.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultDTO.java 121 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/dto/uav/UAVResultListDTO.java 34 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/device/AppDeviceVo.java 46 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/device/OrganizationVO.java 14 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/pojo/vo/user/QxUser.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/AllocationService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/DeviceService.java 15 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/HistorySecondUavService.java 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/MonitorPointService.java 7 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/OrganizationService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java 5 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/UAVService.java 3 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java 30 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 41 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/HistorySecondUavServiceImpl.java 42 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java 30 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java 17 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UAVServiceImpl.java 276 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java 21 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/utils/WechatUtils.java 4 ●●●●● diff | view | raw | blame | history
screen-api/src/main/java/com/moral/api/vo/WxMssVo.java 13 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/AllocationMapper.xml 2 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/DeviceMapper.xml 16 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/HistorySecondUavMapper.xml 8 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/MonitorPointMapper.xml 6 ●●●●● diff | view | raw | blame | history
screen-api/src/main/resources/mapper/SpecialDeviceMapper.xml 9 ●●●●● diff | view | raw | blame | history
screen-job/src/main/java/com/moral/api/controller/PubController.java 9 ●●●●● diff | view | raw | blame | history
screen-job/src/main/resources/application-dev.yml 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/application-dev.yml 2 ●●●●● diff | view | raw | blame | history
screen-manage/src/main/resources/mapper/DeviceAdjustValueMapper.xml 1 ●●●●● diff | view | raw | blame | history