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

341 Commits (29dee5bfd21d2b535cb5ad5dc5c17e475c97f14e)

Author SHA1 Message Date
zhangqihang 7ef83c4290 重点工程（不包括AI报警和视频监控） 2024-01-25 18:04:53 +08:00
chenxinying 922dbe51b3 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 17:41:14 +08:00
chenxinying 56d43e7ebd 如果是多个安全措施确认人，某个人打回，则其他确认人不显示打回作业 2024-01-25 17:40:55 +08:00
dearlin cf1573cbaa 手机端排查未在电子围栏禁止排查 2024-01-25 17:24:05 +08:00
dearlin 648d5df8e7 根据定位卡号获取人是否再电子围栏里，shiro权限注释 2024-01-25 16:37:20 +08:00
fangjiakai 563a0cbd3a 动火作业添加电子围栏 2024-01-25 16:00:38 +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
chenxinying 8ef4b2977e 风险辨识结果和关联其他特殊作业及安全作业票编号显示 2024-01-25 14:05:39 +08:00
chenxinying cc33e51b0c 八项作业动火作业签字显示完成，动火人及证书编号显示完成 2024-01-25 13:47:52 +08:00
fangjiakai a4b7ff0a63 Merge remote-tracking branch 'origin/dev' into dev 2024-01-25 13:38:45 +08:00
fangjiakai b1db99346e 动火作业流程图 2024-01-25 13:38:16 +08:00
chenxinying 3eb09bdcc8 动火气体分析不显示验收归档的作业票 2024-01-24 17:28:46 +08:00
fangjiakai 4c9801eacf Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
 2024-01-24 17:21:54 +08:00
fangjiakai f43b48d546 动火安全措施确认 2024-01-24 17:20:55 +08:00
chenxinying 0a64479a7d 动火合并打回与保存功能 2024-01-24 17:14:19 +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
chenxinying fc1f682428 Merge remote-tracking branch 'origin/dev' into dev 2024-01-24 14:00:52 +08:00
chenxinying 44d1708a79 动火验收，查询时，显示签字信息 2024-01-24 14:00:24 +08:00
wangpeng 9d93529c50 权限路由 2024-01-24 11:39:18 +08:00
fangjiakai 25d0947d7f 动火作业 service层方法 2024-01-24 09:59:54 +08:00
chenxinying abeb80f88d 动火更新作业开始时间，结束时间和验收时间 2024-01-24 09:34:59 +08:00
chenxinying 22dd31c65a 动火添加验收时间字段，更新作业开始时间，结束时间和验收时间 2024-01-24 09:25:29 +08:00
chenxinying 0650dffac0 动火下一步状态变更 2024-01-23 11:27:24 +08:00
fangjiakai c120c0b55b Merge remote-tracking branch 'origin/dev' into dev 2024-01-23 08:30:03 +08:00
fangjiakai 13e1b7442e 动火作业 2024-01-23 08:29:43 +08:00
chenxinying 4a2d44a6c9 Merge remote-tracking branch 'origin/dev' into dev 2024-01-22 15:20:38 +08:00
chenxinying 7c4371d328 动火签字图片 2024-01-22 15:20:32 +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 3507bf61a9 动火添加作业开始和作业结束 2024-01-22 14:05:11 +08:00
fangjiakai 298b10c1de 动火作业 service层新增措施相关接口 2024-01-22 08:48:40 +08:00
fangjiakai 1df78fdd26 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
#	src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java
#	src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
#	src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
 2024-01-22 08:47:56 +08:00
fangjiakai d578f2d083 动火作业 2024-01-22 08:45:31 +08:00
xiepeng e892e0c892 动火作业 获取所有措施 获取需要签字的措施 获取所有签字完成的措施 2024-01-19 14:36:54 +08:00
fangjiakai 79a69dd4ef 动火作业 service层新增措施相关接口 2024-01-19 11:35:32 +08:00
fangjiakai 18505d248c 动火作业 2024-01-19 11:34:11 +08:00
fangjiakai 17f8e83c3d Merge remote-tracking branch 'origin/dev' into dev 2024-01-19 11:32:43 +08:00
fangjiakai 498e9adb9c 动火作业 service层新增措施相关接口 2024-01-19 11:32:31 +08:00
xiepeng 238023b118 动火作业 补充 取消，下一步，验收归档 2024-01-19 11:30:03 +08:00
fangjiakai 8c5051aaaf Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
#	src/main/java/com/zcloud/service/eightwork/HotworkService.java
#	src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
#	src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
 2024-01-19 10:26:55 +08:00
