 zhangyanli
|
b4aecc440a
|
教培信息
|
2024-03-08 08:50:53 +08:00 |
|
zhangyanli
|
0b7b42197b
|
共通信息
|
2024-03-06 17:56:01 +08:00 |
|
zhangyanli
|
a2b506427e
|
Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev-new
# Conflicts:
# src/main/java/com/zcloud/controller/archives/ArchivesCapitalController.java
# src/main/java/com/zcloud/controller/archives/ArchivesEduManagerController.java
# src/main/java/com/zcloud/controller/archives/ArchivesEduPlanController.java
# src/main/java/com/zcloud/controller/archives/ArchivesFilesController.java
# src/main/java/com/zcloud/controller/archives/ArchivesPostManController.java
# src/main/java/com/zcloud/controller/archives/ArchivesTeacherController.java
# src/main/java/com/zcloud/controller/courseware/AppCoursewareController.java
# src/main/java/com/zcloud/controller/courseware/DataCoursewareController.java
# src/main/java/com/zcloud/controller/courseware/QuestionController.java
# src/main/java/com/zcloud/controller/courseware/VideoCoursewareController.java
# src/main/java/com/zcloud/controller/curriculum/AppMyCurriculumController.java
# src/main/java/com/zcloud/controller/curriculum/CurriculumController.java
# src/main/java/com/zcloud/controller/curriculum/KcmiddlekjController.java
# src/main/java/com/zcloud/controller/eduArchives/ArchivesPdfFileController.java
# src/main/java/com/zcloud/controller/education/PersonObtainEvidenceController.java
# src/main/java/com/zcloud/controller/education/TrainingInfoController.java
# src/main/java/com/zcloud/controller/education/TrainingPlanController.java
# src/main/java/com/zcloud/controller/paper/StageexampaperInputController.java
# src/main/java/com/zcloud/controller/platformCourseware/PlatformDataCoursewareController.java
# src/main/java/com/zcloud/controller/platformCourseware/PlatformQuestionController.java
# src/main/java/com/zcloud/controller/platformCourseware/PlatformVideoCoursewareController.java
# src/main/java/com/zcloud/controller/platformCurriculum/PlatformCurriculumController.java
# src/main/java/com/zcloud/controller/platformPaper/PlatformStageexampaperInputController.java
# src/main/java/com/zcloud/controller/questionnaire/AppSurveyController.java
# src/main/java/com/zcloud/controller/questionnaire/AppSurveyanswerController.java
# src/main/java/com/zcloud/controller/questionnaire/AppSurveycorpinfoController.java
# src/main/java/com/zcloud/controller/questionnaire/AppSurveyquestionController.java
# src/main/java/com/zcloud/controller/study/AppMfolderStipulateController.java
# src/main/java/com/zcloud/controller/study/MfolderStipulateController.java
# src/main/java/com/zcloud/controller/study/StudySectionController.java
# src/main/java/com/zcloud/controller/study/TempStudyController.java
# src/main/java/com/zcloud/controller/study/VideoController.java
# src/main/java/com/zcloud/controller/system/AppFeedbackController.java
# src/main/java/com/zcloud/controller/task/AppCourseExamController.java
# src/main/java/com/zcloud/controller/task/AppCourseStudentRelationController.java
# src/main/java/com/zcloud/controller/task/AppCourseStudyController.java
# src/main/java/com/zcloud/controller/task/AppCourseStudyVideoRecordController.java
# src/main/java/com/zcloud/controller/task/AppCoursepapersController.java
# src/main/java/com/zcloud/controller/task/AppStageExamController.java
# src/main/java/com/zcloud/controller/task/AppStageStudentRelationController.java
# src/main/java/com/zcloud/controller/task/AppStageexampaperController.java
# src/main/java/com/zcloud/controller/task/AppStudyTaskController.java
# src/main/java/com/zcloud/controller/task/CourseStudyVideoRecordController.java
# src/main/java/com/zcloud/controller/task/StageExamController.java
# src/main/java/com/zcloud/controller/task/StageStudentRelationController.java
# src/main/java/com/zcloud/controller/task/StageexampaperController.java
# src/main/java/com/zcloud/controller/task/StudyTaskController.java
# src/main/java/com/zcloud/controller/video/AIWarningController.java
# src/main/java/com/zcloud/controller/video/AppAudioOrVideoController.java
# src/main/java/com/zcloud/controller/video/AppVideoManagerController.java
# src/main/java/com/zcloud/controller/video/VideoManagerController.java
# src/main/java/com/zcloud/mapper/datasource/corp/CorpInfoMapper.java
# src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
# src/main/java/com/zcloud/mapper/datasource/video/AIWarningMapper.java
# src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java
# src/main/java/com/zcloud/service/corp/CorpInfoService.java
# src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java
# src/main/java/com/zcloud/service/system/DepartmentService.java
# src/main/java/com/zcloud/service/system/UsersService.java
# src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
# src/main/java/com/zcloud/service/video/AIWarningService.java
# src/main/java/com/zcloud/service/video/VideoManagerService.java
# src/main/java/com/zcloud/service/video/impl/AIWarningServiceImpl.java
# src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java
# src/main/java/com/zcloud/util/Const.java
# src/main/java/com/zcloud/util/DateUtil.java
# src/main/java/com/zcloud/util/InitPageDataUtil.java
# src/main/resources/application.properties
# src/main/resources/mybatis/datasource/system/UsersMapper.xml
|
2024-03-06 16:33:30 +08:00 |
|
zhangyanli
|
6b2a1c9479
|
提交信息
|
2024-03-06 16:25:53 +08:00 |
 xiepeng
