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

205 Commits (98103d92f3466c89c2abf2f6fca2d8a3e1d4f43b)

Author SHA1 Message Date
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 5e8bbd1f12 Clear Git cache and re-add all files 2024-01-15 15:26:59 +08:00
WenShiJun ec2a863351 Stop tracking log files 2024-01-15 15:18:54 +08:00
WenShiJun c0c2abb24c Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev 2024-01-15 15:14:47 +08:00
WenShiJun 3d8221128d PLSUtil工具类新增告警统计方法 2024-01-15 15:14:16 +08:00
fangjiakai ad9dcf5e3c 添加忽略文件夹 2024-01-15 09:19:08 +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 f78ca2a7cd 删除 catalina.base_IS_UNDEFINED/logs/fhserver.2024-01-11.log 2024-01-12 08:34:22 +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