|
|
0eb84d4cf6
|
合并解决冲突或升级jdk17语法
|
2025-10-16 16:57:07 +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 |
|
|
|
7aa4d307e7
|
转换Base64到webp格式和bug修复
|
2025-09-05 17:47:33 +08:00 |
|
|
|
b679c12c48
|
bug修复
|
2025-09-05 11:39:47 +08:00 |
|
|
|
b2e08bb3fe
|
去掉spring-boot-admin-starter-client
|
2025-09-04 11:10:09 +08:00 |
|
|
|
7a6a3232ea
|
合并到jdk17分支
|
2025-09-04 10:34:04 +08:00 |
|
|
|
be575a8270
|
依赖升级
|
2025-08-26 16:36:35 +08:00 |
|
|
|
068ea831ec
|
依赖升级
|
2025-08-25 13:41:30 +08:00 |
|
|
|
5b4b8a811c
|
Merge branch 'prod' into mod_security
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/project/enums/ProjectUfaceConfigSupplierTypeEnum.java
# src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/WorkerTask.java
|
2025-08-21 18:56:44 +08:00 |
|
|
|
87b7edc988
|
升级jdk17
|
2025-08-20 14:07:03 +08:00 |
|
|
|
fd4fba18f5
|
升级jdk17
|
2025-08-19 17:22:36 +08:00 |
|
|
|
0cf0c64722
|
修改bug
|
2025-08-13 11:43:02 +08:00 |
|
|
|
5101d248a5
|
仁智测控转发扬尘Hj212集成
|
2025-08-12 17:14:01 +08:00 |
|
|
|
369847e9d3
|
接入SmartJavaAIOrc
|
2025-08-04 11:34:57 +08:00 |
|
|
|
ccf93552c0
|
短信配置
|
2025-07-29 18:17:51 +08:00 |
|
|
|
896ff7ba47
|
icc提交
|
2025-07-15 11:20:42 +08:00 |
|
|
|
db34228767
|
整合扬尘hj212
|
2025-07-01 15:03:04 +08:00 |
|
|
|
f592aff700
|
打包失败修改
|
2025-06-21 14:01:01 +08:00 |
|
|
|
6616beeafa
|
maven打包错误bug修改
|
2025-05-06 10:49:34 +08:00 |
|
|
|
6e8b06cd93
|
AI功能
|
2025-04-11 17:30:52 +08:00 |
|
|
|
37539074a4
|
dify资料以及接口
|
2025-03-21 11:21:39 +08:00 |
|
|
|
7bae930daa
|
注释监控截图功能
|
2024-11-06 16:47:07 +08:00 |
|
|
|
8515a15ab1
|
定时rtsp流截图
|
2024-10-29 09:41:50 +08:00 |
|
|
|
ba5471f6bc
|
更新鞍钢的机器码
|
2024-08-23 11:16:07 +08:00 |
|
|
|
8706a89784
|
接入prometheus
|
2024-08-06 09:58:56 +08:00 |
|
|
|
7b38ec38e4
|
特殊作业修改
|
2024-06-11 19:38:45 +08:00 |
|
|
|
6b3aacbbdf
|
星纵配置
|
2024-06-07 15:52:17 +08:00 |
|
|
|
91da8f1117
|
bug修复
|
2024-06-05 21:47:58 +08:00 |
|
|
|
f946485114
|
bug修复
|
2024-05-07 21:29:52 +08:00 |
|
|
|
9c4a9cf981
|
redisson分布式锁
|
2024-05-07 19:45:36 +08:00 |
|
|
|
75cabd3e20
|
车辆下发消息推送
|
2024-05-06 13:35:35 +08:00 |
|
|
|
c87fdeb46f
|
机器码变更
|
2024-05-03 23:16:45 +08:00 |
|
|
|
e81c92bf9c
|
bug修改
|
2024-04-24 22:41:49 +08:00 |
|
|
|
3e0283cbbb
|
取消升级
|
2024-04-24 14:16:51 +08:00 |
|
|
|
e8bd59c9e3
|
机器码变更
|
2024-04-24 12:45:52 +08:00 |
|
|
|
b4a63433c9
|
jdk17环境依赖
|
2024-04-24 11:36:33 +08:00 |
|
|
|
a05e563cb2
|
人员审核
|
2024-04-23 20:48:10 +08:00 |
|
|
|
28d86296ee
|
bug修改
|
2024-04-20 11:31:32 +08:00 |
|
|
|
1feb578bf1
|
bug修改
|
2024-04-19 23:52:14 +08:00 |
|
|
|
691772b73b
|
配置修改
|
2024-04-18 21:55:23 +08:00 |
|
|
|
fd13b8974a
|
bug修复
|
2024-04-18 20:05:24 +08:00 |
|
|
|
f6f7b7b76c
|
bug修改
|
2024-04-17 10:58:13 +08:00 |
|
guo
|
a9092ed7a3
|
加回工作流
|
2024-04-01 13:45:32 +08:00 |
|
guo
|
5ed5bb0126
|
工作流无法热部署，暂时去掉工作流
|
2024-03-27 15:19:27 +08:00 |
|
|
|
7047dd7a74
|
解决冲突
|
2024-03-26 19:06:41 +08:00 |
|
|
|
4a74e71a52
|
工作流集成
|
2024-03-26 10:11:23 +08:00 |
|
guo
|
c8a795899a
|
bug修复
|
2024-03-22 19:18:22 +08:00 |
|
guo
|
a45aeabb55
|
bug修复
|
2023-12-04 16:34:08 +08:00 |
|
guo
|
2b82b773a1
|
bug修复
|
2023-08-10 10:50:29 +08:00 |
|
guo
|
b787a52dbb
|
升级依赖
|
2023-07-14 15:30:04 +08:00 |
|
