Commit Graph

Select branches

Hide Pull Requests

baotou

dameng

desensitize

dunhuan_jdk8

dunhuang

guangshengaosu

hole_jdk17

mod_security

prod

uat

angang-deploy

angang-deploy-new

angang-two

duhaipeng

guoshengxiong

jihe_dust_0618

jiuzhu

master

mulei

ocr

pengjdev

shenzhendev

wangcheng

Mono Color

• 2c2a30fd39 Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-11-05 18:26:55 +08:00
• 856a176426 执法记录仪的状态改成取isc的监控状态 guoshengxiong 2025-11-05 17:32:55 +08:00
• 702642e49b 高支模添加水平倾斜 guoshengxiong 2025-11-05 15:48:55 +08:00
• c53b2fb77a 合并解决冲突或升级jdk17语法 guoshengxiong 2025-11-04 18:48:37 +08:00
• eb2211c59a 权限改动 guoshengxiong 2025-11-04 18:48:37 +08:00
• 34677b8e07 Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-11-04 17:10:58 +08:00
• 06762a6e8a 优选多个提交 guoshengxiong 2025-11-03 10:34:58 +08:00
• 5ce08baa5e 修改注解@Controller guoshengxiong 2025-10-31 10:58:15 +08:00
• a0a4cc7577 增加个删除所有缓存接口 guoshengxiong 2025-10-30 16:32:46 +08:00
• fe36de8bce 日志打印太多了改成debug guoshengxiong 2025-10-30 16:16:18 +08:00
• 3a3f166006 10s定时更新执法仪设备状态 guoshengxiong 2025-10-29 16:49:28 +08:00
• e581718c90 30s定时更新执法仪设备状态 guoshengxiong 2025-10-29 16:43:59 +08:00
• 2cb471c2a4 每月/日出勤/在职人数统计优化 guoshengxiong 2025-10-29 16:42:42 +08:00
• 59680c77a3 批量移动执法记录仪设备 guoshengxiong 2025-11-04 16:34:42 +08:00
• f46e10df30 分页列表查询执法记录仪设备列表信息增加状态筛选 guoshengxiong 2025-11-04 16:34:14 +08:00
• f717d41732 mock添加临边防护-设备实时数据时候也添加报警数据和bug修复 guoshengxiong 2025-11-04 16:33:15 +08:00
• 9db2d419bd 监控状态更新频率改成10秒 guoshengxiong 2025-11-04 13:41:15 +08:00
• ed4e521948 热加载日志 guoshengxiong 2025-11-04 11:49:46 +08:00
• 2a06c95f3b 济南拓兴添加高支模数据 guoshengxiong 2025-11-04 09:06:34 +08:00
• 6223e3fdd7 热加载日志 guoshengxiong 2025-11-04 09:04:31 +08:00
• a3d7391c63 执法记录仪修改 guoshengxiong 2025-11-03 10:34:58 +08:00
• fa9533a3ad 修改注解@Controller guoshengxiong 2025-10-31 10:58:15 +08:00
• 6158e1cd5b 增加个删除所有缓存接口 guoshengxiong 2025-10-30 16:32:46 +08:00
• 498e52fedd 日志打印太多了改成debug guoshengxiong 2025-10-30 16:16:18 +08:00
• 50144f36ac 10s定时更新执法仪设备状态 guoshengxiong 2025-10-29 16:49:28 +08:00
• ee73faae33 30s定时更新执法仪设备状态 guoshengxiong 2025-10-29 16:43:59 +08:00
• e092cde020 每月/日出勤/在职人数统计优化 guoshengxiong 2025-10-29 16:42:42 +08:00
• d47a774e18 ai预警上传文件路径重复/修复 guoshengxiong 2025-10-29 10:26:17 +08:00
• c5ca758835 ai预警上传文件路径重复/修复 guoshengxiong 2025-10-29 10:26:17 +08:00
• 01e4c53cee 海康ai预警的事件码转int，可能大于int范围，需要截取后面9位 guoshengxiong 2025-10-28 15:25:57 +08:00
• b23d4de36c 海康ai预警的事件码转int，可能大于int范围，需要截取后面9位 guoshengxiong 2025-10-28 15:25:57 +08:00
• 84d76e5a20 增加桥梁长度(m) guoshengxiong 2025-10-28 14:20:59 +08:00
• 57fa0fcff7 Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-10-25 18:11:10 +08:00
• 4a59060bdc 添加自定义大屏配置信息，添加修改规则 guoshengxiong 2025-10-25 18:08:11 +08:00
• d450a1f982 添加自定义大屏配置信息，添加修改规则 guoshengxiong 2025-10-25 18:08:11 +08:00
• 1629688cd4 合并解决冲突或升级jdk17语法 guoshengxiong 2025-10-25 17:14:20 +08:00
• 59339cc59e Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-10-25 16:47:02 +08:00
• 8d2e1a2e08 规则报警和异步线程池优化2 guoshengxiong 2025-10-25 16:41:35 +08:00
• 74f9894f7c 规则报警和异步线程池优化2 guoshengxiong 2025-10-25 16:41:35 +08:00
• 8447b867f3 规则报警和异步线程池优化 guoshengxiong 2025-10-24 17:56:25 +08:00
• 01c3547352 登录null修复 guoshengxiong 2025-10-22 18:14:33 +08:00
• f2b1bb62f7 规则报警和异步线程池优化 guoshengxiong 2025-10-24 17:56:25 +08:00
• 97f36b579d 视频监控在线状态改为3分钟更新一次 guoshengxiong 2025-10-23 17:44:30 +08:00
• d8616fa68d 操作工作票优化 guoshengxiong 2025-10-23 17:37:07 +08:00
• 4dcd0596a2 拉取视频文件加上施工场站名称s guoshengxiong 2025-10-23 16:21:26 +08:00
• 9da505964a 合并解决冲突或升级jdk17语法 guoshengxiong 2025-10-23 10:40:52 +08:00
• f5060c81a1 登录null修复 guoshengxiong 2025-10-22 18:14:33 +08:00
• 76c7de5d3a 合并解决冲突或升级jdk17语法 guoshengxiong 2025-10-22 18:14:11 +08:00
• 44b04db1e9 登录null修复 guoshengxiong 2025-10-22 18:14:33 +08:00
• dad273b0a4 临边防护app接口 guoshengxiong 2025-10-22 18:14:11 +08:00
• afb8f322d6 执法记录仪不要从mcs8拉取视频类型的 guoshengxiong 2025-10-21 18:30:33 +08:00
• 13f7360162 各专业隐患小类风险走势图bug修复 guoshengxiong 2025-10-21 15:10:37 +08:00
• 5754bec261 各专业隐患小类风险走势图bug修复 guoshengxiong 2025-10-21 15:10:37 +08:00
• a3a10e513a 天气appid更新 guoshengxiong 2025-10-21 14:51:01 +08:00
• 35434ada14 Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-10-20 18:22:53 +08:00
• 48454441f5 总企业加入省市区 guoshengxiong 2025-10-20 17:23:50 +08:00
• 5f506f5a38 AI识别修改 pengjie 2025-10-20 17:10:17 +08:00
• 8b3594803e Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-10-17 20:06:57 +08:00
• f40cee4848 HikVideoUtil加上@Component guoshengxiong 2025-10-17 20:05:52 +08:00
• 4df713ca28 批量复制默认工种数据到某个项目bug修复 guoshengxiong 2025-10-17 18:54:29 +08:00
• ac68011c81 Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-10-17 18:54:46 +08:00
• 328bc4b0d5 批量复制默认工种数据到某个项目bug修复 guoshengxiong 2025-10-17 18:54:29 +08:00
• 6199555729 Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-10-17 18:48:44 +08:00
• 76694a1b17 查询企业的树形项目和监控分组和监控列表和云端根据条件删除执法记录仪文件信息 guoshengxiong 2025-10-17 18:48:18 +08:00
• 8c228f1495 替换wss guoshengxiong 2025-10-17 18:47:14 +08:00
• 32913ad718 工作票bug修复 guoshengxiong 2025-10-17 18:46:38 +08:00
• a5b9ef2dbd 合并解决冲突或升级jdk17语法 guoshengxiong 2025-10-17 14:49:38 +08:00
• 03a64da51a 配置填错了 guoshengxiong 2025-10-16 17:03:06 +08:00
• 0eb84d4cf6 合并解决冲突或升级jdk17语法 guoshengxiong 2025-10-16 16:57:07 +08:00
• d4bd514d9a Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-10-16 16:55:13 +08:00
• 268d6bbdd6 ocr的SmartJavaAI离线 guoshengxiong 2025-10-16 16:44:41 +08:00
• 111e1962ba 合并升级jdk17语法 guoshengxiong 2025-10-15 18:12:09 +08:00
• d15c62efd0 Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang guoshengxiong 2025-10-15 18:10:27 +08:00
• 5cd95c1767 Merge remote-tracking branch 'origin/uat' into uat guoshengxiong 2025-10-15 18:06:31 +08:00
• d409655150 bug修复 guoshengxiong 2025-10-15 18:06:23 +08:00
• 443b6e6f3c 大屏项目点位配置 guoshengxiong 2025-10-15 16:13:04 +08:00
• 0300705243 dunhuan-jdk8配置 guoshengxiong 2025-10-15 16:11:57 +08:00
• b4dd77eb9e mock guoshengxiong 2025-10-15 10:34:39 +08:00
• efc4dca17e 大屏bug修复 guoshengxiong 2025-10-15 10:34:22 +08:00
• 4524ef8b51 isc的ai预警bug修复 guoshengxiong 2025-10-14 15:51:40 +08:00
• f7373aa125 isc的ai预警bug修复 guoshengxiong 2025-10-14 15:51:40 +08:00
• ca863d3e6e 误报删除删除minio文件错误bug修复 guoshengxiong 2025-10-14 14:29:13 +08:00
• c2176e55b6 误报删除删除minio文件错误bug修复 guoshengxiong 2025-10-14 11:56:03 +08:00
• b9c25327fb ai数据bug修复 guoshengxiong 2025-10-14 09:56:42 +08:00
• 121fe90f5d isc的ai预警图片bug修复 guoshengxiong 2025-10-14 09:52:45 +08:00
• 200c25c5b4 isc的ai预警图片bug修复 guoshengxiong 2025-10-14 09:52:45 +08:00
• 6c5abe934a 的isc的回调接口的ai预警上传（event_aimms类型） guoshengxiong 2025-10-13 17:38:14 +08:00
• 047f7834af 的isc的回调接口的ai预警上传（event_aimms类型） guoshengxiong 2025-10-13 17:38:14 +08:00
• 7d249778b2 Merge branch 'uat' into dunhuang guoshengxiong 2025-10-11 17:03:10 +08:00
• d3438c520e 允许html上传 guoshengxiong 2025-10-11 17:02:53 +08:00
• 3e8cbdc6a3 合并升级jdk17语法 guoshengxiong 2025-10-11 17:02:02 +08:00
• 1e0975255a Merge branch 'uat' into dunhuang guoshengxiong 2025-10-11 16:59:10 +08:00
• 65c4b09c7b bindTicket查询修复 guoshengxiong 2025-10-11 16:55:15 +08:00
• b3523c958e 分页列表查询项目组管理信息增加项目组ids(多个,分割) guoshengxiong 2025-10-11 16:11:52 +08:00
• 2adf8fc0f0 代码优化 guoshengxiong 2025-10-11 10:59:07 +08:00
• 64b9f1ba55 企业或项目资料中心接口 guoshengxiong 2025-10-11 10:47:35 +08:00
• 84c3ff4542 机械设备导入导出 guoshengxiong 2025-10-10 17:21:10 +08:00
• 2227f942bf 规范添加安全检查记录信息时间 guoshengxiong 2025-10-10 17:00:19 +08:00
• 54851acfe2 删除安全检查记录信息优化 guoshengxiong 2025-10-10 15:16:43 +08:00
• 25f564b2b7 隐患工单派发生成隐患单去重 guoshengxiong 2025-10-10 13:59:13 +08:00