fangjiakai d4e586d700 动火作业 service层方法 2024-01-19 10:23:06 +08:00
xiepeng 5d35ba69d8 动火作业 根据Id查询 
八项作业保存删除图片
 2024-01-19 09:23:41 +08:00
chenxinying 2f1ef51627 动火气体检测分析的创建 2024-01-18 16:43:05 +08:00
fangjiakai fb0f7cf1fe 动火作业 2024-01-18 08:55:39 +08:00
chenxinying dd05b7d11d bus_hotwork_sign的mapper创建 2024-01-17 15:06:25 +08:00
chenxinying ebf1d6d6a0 BUS_EIGHTWORK_TASK的mapper创建 2024-01-17 14:19:50 +08:00
chenxinying da1dfc7f22 BUS_EIGHTWORK_TASK_FLOW的mapper创建 2024-01-17 14:16:56 +08:00
chenxinying 2d56101774 BUS_EIGHTWORK_FLOW_LOG的mapper创建 2024-01-17 14:08:59 +08:00
chenxinying a3c18c875e BUS_EIGHTWORK_FLOW_LOG的mapper创建 2024-01-17 14:05:18 +08:00
fangjiakai c3a95c61c0 动火作业 2024-01-17 13:41:44 +08:00
chenxinying 20fdf49bbc 八项作业删除 2024-01-17 10:43:13 +08:00
chenxinying eda0a53e19 八项作业作废时，监控删除，视频监控列表 2024-01-16 15:14:42 +08:00
chenxinying 0fce9d9f9a Merge remote-tracking branch 'origin/dev' into dev 2024-01-15 17:19:50 +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
chenxinying d28d40bf53 Merge remote-tracking branch 'origin/dev' into dev 2024-01-12 08:42:36 +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
chenxinying e43d380e01 Merge remote-tracking branch 'origin/dev' into dev 2024-01-11 17:18:28 +08:00
fangjiakai 0b01e507c9 修改MQ消息发送 2024-01-11 17:18:06 +08:00
chenxinying d230d3e62a Merge remote-tracking branch 'origin/dev' into dev 2024-01-11 17:04:36 +08:00
chenxinying 09f069e1ac 八项作业添加监控 2024-01-11 16:58:12 +08:00
fangjiakai d91e162379 修改MQ消息发送 2024-01-11 16:37:22 +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 a96b4f85df Merge branch 'master' into dev 2024-01-11 09:25:46 +08:00
fangjiakai edb3a21777 修改MQ消息发送 2024-01-11 09:15:22 +08:00
chenxinying 9c86394e0b 企业人员定位系统参数表 2024-01-10 17:37:12 +08:00
fangjiakai 60bb52b485 修改导入,登录 2024-01-10 11:18:33 +08:00
fangjiakai 98406f230b 条件分页配置 2024-01-08 17:30:16 +08:00
fangjiakai 411864c1b6 条件分页配置 2024-01-08 10:21:46 +08:00
fangjiakai 5846a0c0a4 整合other mq 2024-01-05 10:20:02 +08:00
fangjiakai da7145a1a1 整合other mq 2024-01-05 10:06:26 +08:00
fangjiakai a1a8c85fb6 整合other mq 2024-01-05 10:04:19 +08:00
fangjiakai c40f40d58d 整合other mq 2024-01-05 09:57:31 +08:00
fangjiakai 0afe99435e 整合other mq 2024-01-05 08:51:44 +08:00
fangjiakai 25aeaee31e 整合education 2024-01-04 10:17:08 +08:00
fangjiakai 6b727bac90 整合education 2024-01-04 10:12:59 +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 5d7d88b063 整合prevention Mapper.xml 2024-01-03 16:53:15 +08:00
fangjiakai 024ff844db 整合prevention Mapper 2024-01-03 16:36:04 +08:00
fangjiakai ae68bbf464 整合system 2024-01-03 11:04:18 +08:00
fangjiakai af5e6c28e8 整合home 2024-01-03 09:48:43 +08:00