wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity
100 Commits
3 Branches
0 Tags
51 MiB
Commit Graph

31 Commits (3403a1c0e85fa19ef235b11e368f724f7388cc04)

Author SHA1 Message Date
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
WenShiJun 3d8221128d PLSUtil工具类新增告警统计方法 2024-01-15 15:14:16 +08:00
WenShiJun 500456a892 PLSUtil工具类新增部分三方接口及封装方法，恢复切换分支后之前优化的bug代码被覆盖的部分代码 2024-01-12 16:40:52 +08:00
fangjiakai fce0c60fa5 Merge remote-tracking branch 'origin/dev' into dev 2024-01-12 08:36:43 +08:00
fangjiakai c5b14134c9 修改MQ消息发送 2024-01-12 08:31:05 +08:00
WenShiJun 0473aab406 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev 2024-01-11 18:04:11 +08:00
WenShiJun 152a6da70d PLSUtil工具类优化 2024-01-11 18:02:48 +08:00
fangjiakai 0b01e507c9 修改MQ消息发送 2024-01-11 17:18:06 +08:00
WenShiJun 0683b752b6 Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev 2024-01-11 15:19:18 +08:00
WenShiJun 26a757a44c UsersController层中逻辑迁移至UsersServiceImpl，并新增调用远程新增接口 2024-01-11 15:17:27 +08:00
fangjiakai edb3a21777 修改MQ消息发送 2024-01-11 09:15:22 +08:00
fangjiakai 60bb52b485 修改导入,登录 2024-01-10 11:18:33 +08:00
fangjiakai 5846a0c0a4 整合other mq 2024-01-05 10:20:02 +08:00
fangjiakai 0afe99435e 整合other mq 2024-01-05 08:51:44 +08:00
fangjiakai 9c60c0103a 整合education 2024-01-04 10:07:06 +08:00
fangjiakai 3486386421 整合prevention 2024-01-04 09:07:20 +08:00
fangjiakai ae68bbf464 整合system 2024-01-03 11:04:18 +08:00
fangjiakai af5e6c28e8 整合home 2024-01-03 09:48:43 +08:00