吉安感知网项目-后端
parent: c1047c | patch | commitdiff
rain
2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb
refs
author rain <1679827795@qq.com>
Monday, February 9, 2026 11:00 +0800
committer rain <1679827795@qq.com>
Monday, February 9, 2026 11:00 +0800
commit66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb
tree d7658609cb34f2bd8009a653fdefe0f0dfb77b06 tree | zip | gz
parent c1047c270b1340f9bba7d154aef1a24698c33d1e view | diff
04d27ad79f9bf0c9b5f96e094170ba94c2d63a31 view | diff 
Merge remote-tracking branch 'origin/master'
102 files modified
16 files added
3128 ■■■■■ changed files
drone-auth/docker-compose-prod.yml 2 ●●●●● diff | view | raw | blame | history
drone-auth/docker-compose-test.yml 2 ●●●●● diff | view | raw | blame | history
drone-auth/src/main/resources/log/logback-prod.xml 9 ●●●●● diff | view | raw | blame | history
drone-auth/src/main/resources/log/logback-test.xml 9 ●●●●● diff | view | raw | blame | history
drone-common/src/main/java/org/sxkj/common/constant/LauncherConstant.java 2 ●●●●● diff | view | raw | blame | history
drone-common/src/main/java/org/sxkj/common/utils/HeaderUtils.java 22 ●●●●● diff | view | raw | blame | history
drone-ops/drone-flow/src/main/resources/log/logback-dev.xml 113 ●●●●● diff | view | raw | blame | history
drone-ops/drone-flow/src/main/resources/log/logback-prod.xml 222 ●●●●● diff | view | raw | blame | history
drone-ops/drone-flow/src/main/resources/log/logback-test.xml 222 ●●●●● diff | view | raw | blame | history
drone-ops/drone-log/docker-compose-prod.yml 2 ●●●●● diff | view | raw | blame | history
drone-ops/drone-log/docker-compose-test.yml 2 ●●●●● diff | view | raw | blame | history
drone-ops/drone-log/src/main/resources/log/logback-prod.xml 9 ●●●●● diff | view | raw | blame | history
drone-ops/drone-log/src/main/resources/log/logback-test.xml 9 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/docker-compose-prod.yml 2 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/docker-compose-test.yml 2 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml 2 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/AttachServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/src/main/java/org/sxkj/resource/service/impl/FileServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/src/main/resources/application-dev.yml 33 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/src/main/resources/application.yml 32 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/src/main/resources/log/logback-prod.xml 8 ●●●●● diff | view | raw | blame | history
drone-ops/drone-resource/src/main/resources/log/logback-test.xml 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/docker-compose-prod.yml 2 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/docker-compose-test.yml 2 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java 33 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.java 23 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml 53 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.java 10 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml 41 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.java 6 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml 13 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/param/FwAreaDivideListParam.java 73 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/param/FwDefenseSceneManagePageParam.java 3 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java 8 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java 10 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java 187 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneManageServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java 177 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java 26 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml 6 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwEffectEvalServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java 10 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java 2 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml 57 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceMaintainPlanServiceImpl.java 11 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java 53 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/CockpitFwDeviceVO.java 10 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceVO.java 3 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/dto/FwDroneFlightRecordDTO.java 12 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml 19 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml 25 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/param/FwDroneAlarmRecordExportParam.java 3 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/param/FwDroneFlightRecordExportParam.java 3 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneFlightRecordServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/resources/log/logback-prod.xml 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-fw/src/main/resources/log/logback-test.xml 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/docker-compose-prod.yml 6 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/docker-compose-test.yml 3 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/common/IdParam.java 3 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/mapper/GdFlyerMapper.xml 1 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdApplicationInnovationServiceImpl.java 31 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataEvaluationServiceImpl.java 16 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdDataObjectionServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/service/impl/GdSupplyDemandServiceImpl.java 12 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDevicePayloadController.java 137 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java 2 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdTaskResultController.java 2 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdManageDevicePayloadDTO.java 34 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuPayloadListDTO.java 23 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/dto/GdXingtuPilotListDTO.java 4 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/entity/GdManageDevicePayloadEntity.java 64 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java 1 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/excel/GdManageDevicePayloadExcel.java 80 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml 11 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDevicePayloadMapper.java 52 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDevicePayloadMapper.xml 37 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.java 8 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml 14 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml 2 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdManageDevicePageParam.java 5 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/scheduler/GdXingtuDeviceScheduler.java 1 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdManageDevicePayloadService.java 52 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java 7 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdTaskResultService.java 6 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdManageDevicePayloadServiceImpl.java 54 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdManageDeviceServiceImpl.java 122 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java 125 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdTaskResultServiceImpl.java 44 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderFlowServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdManageDevicePayloadVO.java 50 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/wrapper/GdManageDevicePayloadWrapper.java 50 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/resources/log/logback-prod.xml 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-gd/src/main/resources/log/logback-test.xml 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/docker-compose-prod.yml 4 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/docker-compose-test.yml 3 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/controller/DeptController.java 11 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/controller/ExternalController.java 160 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/controller/RoleController.java 4 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/controller/UserController.java 32 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/excel/DeptImportExcel.java 8 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RegionMapper.xml 4 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/service/IUserService.java 7 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java 14 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/UserServiceImpl.java 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/resources/log/logback-prod.xml 9 ●●●●● diff | view | raw | blame | history
drone-service/drone-system/src/main/resources/log/logback-test.xml 9 ●●●●● diff | view | raw | blame | history
drone-task/drone-odm/docker-compose-prod.yml 2 ●●●●● diff | view | raw | blame | history
drone-task/drone-odm/docker-compose-test.yml 2 ●●●●● diff | view | raw | blame | history
drone-task/drone-odm/src/main/resources/log/logback-prod.xml 9 ●●●●● diff | view | raw | blame | history
drone-task/drone-odm/src/main/resources/log/logback-test.xml 9 ●●●●● diff | view | raw | blame | history
pom.xml 10 ●●●●● diff | view | raw | blame | history