|
ece25c0daf
|
运营车辆
|
2024-03-06 10:28:52 +08:00 |
|
xiepeng
|
42b42a208d
|
运营车辆
|
2024-03-06 09:41:06 +08:00 |
 277151821@qq.com
|
3d1a78869c
|
后端修改
|
2024-03-05 11:36:33 +08:00 |
|
277151821@qq.com
|
b244cb0985
|
货运挂车后端
|
2024-03-05 11:08:48 +08:00 |
 wangpeng
|
437c8ccc89
|
Merge pull request 'dev' (#5) from integrated_whb/integrated_whb:dev into dev
Reviewed-on: #5
|
2024-03-04 11:07:07 +08:00 |
WenShiJun
|
14e7e11f2a
|
新增从业人员管理相关接口
|
2024-03-01 18:04:06 +08:00 |
|
WenShiJun
|
eddae30465
|
安全通知，客户管理，运单登记，地点管理功能优化
|
2024-03-01 13:52:43 +08:00 |
 fangjiakai
|
b5f20683d4
|
修改人员定位接口地址
|
2024-03-01 12:08:00 +08:00 |
|
xiepeng
|
983e857ba9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-01 10:18:37 +08:00 |
|
xiepeng
|
93e9e8a30b
|
运营车辆
|
2024-03-01 10:01:48 +08:00 |
 dearlin
|
ee5192518b
|
八项作业与部分bug
|
2024-03-01 09:05:45 +08:00 |
|
WenShiJun
|
48a21ed00d
|
客户管理后端功能优化
新增地点管理后端功能
|
2024-02-29 18:30:26 +08:00 |
zhangqihang
|
8dd9ff3390
|
修复bug
|
2024-02-29 15:43:39 +08:00 |
chenxinying
|
f26dbe0980
|
吊装作业，断路作业，动土作业，盲板PC端
|
2024-02-29 08:43:27 +08:00 |
|
WenShiJun
|
c12d2c7774
|
安全通知->功能优化
运单登记后端功能
客户管理后端功能
|
2024-02-28 19:16:25 +08:00 |
|
dearlin
|
c70b1d6bf1
|
14132 这几种隐患来源的显示不正确 需要统一
|
2024-02-28 14:26:41 +08:00 |
|
zhangqihang
|
2c3cc96696
|
修复bug
|
2024-02-28 13:45:01 +08:00 |
|
fangjiakai
|
93ca8d2982
|
聚集告警人员列表
|
2024-02-28 10:44:54 +08:00 |
|
dearlin
|
d97dbcb715
|
聚集告警记录
|
2024-02-28 09:57:18 +08:00 |
|
fangjiakai
|
d1def6945d
|
企业报告 高危作业数据
|
2024-02-28 09:34:29 +08:00 |
|
zhangqihang
|
4c65e0c6c3
|
修复bug
|
2024-02-28 09:01:16 +08:00 |
|
dearlin
|
b16405202a
|
验收打回隐患报错 14308
|
2024-02-27 17:27:09 +08:00 |
|
chenxinying
|
a6a19febf7
|
吊装作业，断路作业，动土作业，盲板
|
2024-02-27 14:31:38 +08:00 |
|
wangpeng
|
fb3f754bcf
|
Merge pull request 'dev' (#4) from integrated_whb/integrated_whb:dev into dev
Reviewed-on: #4
|
2024-02-27 14:19:06 +08:00 |
|
zhangqihang
|
271431816e
|
修复bug
|
2024-02-27 08:47:05 +08:00 |
|
WenShiJun
|
fb93851600
|
安全例会->列表，新增，删除，详情接口开发
|
2024-02-26 18:29:43 +08:00 |
|
dearlin
|
72495ef2ca
|
部门 单位对接
|
2024-02-26 17:46:09 +08:00 |
|
dearlin
|
516f34f769
|
Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev
|
2024-02-26 15:38:25 +08:00 |
|
dearlin
|
465e8dc397
|
14291 创建用户时没有输入定位卡，提示定位卡已经存在，无法正常用户
|
2024-02-26 15:38:06 +08:00 |
|
zhangqihang
|
f16a09c4aa
|
修复bug
|
2024-02-26 15:32:23 +08:00 |
|
dearlin
|
918037d593
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-26 11:37:58 +08:00 |
|
dearlin
|
752b0e1300
|
允许进入部门，允许进入人员
|
2024-02-26 11:37:49 +08:00 |
|
zhangyanli
|
64b883b73f
|
bug:14263修复
|
2024-02-26 11:19:25 +08:00 |
|
fangjiakai
|
6ce8b6669e
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/zcloud/controller/mapApi/MapController.java
|
2024-02-26 10:35:54 +08:00 |
|
fangjiakai
|
91ce11d64a
|
动火增加消息通知
|
2024-02-26 10:34:55 +08:00 |
|
dearlin
|
af92ca1ba7
|
人员定位中相关对接操作
|
2024-02-26 09:39:21 +08:00 |
|
WenShiJun
|
ba988ffb42
|
安全通知模块->列表，新增，删除，详情接口开发
|
2024-02-23 19:04:20 +08:00 |
|
zhangqihang
|
acb1c9a5a2
|
修复bug
|
2024-02-23 18:04:02 +08:00 |
|
zhangqihang
|
51d29c72ef
|
修复视频上传
|
2024-02-23 09:52:53 +08:00 |
|
zhangqihang
|
f5579e9856
|
修复安全环保检查bug
|
2024-02-23 09:06:12 +08:00 |
|
fangjiakai
|
387a31b276
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-22 17:35:35 +08:00 |
|
fangjiakai
|
9d1bcaa909
|
环保检查隐患指派
|
2024-02-22 17:35:23 +08:00 |
|
fangjiakai
|
e2045a7a9a
|
环保检查隐患指派
|
2024-02-22 17:33:39 +08:00 |
|
dearlin
|
7fcbffb803
|
摄像头定位接口
|
2024-02-22 17:31:28 +08:00 |
|
dearlin
|
0fbddd5f62
|
新加外来人员部门，外来人员并且禁止登录到系统提示账号密码不正确
|
2024-02-22 16:33:00 +08:00 |
|
dearlin
|
9b40b93f37
|
告警管理，地图设置，聚集管理Api完成
|
2024-02-22 16:04:48 +08:00 |