 caoqianming
|
8c58d3990e
|
feat: event_push 超过48h未处理也不再推送
|
2023-09-16 23:38:53 +08:00 |
|
caoqianming
|
0c2589c151
|
fix: 解决face缓存时的bug
|
2023-09-16 23:27:07 +08:00 |
|
caoqianming
|
72372c3215
|
feat: face_data中字典形式存储json数据
|
2023-09-16 22:52:44 +08:00 |
|
caoqianming
|
973c48bd7d
|
fix: update_all_facedata bug
|
2023-09-16 22:45:55 +08:00 |
|
caoqianming
|
e32933faa9
|
fix:get_facedata_from_img_x bug
|
2023-09-16 22:26:09 +08:00 |
|
caoqianming
|
beea6f3f54
|
fix: 还是使用face_recongnition2
|
2023-09-16 17:55:24 +08:00 |
|
caoqianming
|
96d83e0b49
|
fix: 还是使用face_recongnition
|
2023-09-16 17:49:35 +08:00 |
|
caoqianming
|
4d80d58554
|
feat: 打卡增加备注字段
|
2023-09-15 10:51:22 +08:00 |
|
caoqianming
|
225dcfddd6
|
fix: em filter_tag
|
2023-09-15 10:26:22 +08:00 |
|
caoqianming
|
6a369883d6
|
fix: 检定记录校验bug
|
2023-09-15 10:12:12 +08:00 |
|
caoqianming
|
c9d8a1e22f
|
fix: 人脸识别时捕获错误
|
2023-09-13 17:34:33 +08:00 |
|
caoqianming
|
a763cc00e6
|
feat: 更改为facenet模型
|
2023-09-12 09:20:04 +08:00 |
|
caoqianming
|
2d59864f65
|
feat: 清除不需要的数据
|
2023-09-12 08:49:37 +08:00 |
|
caoqianming
|
6e06a9ea1d
|
fix: 去除启动时cache_areas_info
|
2023-09-12 08:08:40 +08:00 |
|
caoqianming
|
42760f1501
|
feat: 尝试优化人脸识别速度
|
2023-09-12 07:42:18 +08:00 |
|
caoqianming
|
4448eb2a68
|
fix: 默认使用vgg face
|
2023-09-11 18:02:06 +08:00 |
|
caoqianming
|
741269be87
|
fix: hrm face_data 字段
|
2023-09-11 17:48:37 +08:00 |
|
caoqianming
|
6c10cb647f
|
fix: hrm face_data 字段
|
2023-09-11 17:41:30 +08:00 |
|
caoqianming
|
8fd85bed02
|
fix: hrm face_data 字段
|
2023-09-11 17:31:52 +08:00 |
|
caoqianming
|
81d53ce6b1
|
fix: update_global_face_pd bug
|
2023-09-11 17:28:48 +08:00 |
|
caoqianming
|
300433547e
|
fix: update_global_face_pd bug
|
2023-09-11 17:25:58 +08:00 |
|
caoqianming
|
c8a0bd06af
|
fix: face_find bug
|
2023-09-11 17:24:38 +08:00 |
|
caoqianming
|
1416b83b4e
|
feat: 改用vggface
|
2023-09-11 17:21:43 +08:00 |
|
caoqianming
|
a9cfeeb48e
|
feat: vgg识别成功
|
2023-09-11 17:08:51 +08:00 |
|
caoqianming
|
51f55258d6
|
fix: 人脸识别先这样
|
2023-09-11 16:40:54 +08:00 |
|
caoqianming
|
bfdc5d66ca
|
fix: 代码bug
|
2023-09-11 15:54:54 +08:00 |
|
caoqianming
|
e27f6631a0
|
fix: 用类代替全局变量
|
2023-09-11 15:52:31 +08:00 |
|
caoqianming
|
e97879811f
|
fix: 需要修改全局变量
|
2023-09-11 15:45:31 +08:00 |
|
caoqianming
|
3cc0134c5d
|
fix: django value_list用错了
|
2023-09-11 15:30:04 +08:00 |
|
caoqianming
|
96ac80361e
|
feat: 人脸数据保存在数据库中
|
2023-09-11 15:21:45 +08:00 |
|
caoqianming
|
5dded4d235
|
fix: face_find_from_base64 bug
|
2023-09-11 14:13:17 +08:00 |
|
caoqianming
|
19239c6b42
|
fix: 临时文件默认temp
|
2023-09-11 10:52:09 +08:00 |
|
caoqianming
|
e71d5af84a
|
feat: 增加人脸识别相关功能
|
2023-09-11 10:42:34 +08:00 |
|
caoqianming
|
addf8e771a
|
feat: 添加EXCLUDE_FIELDS_DEPT方便使用
|
2023-09-08 15:16:54 +08:00 |
|
caoqianming
|
d52a47839d
|
feat: 添加库存模块
|
2023-09-08 15:16:22 +08:00 |
|
caoqianming
|
b0455d9e13
|
refector: 优化event_push
|
2023-09-07 12:17:07 +08:00 |
|
caoqianming
|
fd6b5b5db7
|
feat: 完善enm_alarm保存的enm_data信息
|
2023-09-07 10:28:17 +08:00 |
|
caoqianming
|
72d5ae143f
|
fix: event_push后续接着推送的bug
|
2023-09-07 08:48:33 +08:00 |
|
caoqianming
|
95380fa826
|
fix: enm_alarm bug
|
2023-09-06 22:40:42 +08:00 |
|
caoqianming
|
e3449b9b89
|
fix: event_push bug
|
2023-09-06 18:16:50 +08:00 |
|
caoqianming
|
e4ff355853
|
fix: 权限代号单词拼写错误
|
2023-09-06 14:57:25 +08:00 |
|
caoqianming
|
94f87c9a34
|
feat: em增加字段
|
2023-09-06 14:31:46 +08:00 |
|
caoqianming
|
8a96755c22
|
refector: 优化echeckrecordserializer
|
2023-09-06 13:21:12 +08:00 |
|
caoqianming
|
700dbe5f1f
|
feat: 增加校准/检定记录接口描述
|
2023-09-06 12:59:48 +08:00 |
|
caoqianming
|
014b861ae2
|
feat: 校准检定记录表及接口
|
2023-09-06 11:19:30 +08:00 |
|
caoqianming
|
aed110afe9
|
feat: 未处理的event可持续ws推送
|
2023-09-06 09:23:42 +08:00 |
|
caoqianming
|
5835e2f6a0
|
feat: enm_alarm任务函数
|
2023-09-06 08:43:31 +08:00 |
|
caoqianming
|
ec8d416e80
|
feat: notify_event增加wspush以及一些优化
|
2023-09-06 08:42:46 +08:00 |
|
caoqianming
|
1048fb8d5c
|
feat: event_push更新last_ws_pushtime
|
2023-09-06 08:41:12 +08:00 |
|
caoqianming
|
4e06efdc78
|
refector: hrm serializer去除未使用的导入
|
2023-09-06 08:38:59 +08:00 |
|
caoqianming
|
9458276ad1
|
feat: 短信功能的全局开关
|
2023-09-06 08:30:53 +08:00 |
|
caoqianming
|
d6a9a683f1
|
feat: equipment增加启用日期
|
2023-09-06 08:29:43 +08:00 |
|
caoqianming
|
9ad37f41fd
|
feat: 增加last_ws_pushtime, enm_data字段
|
2023-09-05 17:43:49 +08:00 |
|
caoqianming
|
28313b0c33
|
feat: 优化ws event ticket remind三种方法
|
2023-09-05 11:12:13 +08:00 |
|
caoqianming
|
77e92062fb
|
feat: event 支持批量删除
|
2023-09-04 16:59:21 +08:00 |
|
caoqianming
|
75533d41ed
|
feat: sflogexp增加stlog_返回字段
|
2023-09-04 15:50:14 +08:00 |
|
caoqianming
|
f719702432
|
fix: shutdown_or_startup 优化
|
2023-09-04 15:36:16 +08:00 |
|
caoqianming
|
1ed7c846a3
|
fix:cal_shut_hour 的时区问题
|
2023-09-04 14:41:38 +08:00 |
|
caoqianming
|
e59bed611b
|
fix: get_tag_val bug
|
2023-09-04 14:17:03 +08:00 |
|
caoqianming
|
e6127864e7
|
fix: 执行测点函数的bug
|
2023-09-04 14:10:21 +08:00 |
|
caoqianming
|
a0955c401f
|
feat: shutdown_or_startup 优化
|
2023-09-01 17:32:24 +08:00 |
|
caoqianming
|
4fa33a7252
|
fix: cal_shut_hour bug
|
2023-09-01 16:58:58 +08:00 |
|
caoqianming
|
e4c49918ae
|
fix: shutdown_or_startup bug
|
2023-09-01 16:48:03 +08:00 |
|
caoqianming
|
a7b53bce2e
|
feat: shutdown_or_startup bug
|
2023-09-01 15:48:19 +08:00 |
|
caoqianming
|
b8fadbda35
|
feat: 工单ws推送
|
2023-09-01 11:24:47 +08:00 |
|
caoqianming
|
46d127758a
|
fix: roomconsumer bug修改
|
2023-09-01 10:16:36 +08:00 |
|
caoqianming
|
df6fbf500e
|
feat: 增加async def ticket
|
2023-09-01 09:39:03 +08:00 |
|
caoqianming
|
efa6651748
|
feat: remind_push
|
2023-09-01 09:38:07 +08:00 |
|
caoqianming
|
83957c8e9c
|
feat: 增加事件等级等字段并进行相应处理
|
2023-09-01 09:37:38 +08:00 |
|
caoqianming
|
8e0724bbec
|
feat: 添加websocket模块
|
2023-09-01 09:12:18 +08:00 |
|
caoqianming
|
d5386ccd84
|
feat: 优化ws 认证
|
2023-09-01 09:11:43 +08:00 |
|
caoqianming
|
16490c5907
|
feat: 增加serverservice
|
2023-09-01 09:11:18 +08:00 |
|
caoqianming
|
35d001e4e5
|
feat: 任务派发测试
|
2023-09-01 09:08:49 +08:00 |
|
caoqianming
|
64c2d86cd7
|
feat: enstat2增加查询条件
|
2023-08-31 14:14:00 +08:00 |
|
caoqianming
|
c71557b82b
|
feat: 允许修改身份证号
|
2023-08-30 16:16:24 +08:00 |
|
caoqianming
|
ed936082c7
|
feat: mpoint增加func_on_change以完成开停机处理需求
|
2023-08-30 15:19:28 +08:00 |
|
caoqianming
|
8b0733f1fc
|
feat: mgroup增加is_runing字段
|
2023-08-30 15:18:20 +08:00 |
|
caoqianming
|
13d9d6a752
|
feat: 短信服务连接不上时raise exception
|
2023-08-29 10:48:47 +08:00 |
|
caoqianming
|
c9fc726139
|
fix: recal bug修复
|
2023-08-28 10:22:20 +08:00 |
|
caoqianming
|
5ff0cf43a8
|
fix: send_mail_task 未获取config
|
2023-08-28 09:50:17 +08:00 |
|
caoqianming
|
f5f0675f91
|
feat: 增加recal接口
|
2023-08-28 09:42:27 +08:00 |
|
caoqianming
|
c0dd70982a
|
feat: enm增加重跑某一段时间的任务
|
2023-08-28 09:18:32 +08:00 |
|
caoqianming
|
620351c8bf
|
feat: send_mail_task优化
|
2023-08-28 09:18:09 +08:00 |
|
caoqianming
|
f89f56f02d
|
feat: mpoint增加查询条件
|
2023-08-25 17:02:32 +08:00 |
|
caoqianming
|
7bfea08a7d
|
feat: mpointstat增加elec_consume_unit及相应逻辑
|
2023-08-25 17:01:22 +08:00 |
|
caoqianming
|
ad30803836
|
feat: sflogExp增加查询条件
|
2023-08-24 10:52:06 +08:00 |
|
caoqianming
|
6e1ab8a967
|
feat: enstat2 返回时保留2位小数
|
2023-08-24 10:28:07 +08:00 |
|
caoqianming
|
909499fc44
|
feat: 默认密码设置复杂
|
2023-08-24 10:11:11 +08:00 |
|
caoqianming
|
4f6838423b
|
feat: 密码登录复杂度校验可选择
|
2023-08-24 09:14:39 +08:00 |
|
caoqianming
|
c424254670
|
feat: 增加get_day_s方法
|
2023-08-23 13:50:43 +08:00 |
|
caoqianming
|
e907b152f3
|
feat: enstat2增加筛选条件
|
2023-08-23 12:58:26 +08:00 |
|
caoqianming
|
beb9624548
|
feat: price change 时计算加锁
|
2023-08-23 12:45:14 +08:00 |
|
caoqianming
|
4fdddec6d6
|
fix: 先去除加锁功能
|
2023-08-23 08:52:55 +08:00 |
|
caoqianming
|
18942d57c9
|
fix: cal_enstat2 bug
|
2023-08-23 08:48:37 +08:00 |
|
caoqianming
|
50714225e5
|
fix: cal_enstat2 bug
|
2023-08-23 08:45:09 +08:00 |
|
caoqianming
|
cd5cf00fad
|
fix: cal_enstat bug
|
2023-08-23 08:39:49 +08:00 |
|
caoqianming
|
4cd2c0f85b
|
feat: enstat2增加day_s统计及相应的tasks改动
|
2023-08-23 08:33:45 +08:00 |
|
caoqianming
|
11ced96400
|
feat: ecm filter 查询
|
2023-08-22 14:28:00 +08:00 |
|
caoqianming
|
315f832ff2
|
fix: 先调整回来再处理
|
2023-08-22 14:10:00 +08:00 |
|
caoqianming
|
74e81e1a7c
|
feat: ecm filter 查询
|
2023-08-22 14:06:31 +08:00 |
|
caoqianming
|
a0135ec965
|
feat: compress img 默认40kb
|
2023-08-22 13:58:59 +08:00 |
|
caoqianming
|
31b0f33751
|
feat: 提高导出限制
|
2023-08-22 13:56:17 +08:00 |
|
caoqianming
|
c615d20a5c
|
feat: 提高导出限制
|
2023-08-22 13:55:19 +08:00 |
|
caoqianming
|
ab9b9d9804
|
fix: event 导出bug
|
2023-08-22 11:25:21 +08:00 |
|
caoqianming
|
563893efac
|
feat: event增加压缩图片字段
|
2023-08-22 11:13:09 +08:00 |
|
caoqianming
|
39a3001211
|
fix: 导出时用压缩图
|
2023-08-22 10:42:01 +08:00 |
|
caoqianming
|
9ba12d06da
|
feat: global img 压缩
|
2023-08-22 10:33:19 +08:00 |
|
caoqianming
|
0772be47de
|
fix: 导出时的bug
|
2023-08-22 09:20:29 +08:00 |
|
caoqianming
|
6f7a732618
|
feat: ecm 提高导出数据限制
|
2023-08-22 09:12:58 +08:00 |
|
caoqianming
|
a8160867ae
|
feat: 返回数据自动约成2位小数
|
2023-08-21 14:08:47 +08:00 |
|
caoqianming
|
b31d3937f8
|
feat: enstat2 增加水耗和压缩空气统计
|
2023-08-21 09:18:58 +08:00 |
|
caoqianming
|
ad9027d888
|
fix: 煤粉热值取白班值
|
2023-08-17 15:05:40 +08:00 |
|
caoqianming
|
fdf67b5dc5
|
fix: mpointstat增加查询条件
|
2023-08-15 16:00:23 +08:00 |
|
caoqianming
|
dbe1635788
|
feat: mpointstat增加查询条件
|
2023-08-15 15:56:56 +08:00 |
|
caoqianming
|
2c8a86d6f5
|
fix: if hour改为if hour is not None
|
2023-08-15 15:49:35 +08:00 |
|
caoqianming
|
fba349191c
|
feat: 作业未选证书时默认选择全部该成员全部证书
|
2023-08-10 17:12:42 +08:00 |
|
caoqianming
|
cdc53fd14f
|
fix: month_st计算bug
|
2023-08-09 15:07:25 +08:00 |
|
caoqianming
|
fef37ebcd7
|
feat: enstat list返回数据打平2
|
2023-08-09 14:20:00 +08:00 |
|
caoqianming
|
1ee3eb4db3
|
feat: mpintstat增加mgroup name查询条件
|
2023-08-09 13:27:59 +08:00 |
|
caoqianming
|
584e5dc5c3
|
feat: enstat list返回数据打平
|
2023-08-09 13:17:13 +08:00 |
|
caoqianming
|
ccfeb9d901
|
feat: sflogexp合并stlog
|
2023-08-08 14:41:50 +08:00 |
|
caoqianming
|
f4e3d43034
|
fix: 增加查询条件
|
2023-08-08 11:01:33 +08:00 |
|
caoqianming
|
959e3e3d8d
|
feat: enstat增加start_time和end_time的查询条件
|
2023-08-07 16:00:10 +08:00 |
|
caoqianming
|
2f42d8386e
|
feat: eval_formula测试通过
|
2023-08-04 16:57:12 +08:00 |
|
caoqianming
|
5cfb12113e
|
fix: mpointserializer validate 时不做mgroup绑定allocate处理2
|
2023-08-04 16:14:57 +08:00 |
|
caoqianming
|
4157fd95a8
|
fix: mpointserializer validate 时不做mgroup绑定allocate处理
|
2023-08-04 16:00:32 +08:00 |
|
caoqianming
|
039876349e
|
fix: mpointserializer validate 错误
|
2023-08-04 15:34:01 +08:00 |
|
caoqianming
|
866ad4d15d
|
feat: mpoint创建时校验问题
|
2023-08-04 15:17:51 +08:00 |
|
caoqianming
|
dcd338e5fa
|
feat: mpointstat增加返回内容
|
2023-08-04 14:53:51 +08:00 |
|
caoqianming
|
448285e3a1
|
feat: 增加enstat筛选条件
|
2023-08-04 14:35:00 +08:00 |
|
caoqianming
|
8808a14ef2
|
fix: translate_eval_formula bug
|
2023-08-04 14:34:39 +08:00 |
|
caoqianming
|
50a34a44bb
|
feat: 只更新必要的字段
|
2023-08-04 14:29:23 +08:00 |
|
caoqianming
|
ebe6ab9f3b
|
feat: 增加生产异常动态记录表
|
2023-08-04 14:26:53 +08:00 |
|
caoqianming
|
4e5adc6dc3
|
feat: 获取工段全年目标
|
2023-08-04 14:26:00 +08:00 |
|
caoqianming
|
2be3c43bef
|
feat: 添加enstat2路由
|
2023-08-04 14:25:10 +08:00 |
|
caoqianming
|
16971d9742
|
feat: 返回时携带ep_monitored_name
|
2023-08-04 09:55:26 +08:00 |
|
caoqianming
|
959fc60e24
|
feat: 获取工段全年目标值
|
2023-08-04 09:24:00 +08:00 |
|
caoqianming
|
c7b7d9cec4
|
fix: cal_enstat_when_pcoal_heat_change的qs获取bug
|
2023-08-03 14:09:47 +08:00 |
|
caoqianming
|
7fd10f3e51
|
fix: pcoal_coal_consume可能为None
|
2023-08-03 13:58:15 +08:00 |
|
caoqianming
|
cb60fe2728
|
feat: 其他成本数据忘记保存
|
2023-08-03 13:33:27 +08:00 |
|
caoqianming
|
ac0908dc11
|
fix: month_st时equip_data计算失误
|
2023-08-03 11:16:04 +08:00 |
|
caoqianming
|
60ac9e6ac2
|
fix: except ZeroDivisionError
|
2023-08-03 10:37:03 +08:00 |
|
caoqianming
|
a609b1db94
|
feat: cal_enstat_when_team_change
|
2023-08-03 10:31:38 +08:00 |
|
caoqianming
|
8ab973749d
|
feat: goal增加查询条件
|
2023-08-02 17:42:19 +08:00 |
|
caoqianming
|
67d04a9a41
|
feat: 可以不用间隔运行get_total_hour_now
|
2023-08-02 17:25:07 +08:00 |
|
caoqianming
|
40ecd52fee
|
feat: 可根据时间段生成排版记录
|
2023-08-02 15:54:09 +08:00 |
|
caoqianming
|
e1e8d76ecf
|
fix: formula 允许为空
|
2023-08-02 15:20:06 +08:00 |
|
caoqianming
|
d1d427927e
|
feat: 暂时先同步执行,后面再优化
|
2023-08-02 15:09:56 +08:00 |
|
caoqianming
|
25e49601a5
|
fix: task_chain group
|
2023-08-02 14:38:22 +08:00 |
|
caoqianming
|
5c3af36441
|
fix: 未注册为task
|
2023-08-02 14:28:13 +08:00 |
|
caoqianming
|
7619e5156c
|
feat: cal_mpointstats分组执行
|
2023-08-02 14:12:46 +08:00 |
|
caoqianming
|
ad2f903c89
|
fix: init_test bug
|
2023-08-02 10:51:48 +08:00 |
|
caoqianming
|
6fa1d379d3
|
feat: priceset feeset change触发enstat重新计算
|
2023-08-02 10:23:42 +08:00 |
|
caoqianming
|
3dc647272a
|
feat: cal_enstat_when_pcoal_val_change 未完成
|
2023-08-02 10:22:51 +08:00 |
|
caoqianming
|
5402f2181c
|
feat: 增加enstat 统计数据，优化task执行
|
2023-08-02 10:22:29 +08:00 |
|
caoqianming
|
ab581f2851
|
fix: after_bulk_update执行后不用return
|
2023-08-02 10:19:38 +08:00 |
|
caoqianming
|
251e373d5b
|
feat: get_total_hour_now 修改
|
2023-08-01 16:41:47 +08:00 |
|
caoqianming
|
80b61c9f8b
|
fix: get_total_hour_now bug
|
2023-08-01 08:54:01 +08:00 |
|
caoqianming
|
d2e4439b73
|
fix: get_total_hour_now bug
|
2023-08-01 08:50:06 +08:00 |
|
caoqianming
|
a29ed1edc8
|
fix: get_total_hour_now sql查询bug
|
2023-07-31 17:46:56 +08:00 |
|
caoqianming
|
8e3802966e
|
feat: enstat参数计算并新建enstat2表
|
2023-07-28 17:36:44 +08:00 |
|
caoqianming
|
6d5d2f84d4
|
feat: 停机记录分配到每一个班
|
2023-07-28 17:36:09 +08:00 |
|
caoqianming
|
d487f0889f
|
feat: 获取煤粉热值
|
2023-07-28 17:20:54 +08:00 |
|
caoqianming
|
56bc87c913
|
feat: 启动时重新加载系统配置json
|
2023-07-28 17:19:36 +08:00 |
|
caoqianming
|
1d0b43d75f
|
feat: sflog增加total_hour_now以及pcoal_val
|
2023-07-28 17:18:59 +08:00 |
|
caoqianming
|
a668ca0b2f
|
feat: 返回数据增加belong_dept_name等
|
2023-07-25 14:24:21 +08:00 |
|
caoqianming
|
841815bbb6
|
fix: 班月质检数据统计错误
|
2023-07-25 13:58:31 +08:00 |
|
caoqianming
|
e64ae3aebe
|
feat: goal返回goal_cata_name和mgroup_name
|
2023-07-25 13:58:11 +08:00 |
|
caoqianming
|
437d4c923e
|
fix: init_test 报错
|
2023-07-25 13:25:05 +08:00 |
|
caoqianming
|
887976363b
|
fix: quastat update serializer
|
2023-07-25 13:21:02 +08:00 |
|
caoqianming
|
00677d100b
|
feat: swagger显示问题
|
2023-07-25 11:33:33 +08:00 |
|
caoqianming
|
b634bac616
|
feat: sflog获取年月日优化
|
2023-07-25 11:23:36 +08:00 |
|
caoqianming
|
13382171de
|
refector: 初始化检测录入优化
|
2023-07-25 11:20:27 +08:00 |
|
caoqianming
|
be9011f8f5
|
feat: sflog增加property以获取年月日
|
2023-07-25 11:19:51 +08:00 |
|
caoqianming
|
9f8cf21bf1
|
feat: 批量更新时after_bulk_update放在事务中处理
|
2023-07-25 11:17:34 +08:00 |
|
caoqianming
|
7fde7148bf
|
feat: 质检数据重新统计并放入enstat表中
|
2023-07-25 11:16:38 +08:00 |
|
caoqianming
|
6c3cbf0c5e
|
feat: 目标增加code查询条件
|
2023-07-25 11:14:32 +08:00 |
|
caoqianming
|
e15cc2f9ce
|
fix: enm以team做统计不是shift
|
2023-07-25 11:13:54 +08:00 |
|
caoqianming
|
6e98ec57ee
|
feat: mpoint支持formular
|
2023-07-24 16:03:06 +08:00 |
|
caoqianming
|
27a2a20cbe
|
feat: 值班记录增加运转时间和停机时间
|
2023-07-24 11:19:08 +08:00 |
|
caoqianming
|
0abade21b7
|
feat: 质检统计增加班月month_sf
|
2023-07-24 10:32:38 +08:00 |
|
caoqianming
|
6df6b75499
|
feat: 同步质检表
|
2023-07-24 10:22:41 +08:00 |
|
caoqianming
|
f4f9cb0fae
|
feat: 质检统计增加班月
|
2023-07-24 10:22:06 +08:00 |
|
caoqianming
|
2acd216d33
|
feat: eventcate code 不唯一
|
2023-07-19 17:24:45 +08:00 |
|
caoqianming
|
16f560adc0
|
feat: 大华订阅增加移动侦测
|
2023-07-19 15:30:44 +08:00 |
|
caoqianming
|
886843174d
|
feat: tdevice 增加code查询条件
|
2023-07-19 10:20:07 +08:00 |
|
caoqianming
|
5ba9789de2
|
fix: 计算优化待完成
|
2023-07-19 09:18:03 +08:00 |
|
caoqianming
|
a8afccdfca
|
feat: 增加month_sf统计维度, 优化二次计算逻辑
|
2023-07-18 14:15:52 +08:00 |
|
caoqianming
|
f8bc2294f0
|
feat: 初步统计能管相关数据产量和成本
|
2023-07-17 15:33:35 +08:00 |
|
caoqianming
|
3fbe3e7d0e
|
fix: 保存last_tag_id以减少获取mplog
|
2023-07-11 14:52:39 +08:00 |
|
caoqianming
|
c3d0fa1806
|
feat: mgroups_allocate保存时带mgroup_name
|
2023-07-11 14:29:32 +08:00 |
|
caoqianming
|
c0e4b8a1b9
|
fix: 比例合计问题
|
2023-07-11 14:21:36 +08:00 |
|
caoqianming
|
a30bffd244
|
fix: cal_mpointstat_manual 以班手动录入数据
|
2023-07-11 13:48:35 +08:00 |
|
caoqianming
|
bf1ac0549e
|
feat: mpointstat增加mgroup字段和相应逻辑
|
2023-07-11 13:46:37 +08:00 |
|
caoqianming
|
c122335f8c
|
feat: 支持测点数据反向分配给各工段
|
2023-07-11 10:53:28 +08:00 |
|
caoqianming
|
f02135dc10
|
fix: init_test 排序错误
|
2023-07-10 16:26:23 +08:00 |
|
caoqianming
|
a8576212a1
|
feat: 通过接口重新加载config
|
2023-07-10 15:12:45 +08:00 |
|
caoqianming
|
e5fb485418
|
fix: RpjmemberCreateSerializer 的bug
|
2023-07-10 14:13:34 +08:00 |
|
caoqianming
|
caaeb32817
|
feat: 增加能耗统计记录表
|
2023-07-10 13:45:22 +08:00 |
|
caoqianming
|
7af0447928
|
fix: cal_mpointstats 字符写错
|
2023-07-10 10:41:24 +08:00 |
|
caoqianming
|
9f46722f48
|
fix: cal_mpointstat_manual 标注bug
|
2023-07-10 10:20:24 +08:00 |
|
caoqianming
|
2884becf3f
|
feat: 测点统计任务优化
|
2023-07-10 10:13:45 +08:00 |
|
caoqianming
|
56d9c50a39
|
fix: 非管理员不支持物理删除
|
2023-07-10 10:00:46 +08:00 |
|
caoqianming
|
377817f04c
|
feat: sflog增加查询参数已获取当前值班记录
|
2023-07-07 15:36:49 +08:00 |
|
caoqianming
|
9d26946195
|
feat: bi exec查询参数校验
|
2023-07-07 15:36:06 +08:00 |
|
caoqianming
|
31ec00ba55
|
fix: 提前离厂只检查最近日志
|
2023-07-07 12:59:37 +08:00 |
|
caoqianming
|
9498e5eb22
|
feat: 测点统计记录支持手动创建
|
2023-07-06 17:03:28 +08:00 |
|
caoqianming
|
ad0c3cdd7c
|
fix: dataset validate默认sql_query为空/缺少查询参数提示
|
2023-07-06 16:58:04 +08:00 |
|
caoqianming
|
e51d19fac0
|
fix: 初始化检测录入排序及取消质检任务执行
|
2023-07-06 14:48:33 +08:00 |
|
caoqianming
|
e399e8fa4b
|
fix: qm task 计算bug
|
2023-07-06 12:13:12 +08:00 |
|
caoqianming
|
b672581c11
|
feat: 增加部分排序功能
|
2023-07-06 10:32:51 +08:00 |
|
caoqianming
|
9c83e9719e
|
fix: qm task 计算时rate_pass 单独处理
|
2023-07-06 09:48:41 +08:00 |
|
caoqianming
|
79de49ed23
|
feat: 重新入厂的bug2
|
2023-07-06 09:10:45 +08:00 |
|
caoqianming
|
270b17e104
|
feat: 重新入厂的bug
|
2023-07-06 09:07:56 +08:00 |
|
caoqianming
|
1de238ca07
|
feat: 相关方人员重新入厂
|
2023-07-06 08:49:18 +08:00 |
|
caoqianming
|
dab2d164b1
|
feat: 值班记录增加最后质检时间
|
2023-07-06 08:39:57 +08:00 |
|
caoqianming
|
46a5aa7cc7
|
fix: quastat task 计算优化3
|
2023-07-05 17:16:47 +08:00 |
|
caoqianming
|
4ae0ce1d9e
|
fix: quastat task 计算优化2
|
2023-07-05 17:07:20 +08:00 |
|
caoqianming
|
e0fcb2e22b
|
fix: 初始化检测bug
|
2023-07-05 16:39:01 +08:00 |
|
caoqianming
|
07f517de58
|
fix: quastat task 计算优化
|
2023-07-05 16:32:08 +08:00 |
|
caoqianming
|
a063db0c9b
|
fix: quastat task 计算有误
|
2023-07-05 16:21:33 +08:00 |
|
caoqianming
|
edd2dc5600
|
fix: 初始化检测录入rate_pass, create_by, belong_dept需要有
|
2023-07-05 16:17:10 +08:00 |
|
caoqianming
|
eef4beebb4
|
fix: 修复quastat task
|
2023-07-05 16:02:28 +08:00 |
|
caoqianming
|
965e3169ba
|
feat: 初始化检测录入bug
|
2023-07-05 14:35:21 +08:00 |
|
caoqianming
|
a5272c6c6f
|
fix: BulkCreateModelMixin bug
|
2023-07-05 14:23:23 +08:00 |
|
caoqianming
|
9d2108ce47
|
fix: quastat rate_pass字段可为空
|
2023-07-05 14:12:03 +08:00 |
|
caoqianming
|
066217d6c1
|
fix: 初始化检测录入bug
|
2023-07-05 14:06:44 +08:00 |
|
caoqianming
|
ae84f6b6c9
|
feat: quastat 加入批量接口
|
2023-07-05 13:45:03 +08:00 |
|
caoqianming
|
235d17f193
|
feat: 设备增加power_kw查询
|
2023-07-05 13:44:41 +08:00 |
|
caoqianming
|
93881852d0
|
feat: sflog init_test接口
|
2023-07-05 13:44:07 +08:00 |
|
caoqianming
|
0f1bb7fd72
|
feat: utils增加批量接口mixin
|
2023-07-05 13:43:30 +08:00 |
|
caoqianming
|
388d9213fd
|
feat: 增加了test_material字段
|
2023-07-04 13:30:19 +08:00 |
|
caoqianming
|
46b179b6ff
|
doc: 补充注释
|
2023-07-04 10:11:16 +08:00 |
|
caoqianming
|
fe117d05be
|
feat: 增加input_materials 字段
|
2023-07-04 10:07:55 +08:00 |
|
caoqianming
|
1537da6bda
|
feat: 增加fim app; 费用及成本配置
|
2023-07-04 10:07:15 +08:00 |
|
caoqianming
|
673fd0501c
|
feat: equipment增加power_kw字段
|
2023-06-30 17:14:18 +08:00 |
|
caoqianming
|
f62344509f
|
feat: bi exec 支持code执行
|
2023-06-30 16:15:04 +08:00 |
|
caoqianming
|
73ade42f8d
|
feat: visit增加来访事由
|
2023-06-30 15:12:39 +08:00 |
|
caoqianming
|
6b0e0fae3b
|
feat: mpoint serializer增加material_name
|
2023-06-30 14:15:59 +08:00 |
|
caoqianming
|
f6a15be31d
|
feat: mpoint增加material字段
|
2023-06-30 12:09:57 +08:00 |
|
caoqianming
|
f620dc0bcb
|
refector: 生成排班记录
|
2023-06-30 10:24:15 +08:00 |
|
caoqianming
|
a6167294f7
|
feat: sflog filter
|
2023-06-30 10:22:46 +08:00 |
|
caoqianming
|
d285e09c5c
|
fix: quastat create时年月日bug
|
2023-06-30 10:22:13 +08:00 |
|
caoqianming
|
3b427cce59
|
feat: 测点统计表及相关逻辑cal_val修改
|
2023-06-30 10:21:34 +08:00 |
|
caoqianming
|
72782163ab
|
feat: admin增加mgroup
|
2023-06-30 10:19:10 +08:00 |
|
caoqianming
|
d105218d9b
|
fix: 删除布设时把监控该算法线程停止
|
2023-06-29 11:25:38 +08:00 |
|
caoqianming
|
ef1ea0e784
|
fix: 通知提醒出错
|
2023-06-29 11:14:50 +08:00 |
|
caoqianming
|
6bbbf16049
|
feat: 值班记录排序
|
2023-06-28 09:13:14 +08:00 |
|
caoqianming
|
49fa109233
|
feat: 自动创建值班记录
|
2023-06-28 09:00:43 +08:00 |
|
caoqianming
|
783869638f
|
fix: mpoint添加时mgroup必填
|
2023-06-27 16:08:45 +08:00 |
|
caoqianming
|
e709b28d25
|
feat: mtm goal 接口
|
2023-06-27 14:17:25 +08:00 |
|
caoqianming
|
14539b89ba
|
feat: 质量数据班日，班月，班年录入与处理
|
2023-06-27 13:49:03 +08:00 |
|
caoqianming
|
06c896c97f
|
fix: perms_map 修改
|
2023-06-26 17:17:37 +08:00 |
|
caoqianming
|
13b0204c6b
|
feat: quastat sflog create 不需要 belong_dept
|
2023-06-26 16:49:16 +08:00 |
|
caoqianming
|
51737bcdd8
|
fix: 权限代号调整
|
2023-06-26 16:45:52 +08:00 |
|
caoqianming
|
0e38b36ef5
|
feat: mtm相关表加入django后台
|
2023-06-26 16:33:06 +08:00 |
|
caoqianming
|
24fa17ddb5
|
fix: 修改字段后的bug
|
2023-06-26 16:29:51 +08:00 |
|
caoqianming
|
0145beb63f
|
feat: 值班记录质量分析数据录入
|
2023-06-26 16:00:23 +08:00 |
|
caoqianming
|
07a8e5977f
|
feat: 值班记录增加电耗统计
|
2023-06-25 17:10:39 +08:00 |
|
caoqianming
|
ddd3f6a5f0
|
feat: 测点统计表接口
|
2023-06-25 17:09:19 +08:00 |
|
caoqianming
|
c2ad28ae4b
|
fix: 同步大华部门信息需要dahua_enabled
|
2023-06-25 16:50:54 +08:00 |
|
caoqianming
|
a2b2cbe153
|
refector: 不需要打算法图片日志
|
2023-06-25 15:07:27 +08:00 |
|
caoqianming
|
24ce6836b3
|
fix: wf触发执行校验bug
|
2023-06-22 08:01:25 +08:00 |
|
caoqianming
|
730942598c
|
fix: wf触发执行校验bug
|
2023-06-22 07:44:52 +08:00 |
|
caoqianming
|
db1dddd70d
|
fix: wf触发执行校验bug
|
2023-06-22 07:42:43 +08:00 |
|
caoqianming
|
c99ab40d84
|
fix: wf触发执行校验bug
|
2023-06-22 07:40:26 +08:00 |
|
caoqianming
|
a9825f5ad4
|
fix: rpj visit 在工单初始状态时可以编辑
|
2023-06-22 01:07:24 +08:00 |
|
caoqianming
|
b2cfdf9995
|
fix: ticket_handle_permission_check 重新梳理
|
2023-06-22 00:14:17 +08:00 |
|
caoqianming
|
d44f9751bb
|
fix: 重复创建工单之隐藏bug
|
2023-06-21 22:50:05 +08:00 |
|
caoqianming
|
df1b0c6b20
|
fix: 工单回到创建中的相应操作
|
2023-06-21 22:16:23 +08:00 |
|
caoqianming
|
50749cd10d
|
fix: oplworker在工单开始状态可以新增
|
2023-06-21 17:14:35 +08:00 |
|
caoqianming
|
0787a9a70f
|
fix: oplworker在工单初始状态下可删除
|
2023-06-21 17:10:18 +08:00 |
|
caoqianming
|
e372015e7d
|
fix: 校验重复创建工单
|
2023-06-21 16:50:03 +08:00 |
|
caoqianming
|
7ab3535c83
|
feat: task_ticket 默认发送通知
|
2023-06-21 15:31:36 +08:00 |
|
caoqianming
|
07822f093d
|
feat: 工单回到创建中时更改作业状态
|
2023-06-21 15:14:06 +08:00 |
|
caoqianming
|
8a7ae2994e
|
feat: 算法打印图片日志
|
2023-06-21 11:32:32 +08:00 |
|
caoqianming
|
1d16949d8a
|
feat: 增加wpm,qm,mtm三个app
|
2023-06-20 17:05:50 +08:00 |
|
caoqianming
|
0312de5cf5
|
feat: opm operation 增加查询条件
|
2023-06-20 11:13:29 +08:00 |
|
caoqianming
|
d2392a3c74
|
feat: 完善enm task相关功能
|
2023-06-15 16:57:29 +08:00 |
|
caoqianming
|
4f37b4c023
|
feat: 如果echart_options时以function开头就不处理了
|
2023-06-15 16:19:35 +08:00 |
|
caoqianming
|
21a1cc4e63
|
fix: 修改enm swagger read_only的展示
|
2023-06-15 08:37:14 +08:00 |
|
caoqianming
|
6b77346574
|
feat: 调整ai以适应算法部署到本地
|
2023-06-15 08:24:41 +08:00 |
|
caoqianming
|
afa6cec3a0
|
fix: enm tasks bug
|
2023-06-14 16:50:11 +08:00 |
|
caoqianming
|
5f9ef83c6e
|
feat: 完善enm表
|
2023-06-14 15:30:51 +08:00 |
|
caoqianming
|
2db95349b2
|
feat: 关闭工单时需要执行提交时调用方法
|
2023-06-13 09:29:51 +08:00 |
|
caoqianming
|
cf4654a532
|
feat: 添加enm相关内容
|
2023-06-09 09:42:46 +08:00 |
|
caoqianming
|
52bb1ca367
|
feat: 修改系统自定义配置文件
|
2023-06-09 09:41:18 +08:00 |
|
caoqianming
|
f452b43016
|
fix: 生成工单流水号 ok
|
2023-06-09 09:30:34 +08:00 |
|
caoqianming
|
91b2ac3755
|
Revert "fix: 工单流水号+1"
This reverts commit e8886902f2.
|
2023-06-09 09:11:16 +08:00 |
|
caoqianming
|
94ac4ddbe9
|
Revert "fix: 工单流水号不用加1"
This reverts commit 265d89c6f8.
|
2023-06-09 09:08:44 +08:00 |
|
caoqianming
|
059b044478
|
feat: 高处和动火校验证书是否上传
|
2023-06-08 10:35:39 +08:00 |
|
caoqianming
|
265d89c6f8
|
fix: 工单流水号不用加1
|
2023-06-08 10:26:46 +08:00 |
|
caoqianming
|
ca485d9c78
|
fix: 矫正工单流水号bug
|
2023-06-08 10:15:49 +08:00 |
|
caoqianming
|
d6198889f4
|
fix: 矫正工单流水号
|
2023-06-08 10:11:33 +08:00 |
|
caoqianming
|
e8886902f2
|
fix: 工单流水号+1
|
2023-06-08 10:05:42 +08:00 |
|
caoqianming
|
a7df6d339c
|
fix: 作业删除时 删除可能的工单出现的bug
|
2023-06-08 09:21:53 +08:00 |
|
caoqianming
|
5c94f144bd
|
fix: apk upload 修改sysconf
|
2023-06-08 09:14:56 +08:00 |
|
caoqianming
|
c4e44cda26
|
feat: 算法处理失败时邮件通知
|
2023-06-07 14:51:37 +08:00 |
|
caoqianming
|
9d9e670240
|
feat: enm models初步设计
|
2023-06-07 13:48:00 +08:00 |
|
caoqianming
|
d10b68c2b2
|
feat: 暂时不检查作业人员就位事件
|
2023-06-07 09:51:44 +08:00 |
|
caoqianming
|
8d08e2dde1
|
fix: operation 支持直接删除管理员操作
|
2023-06-07 09:42:21 +08:00 |
|
caoqianming
|
364abe1a3b
|
feat: operation 支持直接删除管理员操作
|
2023-06-07 09:16:17 +08:00 |
|
caoqianming
|
31f5a402c0
|
feat: 有限空间气体检测记录必填
|
2023-06-05 14:30:13 +08:00 |
|
caoqianming
|
50fe411b71
|
feat: operation 增加筛选条件
|
2023-06-05 12:50:33 +08:00 |
|
caoqianming
|
15db992dff
|
refetor: 修改get_ticket_sn 参数type
|
2023-06-03 16:56:02 +08:00 |
|
caoqianming
|
5d7880ca64
|
fix: opl ticket 撤回时支持修改oplworker gascheck
|
2023-06-03 16:33:25 +08:00 |
|
caoqianming
|
46b0638bfb
|
feat: 添加enm app
|
2023-06-02 17:50:41 +08:00 |
|
caoqianming
|
5ded2347b7
|
feat: 更改部分系统配置为json自定义
|
2023-06-01 17:12:07 +08:00 |
|
caoqianming
|
313005eb5c
|
refector: tlog查看权限放开
|
2023-05-31 16:49:46 +08:00 |
|
caoqianming
|
ae071d1d9c
|
perf: dataset exec 缓存优化
|
2023-05-31 09:19:32 +08:00 |
|
caoqianming
|
8a1d43b7b8
|
refector: 删除相关方时将该部门的账户禁用
|
2023-05-29 09:06:09 +08:00 |
|
caoqianming
|
a3d9fe4606
|
feat: 报表模块基础开发
|
2023-05-26 13:02:43 +08:00 |
|
caoqianming
|
a1efcb46da
|
fix: 事件删除权限
|
2023-05-25 17:12:22 +08:00 |
|
caoqianming
|
515952ef8d
|
fix: 管理员返回所有权限代号
|
2023-05-25 11:19:23 +08:00 |
|
caoqianming
|
2d2edc1ab3
|
fix: 管理员返回所有权限代号
|
2023-05-25 10:51:39 +08:00 |
|
caoqianming
|
b338cbc34c
|
refector: 如果超出时间不检查人员未就位
|
2023-05-25 10:46:31 +08:00 |
|
caoqianming
|
5131daa5cd
|
feat: 接口增加默认缓存时间
|
2023-05-25 10:45:41 +08:00 |
|
caoqianming
|
3d9f04a443
|
refector: 管理员返回所有权限代号
|
2023-05-25 10:44:05 +08:00 |
|
caoqianming
|
863a301cb8
|
refector: visit audit end 修改司机入厂逻辑
|
2023-05-24 17:35:51 +08:00 |
|
caoqianming
|
9dff134329
|
fix: algo channel 添加bug
|
2023-05-24 17:19:32 +08:00 |
|
caoqianming
|
936af7c4fe
|
feat: 开始添加设备管理模块
|
2023-05-22 15:55:32 +08:00 |
|
caoqianming
|
b1ded623fa
|
feat: 增加报表模块
|
2023-05-11 16:20:36 +08:00 |
|
caoqianming
|
4e6f4b249b
|
fix: while 循环做card_door_authority的提高补偿机制次数
|
2023-05-09 17:02:41 +08:00 |
|
caoqianming
|
eeca896a78
|
fix: 紧急bug
|
2023-05-09 09:52:54 +08:00 |
|
caoqianming
|
25e56b4bd0
|
feat: 查询用户列表可返回更详细的定位信息
|
2023-05-09 09:51:28 +08:00 |
|
caoqianming
|
ef95b3c51f
|
feat: 查询用户列表可返回更详细的定位信息
|
2023-05-09 09:46:44 +08:00 |
|
caoqianming
|
b38e4860ac
|
refector: 缓存区域信息带名字
|
2023-05-09 09:42:02 +08:00 |
|
caoqianming
|
702ef7641c
|
fix: while 循环做card_door_authority的补偿机制4
|
2023-05-09 08:46:02 +08:00 |
|
caoqianming
|
ca1a426182
|
fix: while 循环做card_door_authority的补偿机制3
|
2023-05-09 08:34:45 +08:00 |
|
caoqianming
|
a395817028
|
fix: while 循环做card_door_authority的补偿机制2
|
2023-05-08 18:14:57 +08:00 |
|
caoqianming
|
8d3d1934b7
|
fix: while 循环做card_door_authority的补偿机制
|
2023-05-08 15:51:05 +08:00 |
|
caoqianming
|
f59426b426
|
fix: 后入厂时的reason pop出
|
2023-05-06 13:20:07 +08:00 |
|
caoqianming
|
33cc805172
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2023-05-05 09:40:24 +08:00 |
|
caoqianming
|
b1ec172829
|
refector: 尝试访问卡片以确保卡片生成
|
2023-05-05 09:40:20 +08:00 |
|
caoqianming
|
923e812890
|
fix: ep update 不放在事务中
|
2023-04-27 14:43:01 +08:00 |
|
caoqianming
|
c2c05a5075
|
fix: opl level可为空
|
2023-04-27 14:42:33 +08:00 |
|
caoqianming
|
e6933f9fc4
|
fix: rpjmember update rpj获取错误
|
2023-04-27 11:31:01 +08:00 |
|
caoqianming
|
7128e67e92
|
fix: 人员导出excel信息bug
|
2023-04-19 19:29:18 +08:00 |
|
caoqianming
|
bc6aa5cacc
|
fix: 人员导出excel信息bug
|
2023-04-19 19:25:39 +08:00 |
|
caoqianming
|
9192d9ffda
|
fix: 人员导出excel信息bug
|
2023-04-19 19:20:52 +08:00 |
|
caoqianming
|
aefd513987
|
fix: swipe_next exception_type 保存bug
|
2023-04-19 18:43:49 +08:00 |
|
caoqianming
|
6a0929dc10
|
fix: swipe_next还是通过save,这样可见update_time 变动
|
2023-04-19 17:36:10 +08:00 |
|
caoqianming
|
aa84d50957
|
feat: employee导出并增加是否有定位卡的筛选
|
2023-04-18 19:34:03 +08:00 |
|
caoqianming
|
3410f5d968
|
feat: MySchedule创建时自动获取汉语描述
|
2023-04-18 18:10:50 +08:00 |
|
caoqianming
|
0303184ceb
|
feat: 阿里云短信加入auto_log装饰器
|
2023-04-17 08:21:07 +08:00 |
|
caoqianming
|
1c661631ea
|
fix: 加签和加签完成接口需要校验
|
2023-04-17 00:05:32 +08:00 |
|
caoqianming
|
a757321f5c
|
fix: 解决cache_areas_info重复执行的问题
|
2023-04-15 21:10:16 +08:00 |
|
caoqianming
|
c4805c8d8e
|
fix: 相关方中途入厂时因事务引发的bug
|
2023-04-15 21:02:33 +08:00 |
|
caoqianming
|
3af691844b
|
fix: rpj_member_leave 中更新当前入厂项目bug
|
2023-04-15 18:25:19 +08:00 |
|
caoqianming
|
59e89c19ba
|
fix: 解决cache_areas_info重复执行的问题
|
2023-04-15 17:54:18 +08:00 |
|
caoqianming
|
64bdd72146
|
fix: snap_and_analyse时更新缓存
|
2023-04-15 17:32:58 +08:00 |
|
caoqianming
|
284a36e24c
|
fix: snap_and_analyse时更新缓存
|
2023-04-15 17:32:44 +08:00 |
|
caoqianming
|
0b1323b41d
|
feat: 支持开启服务侧算力监控
|
2023-04-14 17:20:32 +08:00 |
|
caoqianming
|
ba937ce751
|
refector: 一点优化
|
2023-04-14 16:54:10 +08:00 |
|
caoqianming
|
65ff80db75
|
refector: 工作流脚本每次失败都记录日志
|
2023-04-14 16:53:35 +08:00 |
|
caoqianming
|
2d2f171c32
|
feat: tdevice 视频通道查询带third_info
|
2023-04-14 16:26:21 +08:00 |
|
caoqianming
|
03ac2a5b1b
|
refector: 命名修改
|
2023-04-14 16:24:56 +08:00 |
|
caoqianming
|
d9c318de8e
|
refector: 证书检索条件
|
2023-04-13 17:16:46 +08:00 |
|
caoqianming
|
c097b44e0c
|
fix: 文件上传不做幂等操作
|
2023-04-13 09:45:13 +08:00 |
|
caoqianming
|
50553bd0c0
|
fix: swip_next bug
|
2023-04-13 08:01:11 +08:00 |
|
caoqianming
|
005919af19
|
fix: 直接请求user列表不应该返回删除的用户
|
2023-04-12 18:03:24 +08:00 |
|
caoqianming
|
68c54a73e3
|
refector: swipe_next 优化2
|
2023-04-12 17:10:38 +08:00 |
|
caoqianming
|
f4aacc2129
|
refector: swipe_next 优化
|
2023-04-12 17:06:38 +08:00 |
|
caoqianming
|
8f2bea554f
|
feat: 摄像头支持随时开启算法监控(每10s拍照)
|
2023-04-12 15:56:50 +08:00 |
|
caoqianming
|
eea05cf6f3
|
refector: 事件处理取消一些限制
|
2023-04-12 15:50:58 +08:00 |
|
caoqianming
|
2b054107c0
|
fix: 非工单节点下的流转不继续
|
2023-04-12 14:20:48 +08:00 |
|
caoqianming
|
14dc063f59
|
refector: post请求进行幂等操作
|
2023-04-12 14:19:18 +08:00 |
|
caoqianming
|
0bb351fb99
|
fix: 修改opl level字段默认为空字符
|
2023-04-12 14:18:23 +08:00 |
|
caoqianming
|
9d68a7006e
|
refector: 修改dpm字段
|
2023-04-12 14:17:45 +08:00 |
|
caoqianming
|
557f95e4cf
|
fix: 权限cache维持300s
|
2023-04-10 14:57:41 +08:00 |
|
caoqianming
|
731c93ce71
|
fix: get_user_perms_map 中 data_range取最小值
|
2023-04-10 14:56:41 +08:00 |
|
caoqianming
|
1a61e5ab27
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2023-04-07 15:06:30 +08:00 |
|
caoqianming
|
121d6ec15c
|
feat: 增加相关方黑名单
|
2023-04-07 15:06:26 +08:00 |
|
caoqianming
|
a6f5137dff
|
fix: close_visit_by_leave_time 待入厂也应正常关闭
|
2023-04-05 10:15:05 +08:00 |
|
caoqianming
|
8df57ed99a
|
refector: 开启关闭监控加入日志记录
|
2023-04-05 10:04:35 +08:00 |
|
caoqianming
|
96c12108e0
|
fix: 工单流水号bug
|
2023-04-03 14:53:40 +08:00 |
|
caoqianming
|
4c4e637cc3
|
fix: rparty delete同步dept
|
2023-04-03 14:01:38 +08:00 |
|
caoqianming
|
7cbd581701
|
fix: rparty create时dept字段冲突2
|
2023-04-03 13:35:54 +08:00 |
|
caoqianming
|
cd3a0393ad
|
fix: 生成工单流水号bug
|
2023-04-03 13:19:06 +08:00 |
|
caoqianming
|
3baa41b504
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2023-04-03 12:44:17 +08:00 |
|
caoqianming
|
ec6c1c3d84
|
fix: rparty create时dept字段冲突
|
2023-04-03 12:44:13 +08:00 |
|
caoqianming
|
be530ca9b9
|
fix: am config修改
|
2023-04-02 10:18:24 +08:00 |
|
caoqianming
|
e32f82ace7
|
refector: send_mail_task优化
|
2023-03-31 23:16:40 +08:00 |
|
caoqianming
|
f2c02a76d4
|
refector: send_mail_task优化
|
2023-03-31 10:14:01 +08:00 |
|
caoqianming
|
876c7734f1
|
refector: 工单 bind_x 优化
|
2023-03-30 12:22:13 +08:00 |
|
caoqianming
|
a415859a26
|
fix: 许可证在工单撤回状态下可以编辑
|
2023-03-30 11:13:35 +08:00 |
|
caoqianming
|
201eabf33e
|
fix: filter_dept字段长度修改
|
2023-03-30 10:08:49 +08:00 |
|
caoqianming
|
ebcef8721f
|
fix: clock record view加入权限控制
|
2023-03-29 16:53:03 +08:00 |
|
caoqianming
|
0766cba363
|
Merge branch 'v2'
|
2023-03-29 16:36:03 +08:00 |
|
caoqianming
|
7908b06cd1
|
fix: opl monitor不用celery
|
2023-03-29 10:22:41 +08:00 |
|
caoqianming
|
9b0de2e011
|
refector: user is_active用is_deleted统一处理
|
2023-03-28 10:46:34 +08:00 |
|
caoqianming
|
6d1c9e03c9
|
refector: 短信发送备用渠道,未写
|
2023-03-28 09:51:30 +08:00 |
|
caoqianming
|
76ce412741
|
fix: close_rpj_by_leave_time 执行 rpj_m_leave
|
2023-03-27 13:03:50 +08:00 |
|
caoqianming
|
a046fa46f0
|
fix: 打卡记录导出bug2
|
2023-03-24 17:52:37 +08:00 |
|
caoqianming
|
e0210c4bef
|
fix: 打卡记录导出bug
|
2023-03-24 17:49:33 +08:00 |
|
caoqianming
|
1ed0a2542e
|
fix: 入厂后账户启用
|
2023-03-24 17:34:42 +08:00 |
|
caoqianming
|
49abd43cf3
|
fix: 该项目成员已做离厂操作
|
2023-03-24 16:39:21 +08:00 |
|
caoqianming
|
ce90e11c36
|
fix: idempotent 加入request_path
|
2023-03-24 16:38:51 +08:00 |
|
caoqianming
|
503953bb11
|
fix: 成员离厂有限制2
|
2023-03-24 16:23:56 +08:00 |
|
caoqianming
|
1966dde2c0
|
fix: 成员离厂有限制2
|
2023-03-24 16:20:50 +08:00 |
|
caoqianming
|
9d7739ae59
|
fix: 成员离厂有限制/大华启用才校验图片接口
|
2023-03-24 15:31:20 +08:00 |
|
caoqianming
|
068474f4e6
|
refector: rpjmember destory改回
|
2023-03-24 14:56:43 +08:00 |
|
caoqianming
|
e2a6b669ff
|
refector: rpj_member_leave 当前项目回写
|
2023-03-24 10:06:04 +08:00 |
|
caoqianming
|
ffb6ac2720
|
refector: hrm sync 加入dh enabled判断
|
2023-03-24 10:04:57 +08:00 |
|
caoqianming
|
7c08b2374f
|
fix: rpjlog缺少字段
|
2023-03-23 17:46:20 +08:00 |
|
caoqianming
|
a4c54c48e0
|
feat: rpj member 后入厂和提前离厂
|
2023-03-23 17:42:44 +08:00 |
|
caoqianming
|
1f8963514f
|
refector: 离职或退休可提供当前8h内的门禁时间
|
2023-03-23 17:15:56 +08:00 |
|
caoqianming
|
023dd12195
|
refector: 工单处理日志返回带签名图片
|
2023-03-23 13:48:58 +08:00 |
|
caoqianming
|
3c91e23cec
|
refector: 正式环境500才发邮件
|
2023-03-23 13:48:13 +08:00 |
|
caoqianming
|
8628d0a74b
|
fix: 事件通知只发给active的账号
|
2023-03-23 11:16:56 +08:00 |
|
caoqianming
|
b217f30c59
|
fix: >10h算加班
|
2023-03-23 11:16:02 +08:00 |
|
caoqianming
|
1606213cbc
|
refector: 打卡记录导出
|
2023-03-23 11:15:12 +08:00 |
|
caoqianming
|
e4aad35f06
|
feat: 算法布设可开启实时监控任务(循环抓拍)
|
2023-03-21 18:17:55 +08:00 |
|
caoqianming
|
74b8681a8a
|
fix: 更新入厂项目人员证书库按name 和 number 共同唯一
|
2023-03-17 17:54:50 +08:00 |
|
caoqianming
|
8b19556aff
|
feat: 相关方出入厂人员添加去除等功能-待完成
|
2023-03-17 17:42:45 +08:00 |
|
caoqianming
|
bb5e9925ea
|
feat: 增加幂等装饰器并用在create方法上
|
2023-03-17 16:24:09 +08:00 |
|
caoqianming
|
6a328a25c8
|
refector: 证书编号可以不唯一
|
2023-03-17 11:25:07 +08:00 |
|
caoqianming
|
f303801401
|
fix: rpj update 需要提供belong_dept和rparty
|
2023-03-17 09:28:54 +08:00 |
|
caoqianming
|
be254372c0
|
fix: cr导出只显示上下班的
|
2023-03-16 13:25:37 +08:00 |
|
caoqianming
|
4478bb7b99
|
refector: cswipe_next优化
|
2023-03-16 12:28:48 +08:00 |
|
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 |