Commit Graph

822 Commits

Author SHA1 Message Date
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
caoqianming 874d427df3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-28 16:36:54 +08:00
caoqianming 4fa0bb11d1 页面文字修改 2022-10-28 16:36:49 +08:00
曹前明 bdc57a91c9 未穿防烫服事件 2022-10-27 21:49:56 +08:00
曹前明 1dba032737 算法img bug 2022-10-27 21:37:50 +08:00
caoqianming 22412d0be1 相关方/访客项目可进行删除操作 2022-10-27 17:39:27 +08:00
caoqianming 55176e2cfe visit belong_dept 2022-10-27 15:59:39 +08:00
caoqianming a973b62fe8 employee 支持belong_dept filter 2022-10-27 14:06:44 +08:00
caoqianming 44778466cc ai_analyse bug 2022-10-27 13:23:28 +08:00
caoqianming ae2397595f ai_analyse bug 2022-10-27 13:19:58 +08:00
caoqianming 5f3eee5c7c ai_analyse bug 2022-10-27 13:16:34 +08:00
caoqianming c05add8952 算法识别结果尝试加入矩形框 2022-10-27 12:03:09 +08:00
caoqianming 19cbd6dd2a 算法优化一下 2022-10-27 10:25:11 +08:00
caoqianming 9aeb2510a9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-27 10:07:12 +08:00
caoqianming 0a1b068ea1 develop 增加测试接口 2022-10-27 10:07:09 +08:00
曹前明 5b32b838eb 算法识别bug 2022-10-26 21:47:49 +08:00
caoqianming 2549adc08a 加入多个新算法 2022-10-26 18:10:25 +08:00
caoqianming fe2ae8cd35 打卡记录导出增加身份证号列 2022-10-26 17:58:59 +08:00
caoqianming 6f6ee439d7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-26 08:42:53 +08:00
caoqianming 12c5aa5996 ep detail get_location bug 2022-10-26 08:42:50 +08:00
曹前明 9fd220f526 ep update 允许name变更 2022-10-25 21:28:52 +08:00
caoqianming 738da6d183 hrm ep detail返回详细定位信息 2022-10-25 16:20:22 +08:00
曹前明 90a4e46cc8 rpm分配账号可选已有的/至少选择一位访客/成员 2022-10-24 19:02:19 +08:00
曹前明 99f84f48cd bind rpj bug 2022-10-24 09:04:36 +08:00
曹前明 98035be264 empolyee update dahua 2022-10-23 14:00:21 +08:00
曹前明 63bd3286c6 校正性别 2022-10-22 23:48:13 +08:00
曹前明 08d1faf97e 校正性别 2022-10-22 23:33:03 +08:00
曹前明 97710370b6 人脸识别阈值 2022-10-20 17:54:58 +08:00
曹前明 885497f651 身份证号校验错误bug 2022-10-20 17:34:36 +08:00
曹前明 f7e06d67a1 身份证号校验错误bug 2022-10-20 17:29:37 +08:00
曹前明 0f3ca55ac3 hrm signal bug 2022-10-20 15:31:29 +08:00
曹前明 c478425b12 打卡记录导出bug 2022-10-19 20:05:42 +08:00
曹前明 d7cdca48a6 相关方data filter 2022-10-19 19:58:23 +08:00
曹前明 f0ee937af7 打卡记录导出 2022-10-19 19:58:05 +08:00
曹前明 d4e9406666 clockrecord增加筛选/身份证号校验取消 2022-10-19 11:59:52 +08:00
曹前明 0137da7479 blt all 只返回在线标签 2022-10-19 09:53:13 +08:00
曹前明 e439278da5 blt all 只返回在线标签 2022-10-19 09:42:55 +08:00
曹前明 cfc6b072c6 缓存区域信息 2022-10-18 19:16:54 +08:00
曹前明 2ad6d2a3be visitor 注册时创建ep 2022-10-18 14:06:05 +08:00
曹前明 02c387daf4 hrm info get_or_create 2022-10-18 12:16:38 +08:00
曹前明 af61d75177 访客账户注册时关联已有人员优化 2022-10-18 11:38:20 +08:00
曹前明 a6b71c9450 访客账户注册时关联已有人员bug 2022-10-18 11:16:24 +08:00
曹前明 9f1cf30957 访客账户注册时关联已有人员bug 2022-10-18 11:09:45 +08:00
曹前明 aafc3b1ba4 访客账户注册时关联已有人员bug 2022-10-18 11:06:29 +08:00
曹前明 fad13077f6 访客账户注册时关联已有人员 2022-10-18 10:19:35 +08:00
曹前明 53db781742 新建h5文件夹 2022-10-17 19:38:38 +08:00
曹前明 a4a6cd4a93 stop mtask view bug 2022-10-16 00:33:18 +08:00
曹前明 96b851e6bd apkview post bug 2022-10-16 00:13:11 +08:00
曹前明 831167f1f9 opl mtask_uid 2022-10-15 23:53:45 +08:00
caoqianming b129355aec start_mtask 返回mtask_id 2022-10-14 18:16:06 +08:00
caoqianming 3180af943c app端密钥登录validate 2022-10-14 13:41:20 +08:00
caoqianming e0d779d623 opl serializer 增加字段 2022-10-13 14:54:17 +08:00
caoqianming 2b4ae76eff opl serializer 增加字段 2022-10-13 14:51:13 +08:00
caoqianming 348ef951c6 django validationerr 加到 util exception 2022-10-13 09:07:21 +08:00
caoqianming 9227038836 clockrecord filter year month bug 2022-10-13 09:06:53 +08:00
caoqianming 415db7d998 解决雪花ID重复问题 2022-10-11 17:51:21 +08:00
caoqianming b2534d5471 雪花ID重复预处理 2022-10-11 17:09:05 +08:00
caoqianming aff9c0d613 bind_opl 增加字段 2022-10-11 15:54:58 +08:00
caoqianming 13f7a31d16 opl增加workscope 2022-10-11 15:53:59 +08:00
caoqianming 448dccbcac opl list detail serializer优化 2022-10-11 09:41:38 +08:00
caoqianming 62299f4d85 rpj create 返回id 2022-10-10 15:22:28 +08:00
caoqianming c068885888 增加coordinator_name和sys_version 2022-10-10 12:59:13 +08:00
caoqianming 026f656f2e vpeople增加防疫相关内容 2022-10-10 10:14:47 +08:00
曹前明 e8ae55606f 三方token 不过期 2022-10-04 21:20:40 +08:00
曹前明 7aa6f5ccea 获取三方token bug 2022-10-04 20:47:38 +08:00
曹前明 9c4388da78 用redis保存第三方token 2022-10-04 20:33:29 +08:00
曹前明 38b5512001 取消记录寻息成功日志 2022-10-04 11:29:46 +08:00
曹前明 3a38ee28b9 单例模式修改 2022-10-04 11:19:06 +08:00
曹前明 3c01174105 用celery更新token 2022-10-04 10:07:03 +08:00
曹前明 ba4a02b67b 用celery更新token 2022-10-04 10:05:16 +08:00
曹前明 aabb7aefea 寻息接口修改 2022-10-04 09:45:27 +08:00
曹前明 34d8aee962 三方接口异常打日志处理 2022-10-04 09:25:44 +08:00
曹前明 e3a94e9a72 三方接口处理问题 2022-10-04 09:03:31 +08:00
曹前明 7e9d5fe7b0 三方接口处理问题 2022-10-03 21:50:05 +08:00
曹前明 574254f7bc 三方接口处理问题 2022-10-03 14:13:58 +08:00
曹前明 f7b8186e55 三方接口处理问题 2022-10-03 14:11:35 +08:00
曹前明 e89e4dc180 同步数据库 2022-10-03 13:30:10 +08:00
曹前明 1042724b70 工单短信用多线程发送 2022-10-03 13:26:50 +08:00
曹前明 7a3c46c8f1 访问项目增加其他/作业监控任务停止时将mtask置空 2022-09-27 16:35:45 +08:00
曹前明 f22b1f6dc6 handle_xx_event_2 不默认区域 2022-09-27 08:44:14 +08:00
曹前明 4d11516869 卡片不存在做额外处理/增加清除日志任务 2022-09-26 17:46:16 +08:00
曹前明 cc2785d42e 第三方请求优化 2022-09-26 15:06:33 +08:00
曹前明 5d15469b05 tlog增加headers 2022-09-26 13:17:00 +08:00
曹前明 862210f8d3 身份证校验规则问题 2022-09-24 19:50:48 +08:00
曹前明 697e50b520 身份证校验错误bug 2022-09-24 19:16:55 +08:00
曹前明 7e890d87a9 来访项目可硬删除 2022-09-24 12:47:39 +08:00
曹前明 d0f3a59706 notify_event remployee bug 2022-09-24 12:38:56 +08:00
曹前明 efacae0549 check_miss_lcard bug 2022-09-24 12:26:25 +08:00
曹前明 561bc92c4a OperationDetailSerializer bug 2022-09-24 11:49:10 +08:00
曹前明 6556379273 develop test_not_in_place 2022-09-24 11:34:59 +08:00
曹前明 3433071b06 user info bug 2022-09-24 09:36:21 +08:00
曹前明 b874a9225f user info bug 2022-09-24 07:53:08 +08:00
曹前明 3c633b6370 user info bug 2022-09-24 07:50:27 +08:00
曹前明 4ad64f8aa5 bug 2022-09-24 07:46:50 +08:00
曹前明 61bf316329 获取用户信息更完整 2022-09-23 20:45:27 +08:00
曹前明 eb40747ed3 Operation 取消datafilter 2022-09-23 20:27:26 +08:00
曹前明 a960d4a9b8 RpjCreateUpdateSerializer 所属字段可为空 2022-09-23 17:48:55 +08:00
曹前明 d2a473b4a7 RpjCreateUpdateSerializer 所属字段可为空 2022-09-23 17:47:07 +08:00
曹前明 827d40a3f9 2分钟不再次触发 违规进入 2022-09-23 12:16:12 +08:00
曹前明 cc4b4c9365 超时滞留 bug 2022-09-23 11:58:14 +08:00
曹前明 5e6cb50f6f get_area_from_point 优化 2022-09-23 11:02:36 +08:00