|
|
1e952f6993
|
监控导入设备重名更新
|
2025-09-26 19:24:44 +08:00 |
|
|
|
c7fa730509
|
监控导入设备重名更新
|
2025-09-26 19:17:15 +08:00 |
|
|
|
7018348d79
|
监控导入设备重名更新
|
2025-09-26 19:16:25 +08:00 |
|
|
|
eeeb7cb62e
|
添加项目bug修改
|
2025-09-26 18:30:36 +08:00 |
|
|
|
6de1f82747
|
《通过http下载文件，并修改名称》修改成外网访问就直接用内网替换
|
2025-09-26 18:29:54 +08:00 |
|
|
|
cb497f1e6c
|
添加项目bug修改
|
2025-09-26 18:27:42 +08:00 |
|
|
|
76bbce23bc
|
《通过http下载文件，并修改名称》修改成外网访问就直接用内网替换
|
2025-09-26 18:26:18 +08:00 |
|
|
|
bbfa43e521
|
新危大工程
|
2025-09-26 16:14:52 +08:00 |
|
|
|
d99914d445
|
新危大工程
|
2025-09-26 16:13:33 +08:00 |
|
|
|
316f7f45e3
|
执法记录仪导出
|
2025-09-25 10:38:13 +08:00 |
|
|
|
7340d99c2c
|
执法记录仪导出
|
2025-09-25 10:37:26 +08:00 |
|
|
|
aa429808d5
|
执法记录仪导出
|
2025-09-25 10:35:29 +08:00 |
|
|
|
a24cbd89ba
|
导出图片到excel bug修复
|
2025-09-25 10:32:31 +08:00 |
|
|
|
bc06c9daa1
|
是否启用无插件播放
|
2025-09-22 18:42:21 +08:00 |
|
|
|
0560157c45
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemFileController.java
# src/main/resources/application.properties
|
2025-09-22 18:36:45 +08:00 |
|
|
|
e60344e802
|
批量删除执法记录仪文件信息等修复
|
2025-09-19 19:44:03 +08:00 |
|
|
|
400f5ee2a6
|
批量删除执法记录仪文件信息等修复
|
2025-09-19 19:32:45 +08:00 |
|
|
|
7b3b14f889
|
批量删除执法记录仪文件信息等修复
|
2025-09-19 19:32:11 +08:00 |
|
|
|
43ad1fc4db
|
mcs8下载选择的是http内网、外网
|
2025-09-19 16:52:22 +08:00 |
|
|
|
2a2e42fe5e
|
企业视频增加分组
|
2025-09-19 16:50:04 +08:00 |
|
|
|
f2f27114a8
|
mcs8下载选择的是http内网、外网
|
2025-09-19 16:49:04 +08:00 |
|
|
|
9d32aacaf5
|
企业视频增加分组
|
2025-09-19 16:47:58 +08:00 |
|
|
|
c7668679fa
|
合并分支修改
|
2025-09-19 09:18:36 +08:00 |
|
|
|
5d71396465
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java
# src/main/java/com/zhgd/xmgl/security/PermissionEvaluator.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
|
2025-09-19 09:12:33 +08:00 |
|
|
|
85ab953526
|
加上apk
|
2025-09-19 09:04:55 +08:00 |
|
|
|
3ea38f4805
|
bug修复
|
2025-09-18 18:39:42 +08:00 |
|
|
|
1f02242018
|
四色图接口
|
2025-09-18 18:39:04 +08:00 |
|
|
|
9945b42b9c
|
in权限bug修复
|
2025-09-18 18:06:17 +08:00 |
|
|
|
d774589549
|
mcu8的token失败重试
|
2025-09-17 13:44:57 +08:00 |
|
|
|
dcb707708d
|
合并管理员权限bug修复
|
2025-09-17 13:44:38 +08:00 |
|
|
|
c08de3102b
|
管理员权限bug修复
|
2025-09-17 13:41:02 +08:00 |
|
|
|
1c5e568e5b
|
mcu8的token失败重试
|
2025-09-17 11:38:29 +08:00 |
|
|
|
46317684a3
|
桥机修复
|
2025-09-16 10:34:35 +08:00 |
|
|
|
004a5f4844
|
WorkTicketType权限修复
|
2025-09-16 10:00:27 +08:00 |
|
|
|
9011dd884b
|
登录bug修复
|
2025-09-15 10:27:01 +08:00 |
|
|
|
4d41de5d08
|
登录bug修复
|
2025-09-15 10:25:04 +08:00 |
|
|
|
2a0fb4bfd7
|
提交桥机接口
|
2025-09-15 09:19:05 +08:00 |
|
|
|
b3590f3194
|
提交桥机工作循环数据文档
|
2025-09-13 16:41:16 +08:00 |
|
|
|
4b48f4ed9e
|
修改jeecg生成代码模版
|
2025-09-13 13:55:37 +08:00 |
|
|
|
b4f248d7a3
|
项目数据权限
|
2025-09-13 10:24:05 +08:00 |
|
|
|
5a2bcda4a6
|
合并uat到敦煌的冲突解决
|
2025-09-12 16:51:04 +08:00 |
|
|
|
52ab3f4a38
|
合并uat到敦煌的冲突解决
|
2025-09-12 16:44:08 +08:00 |
|
|
|
9121461a3a
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/dahuatech/icc/model/visitor/visitorAppointment/VisitorAppointmentResponse.java
# src/main/java/com/zhgd/mybatis/DataScopeHandler.java
# src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java
# src/main/java/com/zhgd/xmgl/call/IccCarCall.java
# src/main/java/com/zhgd/xmgl/call/IccWorkerCall.java
# src/main/java/com/zhgd/xmgl/call/Mcs8Call.java
# src/main/java/com/zhgd/xmgl/call/TencentCloudMessageCall.java
# src/main/java/com/zhgd/xmgl/call/YunPianMessageCall.java
# src/main/java/com/zhgd/xmgl/call/api/MessageManufacturer.java
# src/main/java/com/zhgd/xmgl/config/OperLogAspect.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyBigScreenConfigController.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ExternalCallBackController.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/controller/NoticeRemindSoundController.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/CompanyMapper.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyMapper.xml
# src/main/java/com/zhgd/xmgl/modules/basicdata/service/ICompanyService.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneAlarmController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneCurrentDataController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneWorkerCycleController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockCrawlerCraneAlarmConfigController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockCrawlerCraneCurrentDataConfigController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockCrawlerCraneWorkCycleConfigController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockTruckCraneAlarmConfigController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockTruckCraneCurrentDataConfigController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockTunnelBoringMachineCurrentDataConfigController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneAlarmController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneCurrentDataController.java
# src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TunnelBoringMachineCurrentDataController.java
# src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmConfigController.java
# src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmController.java
# src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataConfigController.java
# src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java
# src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineAlarmConfigMapper.xml
# src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataConfigMapper.xml
# src/main/java/com/zhgd/xmgl/modules/car/controller/CarMeasureSpeedDataController.java
# src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarMeasureSpeedDataServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/ocr/controller/OcrBuildLogController.java
# src/main/java/com/zhgd/xmgl/modules/ocr/controller/OcrConfigController.java
# src/main/java/com/zhgd/xmgl/modules/ocr/controller/OcrModulePlaceController.java
# src/main/java/com/zhgd/xmgl/modules/ocr/controller/OcrZonePlaceController.java
# src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrZonePlaceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordConfigController.java
# src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java
# src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordConfigController.java
# src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordController.java
# src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionRecordConfigMapper.xml
# src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveRecordConfigMapper.xml
# src/main/java/com/zhgd/xmgl/modules/project/controller/DevMessageConfigController.java
# src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevController.java
# src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java
# src/main/java/com/zhgd/xmgl/modules/project/controller/LargeScreenConfigController.java
# src/main/java/com/zhgd/xmgl/modules/project/controller/MessageConfigV2Controller.java
# src/main/java/com/zhgd/xmgl/modules/project/entity/EnableMessageDevRule.java
# src/main/java/com/zhgd/xmgl/modules/project/service/IEnableMessageDevRuleService.java
# src/main/java/com/zhgd/xmgl/modules/project/service/impl/DevMessageConfigServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
# src/main/java/com/zhgd/xmgl/modules/review/controller/IndexController.java
# src/main/java/com/zhgd/xmgl/modules/review/controller/MonitorDevController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListDetailController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListLibraryController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListMonthlyController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListPointController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListPotentialAccidentTypeController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListRuleController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListRuleItemController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceDataCenterController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceUnbuiltController.java
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListWorkableController.java
# src/main/java/com/zhgd/xmgl/modules/risk/entity/RiskListPoint.java
# src/main/java/com/zhgd/xmgl/modules/risk/entity/RiskListSource.java
# src/main/java/com/zhgd/xmgl/modules/risk/entity/bo/RiskByDateBo.java
# src/main/java/com/zhgd/xmgl/modules/risk/entity/vo/RiskListSourceVo.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/IRiskListSourceService.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListLibraryServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListMonthlyServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListPointServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListSourceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java
# src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataDailyStatisticsController.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java
# src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java
# src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java
# src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java
# src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceRecognitionController.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCallbackController.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerExitConfigController.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldConfigController.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldController.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerItemRecordController.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerReviewVerifyController.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityPostponeRectifyApplyController.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordDraftController.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityPostponeRectifyApplyServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java
# src/main/java/com/zhgd/xmgl/security/PermissionEvaluator.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
# src/main/java/com/zhgd/xmgl/task/CarInfoTask.java
# src/main/java/com/zhgd/xmgl/task/MessageDevRuleTask.java
# src/main/java/com/zhgd/xmgl/task/ProjectTask.java
# src/main/java/com/zhgd/xmgl/task/RiskListTask.java
# src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
# src/main/java/com/zhgd/xmgl/task/WorkerTask.java
# src/main/java/com/zhgd/xmgl/util/EasyPoiUtil.java
# src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
# src/main/java/com/zhgd/xmgl/util/FileUtils.java
# src/main/java/com/zhgd/xmgl/util/WordUtils.java
# src/main/resources/application-gsx-other-env-show.properties
# src/main/resources/application.properties
|
2025-09-12 16:18:38 +08:00 |
|
|
|
dd2b19626c
|
优化权限
|
2025-09-12 14:29:08 +08:00 |
|
|
|
bd1c89670a
|
优化权限
|
2025-09-12 13:41:52 +08:00 |
|
|
|
2316971b56
|
优化权限和bug修复
|
2025-09-11 11:21:50 +08:00 |
|
|
|
70dfe3dbe9
|
脱敏处理
|
2025-09-11 11:18:53 +08:00 |
|
|
|
d69bdf3bbc
|
优化权限和bug修复
|
2025-09-11 11:18:30 +08:00 |
|
|
|
b214faacd6
|
优化权限和bug修复
|
2025-09-11 09:08:56 +08:00 |
|
|
|
9e49c6f7bc
|
优化权限和bug修复
|
2025-09-10 20:26:17 +08:00 |
|
