 caoqianming
|
8fffce82b3
|
refector: correct_swip_task pageData 按 swingTime排序
|
2023-03-16 11:26:10 +08:00 |
|
caoqianming
|
7f8d7332aa
|
refector: clock record detail还是多放一些信息
|
2023-03-16 00:08:39 +08:00 |
|
caoqianming
|
379f27fe48
|
refector: 刷卡推送优化detail添加channelCode
|
2023-03-15 23:45:11 +08:00 |
|
caoqianming
|
5dc43246e2
|
refector: hrm clockrecord 从大华侧请求带my_info数据
|
2023-03-15 23:13:21 +08:00 |
|
caoqianming
|
ecbe077e55
|
fix: correct_swip_task bug
|
2023-03-15 21:12:02 +08:00 |
|
caoqianming
|
1c5e236e15
|
fix: swipe_next 先创建cr bug
|
2023-03-15 21:01:57 +08:00 |
|
caoqianming
|
0608d9045a
|
fix: e_type为3 card_type判定
|
2023-03-15 20:14:54 +08:00 |
|
caoqianming
|
dbf7fe7b20
|
fix: correct_swip_task bug
|
2023-03-15 18:13:53 +08:00 |
|
caoqianming
|
16daa861bd
|
feat: 打卡记录增加忽略记录项目并进行代码优化
|
2023-03-15 18:07:42 +08:00 |
|
caoqianming
|
7cec134265
|
refector: correct_swip_task 从大华打卡记录里校正打卡记录
|
2023-03-15 00:29:01 +08:00 |
|
caoqianming
|
f0b4544813
|
fix: 打卡记录推测bug
|
2023-03-14 23:17:56 +08:00 |
|
caoqianming
|
717c43ca50
|
feat: 增加考勤预测类型加班和缺卡并进行逻辑处理
|
2023-03-14 18:20:47 +08:00 |
|
caoqianming
|
5826e407f5
|
refactor: operation patch 增加 dept_ter dept_bus
|
2023-03-14 16:30:19 +08:00 |
|
caoqianming
|
215b18314c
|
工单过滤字段支持反向查询
|
2023-03-14 16:03:44 +08:00 |
|
caoqianming
|
5a3c380dff
|
opl visit rpj 添加ticket的related_name 字段
|
2023-03-14 16:02:22 +08:00 |
|
caoqianming
|
5ebd884f18
|
离线刷卡记录订阅与推送处理
|
2023-03-14 15:04:00 +08:00 |
|
caoqianming
|
15111a7a9a
|
visit 增加vehicle_photos 字段及其接口修改
|
2023-03-13 17:40:57 +08:00 |
|
caoqianming
|
f5ec3434d3
|
hrm 考勤推测优化
|
2023-03-13 16:55:52 +08:00 |
|
caoqianming
|
41e96084b8
|
开始写 monitor_and_analyse 方法
|
2023-03-12 22:32:33 +08:00 |
|
caoqianming
|
8ac24740db
|
获取大华视频rtsp流
|
2023-03-12 21:58:31 +08:00 |
|
caoqianming
|
977c0527b1
|
刷卡考勤推测优化
|
2023-03-12 21:09:54 +08:00 |
|
caoqianming
|
5f1ac8ce40
|
刷卡考勤推测优化
|
2023-03-12 21:08:24 +08:00 |
|
caoqianming
|
5f614bf164
|
限制属地和业务部门为本公司部门
|
2023-03-12 20:40:31 +08:00 |
|
caoqianming
|
cf10e498a0
|
调整了cv2 绘制图框的颜色
|
2023-03-12 12:47:17 +08:00 |
|
caoqianming
|
c12f057790
|
修改 dahua xunxi 登录的timeout为10
|
2023-03-12 09:35:59 +08:00 |
|
caoqianming
|
cf26cc69a8
|
opl_end时close_mtask 参数类型错误
|
2023-03-12 08:09:49 +08:00 |
|
caoqianming
|
dc5d3d184f
|
修改always_on默认值
|
2023-03-10 17:43:00 +08:00 |
|
caoqianming
|
7fdb9fb74f
|
强制修改工单状态
|
2023-03-10 17:38:38 +08:00 |
|
caoqianming
|
744f54874c
|
Merge branch 'v2'
|
2023-03-10 17:10:10 +08:00 |
|
caoqianming
|
3200ef33fc
|
Merge branch 'develop'
|
2023-03-10 17:10:00 +08:00 |
|
caoqianming
|
e3749d81a2
|
Merge branch 'develop' into v2
|
2023-03-10 17:09:25 +08:00 |
|
caoqianming
|
1916747947
|
dpm migrations
|
2023-03-10 17:09:02 +08:00 |
|
caoqianming
|
57da3eddb4
|
myschedule migrations
|
2023-03-10 17:08:45 +08:00 |
|
caoqianming
|
f54cd0028f
|
tdevice 增加mtask_uid
|
2023-03-10 17:08:03 +08:00 |
|
caoqianming
|
367d9b31dd
|
打卡时判断异常情况
|
2023-03-10 16:07:59 +08:00 |
|
caoqianming
|
830dee3358
|
dhclient snap 有可能失败进行处理
|
2023-03-10 14:53:39 +08:00 |
|
caoqianming
|
5cb1331000
|
告警间隔时间内不触发
|
2023-03-10 14:53:11 +08:00 |
|
caoqianming
|
403b97568a
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2023-03-09 23:59:58 +08:00 |
|
caoqianming
|
7a37428b0f
|
修改my_log文件名为decorators
|
2023-03-09 23:59:41 +08:00 |
|
caoqianming
|
be30c4d234
|
管理员重置密码
|
2023-03-09 10:54:41 +08:00 |
|
caoqianming
|
d91c0b2bfe
|
相关方访客入厂关闭时同时关闭工单
|
2023-03-09 09:46:34 +08:00 |
|
caoqianming
|
d0b6e46613
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_server into v2
|
2023-03-08 17:34:39 +08:00 |
|
caoqianming
|
ee4a0448ca
|
如果账户禁用，不再发送短信通知
|
2023-03-08 17:34:21 +08:00 |
|
caoqianming
|
006f0ace98
|
Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_server into v2
|
2023-03-04 23:16:53 +08:00 |
|
caoqianming
|
f184ddc094
|
准备写实时监控rtsp进行算法识别
|
2023-03-04 23:15:54 +08:00 |
|
caoqianming
|
6cdf791429
|
am ready cache_area_info
|
2023-03-04 23:15:28 +08:00 |
|
caoqianming
|
6f25ebdd42
|
ecm algochannel 变更为always_on 为false
|
2023-03-03 10:03:41 +08:00 |
|
caoqianming
|
f96a62d5e9
|
增加myschedule model
|
2023-03-03 10:03:10 +08:00 |
|
caoqianming
|
0bb4595ee6
|
增加myschedule
|
2023-03-03 10:02:41 +08:00 |
|
caoqianming
|
0a59af9c65
|
增加edu app
|
2023-03-03 10:02:09 +08:00 |
|
caoqianming
|
2aad51811c
|
增加dpm 双控app
|
2023-03-03 10:01:37 +08:00 |
|
caoqianming
|
f5432d3884
|
更改刷脸类型 correct_enter_or_exit
|
2023-03-02 23:31:19 +08:00 |
|
caoqianming
|
3c3bb556db
|
monitor drflog view_method字段增加
|
2023-03-02 23:30:51 +08:00 |
|
caoqianming
|
e7af79a51a
|
employee detail 取消door_range 字段
|
2023-03-02 22:29:04 +08:00 |
|
caoqianming
|
88db4fbcd4
|
hrm增加退休
|
2023-03-02 18:04:00 +08:00 |
|
caoqianming
|
34de8fdfec
|
sms.py 优化
|
2023-03-02 16:58:38 +08:00 |
|
caoqianming
|
029459ce5e
|
mylog, tasks, wxmp优化
|
2023-03-02 16:57:23 +08:00 |
|
caoqianming
|
4ab329c043
|
添加edu app
|
2023-02-21 10:39:31 +08:00 |
|
caoqianming
|
ab880ae8ad
|
工作流查询优化
|
2023-02-20 09:07:03 +08:00 |
|
caoqianming
|
6c04d161f8
|
config 操作函数
|
2023-02-20 09:04:36 +08:00 |
|
caoqianming
|
9776ef42cd
|
添加websocket auth middleware
|
2023-02-20 09:03:51 +08:00 |
|
caoqianming
|
c350c40941
|
开发模式下返回500详细信息
|
2023-02-20 09:02:49 +08:00 |
|
caoqianming
|
e0945986a3
|
取消cache areas info
|
2023-02-17 00:12:19 +08:00 |
|
caoqianming
|
989e0930f2
|
更改sys_version
|
2023-02-16 11:26:20 +08:00 |
|
caoqianming
|
bad884ce26
|
添加auto_log装饰器
|
2023-02-14 11:02:29 +08:00 |
|
caoqianming
|
74f6b737cb
|
opl task daemon True
|
2023-02-14 10:31:10 +08:00 |
|
caoqianming
|
6960593041
|
绘制矩形框bug2
|
2023-02-13 17:16:32 +08:00 |
|
caoqianming
|
83467dceb4
|
绘制矩形框bug
|
2023-02-13 16:25:48 +08:00 |
|
caoqianming
|
a7d60d69ae
|
算法测试
|
2023-02-13 16:09:50 +08:00 |
|
caoqianming
|
d638448fa6
|
算法 log 一下
|
2023-02-13 15:57:02 +08:00 |
|
caoqianming
|
d7a6adead7
|
opeartion partial update
|
2023-02-13 15:19:25 +08:00 |
|
caoqianming
|
0b8884cc2a
|
图片压缩功能
|
2023-02-13 15:18:54 +08:00 |
|
caoqianming
|
1dfb9626cc
|
wf 更改ticket 状态接口
|
2023-02-12 21:05:56 +08:00 |
|
caoqianming
|
1833c1a7ff
|
开启关闭任务优化
|
2023-02-11 18:32:41 +08:00 |
|
caoqianming
|
5a25bfe343
|
开启关闭任务优化
|
2023-02-11 17:50:49 +08:00 |
|
caoqianming
|
870d87b44d
|
彻底停止作业监控
|
2023-02-11 17:14:43 +08:00 |
|
caoqianming
|
940f07033c
|
opm start_mtask 关闭不可开启
|
2023-02-11 16:35:19 +08:00 |
|
caoqianming
|
eda09432f4
|
operation path vchannels
|
2023-02-11 16:28:23 +08:00 |
|
caoqianming
|
9a9fe62baa
|
未知人员修改为人员
|
2023-02-11 16:27:56 +08:00 |
|
caoqianming
|
5b04858d2e
|
开启作业监控前关闭可能存在的
|
2023-02-10 12:21:15 +08:00 |
|
caoqianming
|
1646621844
|
开启作业监控前关闭可能存在的
|
2023-02-10 12:07:43 +08:00 |
|
caoqianming
|
93a00363b2
|
事件记录导出完成
|
2023-02-09 08:51:40 +08:00 |
|
caoqianming
|
cb33dcb021
|
导出事件excel part2
|
2023-02-08 23:14:14 +08:00 |
|
caoqianming
|
73b0ce7cb7
|
事件导出excel part1
|
2023-02-08 17:33:55 +08:00 |
|
caoqianming
|
afdd7a67ca
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2023-02-07 21:09:01 +08:00 |
|
caoqianming
|
90f79a7c99
|
wf报错优化
|
2023-02-07 21:08:57 +08:00 |
|
caoqianming
|
bcef2026b0
|
ticketflow 增加 transition_ 返回
|
2023-01-30 13:41:07 +08:00 |
|
caoqianming
|
f34b40ed3c
|
rparty list search
|
2023-01-03 09:16:35 +08:00 |
|
caoqianming
|
2e67bcd48b
|
合并冲突
|
2023-01-02 23:22:01 +08:00 |
|
caoqianming
|
4d96f2d77a
|
third dahua xunxi speaker 优化3
|
2023-01-02 23:19:18 +08:00 |
|
caoqianming
|
cf0ac02660
|
third dahua xunxi speaker 优化2
|
2022-12-31 20:21:01 +08:00 |
|
caoqianming
|
7e3a1f4f78
|
third dahua xunxi speaker 优化
|
2022-12-24 14:10:22 +08:00 |
|
caoqianming
|
ceb86617e2
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2022-12-24 14:04:26 +08:00 |
|
caoqianming
|
0fdfac0ae2
|
格式化
|
2022-12-24 14:04:10 +08:00 |
|
caoqianming
|
d388871e7c
|
speaker.py 优化
|
2022-12-23 17:42:04 +08:00 |
|
caoqianming
|
76b1fa0b82
|
dahua xunxi exception bug
|
2022-12-23 17:21:57 +08:00 |
|
caoqianming
|
46a1fcf50a
|
workflow clone 接口
|
2022-12-22 16:58:31 +08:00 |
曹前明
|
477bde5af8
|
面板机打卡bug
|
2022-11-24 13:14:19 +08:00 |
|
曹前明
|
c676106e61
|
办公楼面板机打卡
|
2022-11-23 16:12:02 +08:00 |
|
caoqianming
|
2ffb5c9e3d
|
导出excel key 不存在的bug
|
2022-11-18 16:49:13 +08:00 |
|
caoqianming
|
58cd565977
|
event handle bug
|
2022-11-18 08:57:08 +08:00 |
|
caoqianming
|
e84f012e09
|
获取三方token优化
|
2022-11-17 17:50:17 +08:00 |
|
caoqianming
|
e24c632593
|
事件处理bug
|
2022-11-17 17:23:22 +08:00 |
|
caoqianming
|
09b6d7b182
|
correct_card_time
|
2022-11-15 15:51:56 +08:00 |
|
caoqianming
|
d4e2db10f1
|
同步门禁时间范围bug
|
2022-11-15 14:22:08 +08:00 |
|
caoqianming
|
95dbaeee5f
|
ticket list 返回待处理人 bug
|
2022-11-15 11:30:23 +08:00 |
|
caoqianming
|
4418e62ed6
|
dbbackup url
|
2022-11-14 13:07:16 +08:00 |
|
caoqianming
|
0981700f30
|
wf run task 优化
|
2022-11-14 10:39:08 +08:00 |
|
caoqianming
|
839e11b575
|
clear_dbbackup bug
|
2022-11-11 14:30:14 +08:00 |
|
caoqianming
|
03323fec17
|
数据库删除备份2
|
2022-11-11 14:25:53 +08:00 |
|
caoqianming
|
774db13d92
|
数据库删除备份
|
2022-11-11 14:18:26 +08:00 |
|
caoqianming
|
b999ef60b3
|
数据库备份任务和查看接口
|
2022-11-11 10:02:42 +08:00 |
|
caoqianming
|
2badb9c45c
|
复杂查询 swagger
|
2022-11-10 15:32:25 +08:00 |
|
caoqianming
|
d961a02378
|
cquery try 一下
|
2022-11-10 14:47:48 +08:00 |
|
caoqianming
|
f942540b49
|
提供复杂查询接口
|
2022-11-10 14:12:03 +08:00 |
|
caoqianming
|
c12d356b34
|
500邮件埋点
|
2022-11-10 10:14:09 +08:00 |
|
caoqianming
|
e47c9cd0ad
|
send_mail_task 默认参数
|
2022-11-10 09:48:58 +08:00 |
|
caoqianming
|
b09e3e396a
|
工单脚本执行增加重试机制
|
2022-11-10 09:37:43 +08:00 |
|
caoqianming
|
19cfad5412
|
event service ec_codes 默认{}
|
2022-11-09 11:27:15 +08:00 |
|
曹前明
|
b04473cc3b
|
小优化
|
2022-11-07 22:07:03 +08:00 |
|
曹前明
|
dd3f3857b8
|
先关闭安全帽补偿机制
|
2022-11-07 21:51:52 +08:00 |
|
caoqianming
|
1f03e108d3
|
等待卡片生成时间延长
|
2022-11-07 17:27:19 +08:00 |
|
caoqianming
|
c4dea515a2
|
人员列表增加手机号检索
|
2022-11-07 10:42:41 +08:00 |
|
曹前明
|
22e9bb38c3
|
邮件发送测试
|
2022-11-07 08:07:32 +08:00 |
|
曹前明
|
91f20a73af
|
rpj, visit, opl删除时同步删除工单
|
2022-11-04 07:20:17 +08:00 |
|
曹前明
|
b0cf23834a
|
获取处理人bug
|
2022-11-04 06:57:30 +08:00 |
|
caoqianming
|
97bdde5888
|
hrm detail get_location bug
|
2022-11-03 16:12:45 +08:00 |
|
caoqianming
|
5b7b180ee1
|
清除日志记录,可更改时间
|
2022-11-03 16:01:37 +08:00 |
|
caoqianming
|
2448406e97
|
计算区域人员数量bug
|
2022-11-03 15:45:13 +08:00 |
|
caoqianming
|
1bf37aa239
|
重跑一段时间的打卡记录bug
|
2022-11-03 13:08:37 +08:00 |
|
caoqianming
|
6c846386e6
|
重跑一段时间的打卡记录bug
|
2022-11-03 12:55:07 +08:00 |
|
caoqianming
|
9f6f3ddb62
|
重跑一段时间的打卡记录
|
2022-11-03 12:42:34 +08:00 |
|
caoqianming
|
8d5a2a0983
|
打卡bug修复
|
2022-11-03 11:25:03 +08:00 |
|
caoqianming
|
d73a35da6b
|
打卡bug修复
|
2022-11-03 11:02:32 +08:00 |
|
caoqianming
|
de8ae9d740
|
打卡bug修复
|
2022-11-03 10:41:57 +08:00 |
|
caoqianming
|
7f1e6f0c56
|
打卡排序/许可证排序
|
2022-11-02 17:09:51 +08:00 |
|
caoqianming
|
64a331a825
|
swagger bug
|
2022-11-02 15:18:30 +08:00 |
|
caoqianming
|
a5940c869c
|
安全帽识别增加补偿机制
|
2022-11-02 13:24:04 +08:00 |
|
caoqianming
|
c4c8bb1898
|
打卡逻辑更新
|
2022-11-02 13:19:47 +08:00 |
|
caoqianming
|
3ee00bdbcf
|
apk get 无需登录
|
2022-11-02 13:02:43 +08:00 |
|
caoqianming
|
faab2f954a
|
部分优化
|
2022-11-01 17:43:28 +08:00 |
|
caoqianming
|
27dd44d436
|
visit audit bug
|
2022-11-01 15:21:51 +08:00 |
|
caoqianming
|
80108274ea
|
visit_driver_end bug
|
2022-11-01 14:31:09 +08:00 |
|
caoqianming
|
10f19272eb
|
visit belong_dept 默认公司
|
2022-11-01 13:52:12 +08:00 |
|
caoqianming
|
d9190abdd5
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2022-11-01 12:57:10 +08:00 |
|
caoqianming
|
7d71834c02
|
bind visit bug
|
2022-11-01 12:57:08 +08:00 |
|
曹前明
|
f6b0f75073
|
许可证增加排序
|
2022-10-31 21:57:55 +08:00 |
|
曹前明
|
f2aadec871
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2022-10-30 21:57:52 +08:00 |
|
曹前明
|
b57ff355c3
|
rpj create 返回信息
|
2022-10-30 21:57:48 +08:00 |
|
caoqianming
|
a787c02fa6
|
save_dahua_pic提供自定义路径
|
2022-10-28 17:13:42 +08:00 |