|
|
45c3b95805
|
合并解决冲突或升级jdk17语法
|
2025-12-15 18:20:44 +08:00 |
|
|
|
065cd4dc20
|
Merge branch 'dunhuan_jdk8' into dunhuang
|
2025-12-15 18:17:48 +08:00 |
|
|
|
ee4ac20435
|
用户配置
|
2025-12-15 18:16:16 +08:00 |
|
|
|
4a49d27766
|
删除多余类
|
2025-12-02 18:11:51 +08:00 |
|
|
|
464266e455
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-12-01 18:26:22 +08:00 |
|
|
|
fa49d3208e
|
检查实体类是否少字段bug修复
|
2025-12-01 17:39:20 +08:00 |
|
|
|
a7c3b61680
|
检查实体类是否少字段
|
2025-12-01 17:39:20 +08:00 |
|
|
|
dedfc336cb
|
删除多余配置
|
2025-12-01 15:34:55 +08:00 |
|
|
|
c676a4007b
|
执法记录仪修改
|
2025-11-22 16:40:49 +08:00 |
|
|
|
91eca09bcd
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
|
2025-11-17 18:47:22 +08:00 |
|
|
|
fa4076b238
|
执法记录仪修改
|
2025-11-17 18:42:17 +08:00 |
|
|
|
9cdc8edcbe
|
企业查看项目列表接口添加在线离线数量
|
2025-11-17 18:40:50 +08:00 |
|
|
|
b112cb9f75
|
规则报警bug修改
|
2025-11-17 18:40:31 +08:00 |
|
|
|
9e922f7de4
|
工作票添加重新开始，检查被占用的执法记录仪的工作票的编号
|
2025-11-17 18:27:29 +08:00 |
|
|
|
c1b30555d3
|
更改项目字段
|
2025-11-17 18:21:47 +08:00 |
|
|
|
0e390603e5
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuan_jdk8
|
2025-11-17 18:18:48 +08:00 |
|
|
|
3808817e5b
|
查询最近10天和各10条AI分析硬件设备报警记录
|
2025-11-17 18:18:11 +08:00 |
|
|
|
3613777169
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuan_jdk8
|
2025-11-12 11:28:27 +08:00 |
|
|
|
1e4ee84471
|
CarPassRecord的DataScope修改正确
|
2025-11-12 11:28:17 +08:00 |
|
|
|
0b5791cd35
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
|
2025-11-10 18:25:41 +08:00 |
|
|
|
1e6b1af5e5
|
是否忽略员工打卡时的“进/出”方向标识和bug修复
|
2025-11-10 18:24:39 +08:00 |
|
|
|
47ba9ae7a6
|
去掉后门
|
2025-11-10 15:12:43 +08:00 |
|
|
|
fc70952695
|
查询企业的树形项目和监控分组和监控列表添加总数和在线视频监控数量
|
2025-11-08 09:15:53 +08:00 |
|
|
|
070206603d
|
Merge branch 'uat' into dunhuan_jdk8
# Conflicts:
# src/main/java/com/zhgd/xmgl/call/Mcs8Call.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/service/IPoliceCameraItemService.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java
# src/main/java/com/zhgd/xmgl/task/Mcs8Task.java
|
2025-11-07 16:42:46 +08:00 |
|
|
|
5429de0196
|
增加worker_month_attendance统计考勤时是否忽略员工打卡时的“进/出”方向标识，1忽略0不忽略
|
2025-11-07 16:12:43 +08:00 |
|
|
|
38342059c9
|
统计执法记录仪每日工作时长
|
2025-11-07 16:12:23 +08:00 |
|
|
|
5341bb4d94
|
更新天气key和secret
|
2025-11-07 11:27:11 +08:00 |
|
|
|
2e680cbf1d
|
执法记录仪设备列表增加默认码流类型：1、子码流，2、主码流，默认子码流
|
2025-11-07 11:26:43 +08:00 |
|
|
|
3a40fe8f36
|
ai报警企业版
|
2025-11-06 10:09:55 +08:00 |
|
|
|
2c2a30fd39
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java
# src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
|
2025-11-05 18:26:55 +08:00 |
|
|
|
856a176426
|
执法记录仪的状态改成取isc的监控状态
|
2025-11-05 17:32:55 +08:00 |
|
|
|
702642e49b
|
高支模添加水平倾斜
|
2025-11-05 15:48:55 +08:00 |
|
|
|
c53b2fb77a
|
合并解决冲突或升级jdk17语法
|
2025-11-04 19:02:36 +08:00 |
|
|
|
eb2211c59a
|
权限改动
|
2025-11-04 18:48:37 +08:00 |
|
|
|
34677b8e07
|
Merge remote-tracking branch 'origin/dunhuan_jdk8' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
# src/main/java/com/zhgd/xmgl/task/HighFormworkTask.java
# src/main/resources/application.properties
|
2025-11-04 17:10:58 +08:00 |
|
|
|
06762a6e8a
|
优选多个提交
|
2025-11-04 16:51:41 +08:00 |
|
|
|
5ce08baa5e
|
修改注解@Controller
|
2025-11-04 16:47:33 +08:00 |
|
|
|
a0a4cc7577
|
增加个删除所有缓存接口
|
2025-11-04 16:47:31 +08:00 |
|
|
|
fe36de8bce
|
日志打印太多了改成debug
|
2025-11-04 16:47:29 +08:00 |
|
|
|
3a3f166006
|
10s定时更新执法仪设备状态
|
2025-11-04 16:47:28 +08:00 |
|
|
|
e581718c90
|
30s定时更新执法仪设备状态
|
2025-11-04 16:47:27 +08:00 |
|
|
|
2cb471c2a4
|
每月/日出勤/在职人数统计优化
|
2025-11-04 16:47:27 +08:00 |
|
|
|
59680c77a3
|
批量移动执法记录仪设备
|
2025-11-04 16:34:42 +08:00 |
|
|
|
f46e10df30
|
分页列表查询执法记录仪设备列表信息增加状态筛选
|
2025-11-04 16:34:14 +08:00 |
|
|
|
f717d41732
|
mock添加临边防护-设备实时数据时候也添加报警数据和bug修复
|
2025-11-04 16:33:15 +08:00 |
|
|
|
9db2d419bd
|
监控状态更新频率改成10秒
|
2025-11-04 13:41:15 +08:00 |
|
|
|
ed4e521948
|
热加载日志
|
2025-11-04 11:49:46 +08:00 |
|
|
|
2a06c95f3b
|
济南拓兴添加高支模数据
|
2025-11-04 09:06:34 +08:00 |
|
|
|
6223e3fdd7
|
热加载日志
|
2025-11-04 09:04:31 +08:00 |
|
|
|
a3d7391c63
|
执法记录仪修改
|
2025-11-03 10:34:58 +08:00 |
|
