|
|
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 |
|
|
|
5fd01c5bb5
|
导入劳务人员bug修复
|
2025-09-10 10:24:42 +08:00 |
|
|
|
252a1409fc
|
脱敏处理
|
2025-09-09 18:53:13 +08:00 |
|
|
|
642cb0d61e
|
优化权限和上传文件等1
|
2025-09-09 18:52:39 +08:00 |
|
|
|
eb4823bf5a
|
优化权限和上传文件等
|
2025-09-09 17:55:41 +08:00 |
|
|
|
46e05204df
|
导入excel修改bug
|
2025-09-09 17:44:43 +08:00 |
|
|
|
fc1c57457e
|
优化狮子王接口
|
2025-09-09 11:19:08 +08:00 |
|
|
|
48f41ef72a
|
广播和视频分组导入
|
2025-09-08 17:04:43 +08:00 |
|
|
|
bf9c3c2ec1
|
FastJSON漏洞修复
|
2025-09-08 14:31:12 +08:00 |
|
|
|
7aa4d307e7
|
转换Base64到webp格式和bug修复
|
2025-09-05 17:47:33 +08:00 |
|
|
|
b679c12c48
|
bug修复
|
2025-09-05 11:39:47 +08:00 |
|
|
|
8f7a2c206e
|
bug修复
|
2025-09-05 11:29:57 +08:00 |
|
|
|
d407d558af
|
广播接口和bug修复
|
2025-09-04 17:58:29 +08:00 |
|
|
|
05da654a32
|
ocr施工日志施工单位权限bug修复
|
2025-09-04 14:50:36 +08:00 |
|
|
|
c914692236
|
ocr施工日志施工单位权限bug修复
|
2025-09-04 14:35:30 +08:00 |
|
|
|
897d2c7f99
|
Merge branch 'prod' into uat
|
2025-09-04 11:37:41 +08:00 |
|
|
|
8be282781f
|
Merge branch 'mod_security' into uat
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityRegionMapper.xml
# src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceController.java
# src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListSourceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/xz/service/IXzHikvisionSyncService.java
|
2025-09-04 11:36:54 +08:00 |
|
|
|
9656de38e7
|
修复mysql不支持09-31
|
2025-09-04 11:32:57 +08:00 |
|
|
|
1af66415d6
|
修复mysql不支持09-31
|
2025-09-04 11:10:37 +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 |
|
|
|
bc25c79962
|
bug修复
|
2025-09-03 16:47:58 +08:00 |
|
|
|
e6deadd6fe
|
bug修复
|
2025-09-02 17:04:35 +08:00 |
|
|
|
016ba73419
|
Merge branch 'prod' into mod_security
|
2025-09-02 13:56:51 +08:00 |
|
|
|
24b469a92b
|
考勤月报-按单位，最多导出41天
|
2025-09-02 10:48:41 +08:00 |
|
|
|
5b678c3ee1
|
bug修复和mysql批量替换值
|
2025-08-30 18:12:22 +08:00 |
|
|
|
a2ed0c329d
|
Merge branch 'mod_security' into prod
|
2025-08-30 17:05:30 +08:00 |
|
|
|
a5cc7c8874
|
bug修复
|
2025-08-30 17:04:09 +08:00 |
|
|
|
ab8c736792
|
扬尘增加蒸发量文档
|
2025-08-29 15:29:18 +08:00 |
|
|
|
cdd918d0ef
|
bug修复
|
2025-08-28 16:49:47 +08:00 |
|
|
|
9474d49433
|
Merge branch 'mod_security' into prod
|
2025-08-27 18:23:11 +08:00 |
|
|
|
1bead9cf22
|
bug修复
|
2025-08-27 18:16:03 +08:00 |
|
|
|
afdea2e5bb
|
bug修复
|
2025-08-27 17:47:11 +08:00 |
|
|
|
27182d10cc
|
青海中水北方修改
|
2025-08-27 15:19:43 +08:00 |
|
|
|
38c35543a0
|
Merge branch 'mod_security' into prod
|
2025-08-26 21:23:12 +08:00 |
|
|
|
c9747cfbef
|
bug修复
|
2025-08-26 19:29:39 +08:00 |
|
|
|
be575a8270
|
依赖升级
|
2025-08-26 16:36:35 +08:00 |
|
|
|
ffe6fe38a9
|
bug修复
|
2025-08-26 09:14:03 +08:00 |
|
|
|
328d0371c0
|
青海中水北方修改
|
2025-08-25 17:26:59 +08:00 |
|
|
|
98858b3b48
|
Merge remote-tracking branch 'origin/prod' into prod
|
2025-08-25 15:32:43 +08:00 |
|
|
|
686420e7d2
|
青海中水北方修改
|
2025-08-25 15:32:29 +08:00 |
|
|
|
8377079917
|
查询慢优化
|
2025-08-25 15:13:06 +08:00 |
|
