 wangpeng
|
26f80f9a68
|
部门删除，去掉定位功能
|
2024-04-21 23:34:19 +08:00 |
WenShiJun
|
4763b042a0
|
交通一体化bug优化
|
2024-03-28 18:32:18 +08:00 |
 zhangyanli
|
ba5c9534ad
|
教培功能bug修复
|
2024-03-27 15:52:48 +08:00 |
|
zhangyanli
|
8f9a4b3da8
|
教培建班
|
2024-03-25 09:36:21 +08:00 |
|
wangpeng
|
16c7d7aa24
|
从业人员管理
|
2024-03-22 14:53:46 +08:00 |
|
WenShiJun
|
eb8c8d0129
|
运单登记新增优化
地点管理优化
客户管理优化
|
2024-03-22 14:34:59 +08:00 |
|
zhangyanli
|
7f8b9402ce
|
教培功能
|
2024-03-22 09:37:32 +08:00 |
|
zhangyanli
|
c7cfb27443
|
共通信息
|
2024-03-13 08:41:46 +08:00 |
|
zhangyanli
|
cf3c099a38
|
教培信息
|
2024-03-12 17:20:55 +08:00 |
|
zhangyanli
|
b4aecc440a
|
教培信息
|
2024-03-08 08:50:53 +08:00 |
|
zhangyanli
|
ab39dd7e0b
|
共通信息
|
2024-03-06 17:38:52 +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 |
|
wangpeng
|
04b40acb8d
|
变更附件主目录
|
2024-03-05 16:49:04 +08:00 |
|
wangpeng
|
1bc503f3cb
|
变更附件主目录
|
2024-03-05 16:47:52 +08:00 |
 fangjiakai
|
b5f20683d4
|
修改人员定位接口地址
|
2024-03-01 12:08:00 +08:00 |
 dearlin
|
f7ebc6a958
|
八项作业与优化三方定位系统后台地址的查询
|
2024-03-01 11:41:16 +08:00 |
|
dearlin
|
465e8dc397
|
14291 创建用户时没有输入定位卡，提示定位卡已经存在，无法正常用户
|
2024-02-26 15:38:06 +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 |
|
dearlin
|
9b40b93f37
|
告警管理，地图设置，聚集管理Api完成
|
2024-02-22 16:04:48 +08:00 |
|
dearlin
|
34d95fcf18
|
人员卡管理
|
2024-02-22 09:19:36 +08:00 |
|
dearlin
|
089969712d
|
地图上报警信息
|
2024-02-21 09:04:50 +08:00 |
zhangqihang
|
425f26928e
|
修复bug
|
2024-02-19 17:05:17 +08:00 |
|
zhangqihang
|
8061ea3e72
|
修改重点工程相关方短信发送
|
2024-02-05 14:59:25 +08:00 |
|
zhangqihang
|
05927c3048
|
重点工程
|
2024-02-03 17:53:40 +08:00 |
|
dearlin
|
571bff720f
|
八项作业摄像头播放相关
|
2024-02-03 09:43:34 +08:00 |
|
fangjiakai
|
1f8a3f7f6f
|
动火作业设置作业位置坐标
|
2024-01-31 10:22:34 +08:00 |
|
dearlin
|
6353550fbd
|
人员定位改id
|
2024-01-30 15:36:15 +08:00 |
|
dearlin
|
fbb99198ca
|
电子围栏
|
2024-01-30 15:16:04 +08:00 |
|
fangjiakai
|
bc49136400
|
八项作业地图统计
|
2024-01-30 10:38:22 +08:00 |
|
dearlin
|
0b707e9261
|
bi页人员定位，ai视频分析完成
|
2024-01-29 17:35:59 +08:00 |
|
dearlin
|
771d0f04e7
|
根据用户卡号查信息
|
2024-01-29 10:18:20 +08:00 |
|
dearlin
|
99a4514737
|
ai bajing
|
2024-01-27 11:29:26 +08:00 |
|
dearlin
|
5032c3e5c1
|
ai报警，人员信息导入的时候卡号变成5位
|
2024-01-26 15:54:26 +08:00 |
|
zhangqihang
|
7ef83c4290
|
重点工程（不包括AI报警和视频监控）
|
2024-01-25 18:04:53 +08:00 |
|
dearlin
|
cf1573cbaa
|
手机端排查未在电子围栏禁止排查
|
2024-01-25 17:24:05 +08:00 |
|
dearlin
|
648d5df8e7
|
根据定位卡号获取人是否再电子围栏里，shiro权限注释
|
2024-01-25 16:37:20 +08:00 |
|
fangjiakai
|
f23f7f09d6
|
人员定位工具类 企业ID变为传入参数
|
2024-01-25 15:57:47 +08:00 |
|
dearlin
|
6065abcbad
|
电子围栏封装到工具类
|
2024-01-25 14:42:22 +08:00 |
|
dearlin
|
84b0151796
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-25 14:20:40 +08:00 |
|
dearlin
|
8187112f9a
|
绑定人员定位卡号
|
2024-01-25 14:20:05 +08:00 |
|
fangjiakai
|
eb6ea22dfd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-24 14:04:57 +08:00 |
|
fangjiakai
|
e3d2091070
|
动火安全措施确认
|
2024-01-24 14:04:39 +08:00 |
|
wangpeng
|
9d93529c50
|
权限路由
|
2024-01-24 11:39:18 +08:00 |
|
WenShiJun
|
f628f098b3
|
Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev
# Conflicts:
# src/main/java/com/zcloud/service/system/DepartmentService.java
|
2024-01-22 14:17:42 +08:00 |
|
WenShiJun
|
5c15b857f3
|
新增安全、环保检查管理模块
|
2024-01-22 14:15:49 +08:00 |
chenxinying
|
20fdf49bbc
|
八项作业删除
|
2024-01-17 10:43:13 +08:00 |
|
WenShiJun
|
ee029166e8
|
PLSUtil工具类新增告警统计方法
|
2024-01-15 15:27:55 +08:00 |