 zty
|
169a31da5a
|
fix : apps/em /enm 更改缓存存储
|
2024-08-08 14:52:36 +08:00 |
|
zty
|
f97c99bf8a
|
fix: cal_mpointstat_hour对于is_unit的计算错误
|
2024-08-06 17:52:21 +08:00 |
|
zty
|
91e9ac38f6
|
fix: db_insert_mplogx_batch bug
|
2024-08-06 17:22:28 +08:00 |
|
zty
|
679165cbd0
|
feat: db_insert_mplogx 添加限制参数
|
2024-08-06 17:12:58 +08:00 |
|
zty
|
4d498f99a3
|
fix: enm/task 水泥批号插入
|
2024-08-06 16:11:27 +08:00 |
|
zty
|
50cdbf9428
|
fix :enm/task 修改数据库连接
|
2024-08-06 10:53:01 +08:00 |
|
zty
|
f09a8fe4cd
|
add : db_ins_mplogx 增加测点插入数据库
|
2024-08-06 10:01:21 +08:00 |
 caoqianming
|
fa56d61ffc
|
feat: 修改nowx使用aware
|
2024-08-02 16:39:07 +08:00 |
|
caoqianming
|
dc7e6f9d03
|
fix: get_total_sec_now及cal_exp_duration_sec 添加now参数
|
2024-08-02 13:50:05 +08:00 |
|
caoqianming
|
893781ec7f
|
feat: db_insert_mplogx不用thread
|
2024-07-30 10:01:42 +08:00 |
|
caoqianming
|
83ec822f9d
|
fix: db_insert_mplogx bug
|
2024-07-16 15:36:40 +08:00 |
|
caoqianming
|
d31cf4d143
|
feat: 从数据库转存到超表做count限制
|
2024-07-16 14:50:50 +08:00 |
|
caoqianming
|
bf98ea8a48
|
feat: 从数据库转存到超表
|
2024-07-16 14:06:46 +08:00 |
|
caoqianming
|
499e5732aa
|
fix: 更新所监测设备测点的total_production忽略必须指定设备
|
2024-06-24 10:02:54 +08:00 |
|
caoqianming
|
dd5b88e300
|
feat: 增加吨熟料电耗计算功能
|
2024-05-21 18:17:51 +08:00 |
|
caoqianming
|
cdfa35851d
|
feat: 算总煤耗时month_s以day_s相加
|
2024-05-21 11:34:23 +08:00 |
|
caoqianming
|
e81cfbe10d
|
fix: month_st 需提前返回
|
2024-05-16 14:18:12 +08:00 |
|
caoqianming
|
9e15b34ed7
|
fix: month_st 需提前返回
|
2024-05-16 13:15:13 +08:00 |
|
caoqianming
|
924c5d09b1
|
fix: 计算month_st时必须有sflog
|
2024-05-16 12:34:26 +08:00 |
|
caoqianming
|
f836def404
|
fix: mpoitstat correct 时除0错误
|
2024-05-16 11:34:06 +08:00 |
|
caoqianming
|
1574499874
|
fix: mpoitstat correct 时调用错误3
|
2024-05-16 11:27:27 +08:00 |
|
caoqianming
|
4d65407e39
|
fix: mpoitstat correct 时调用错误
|
2024-05-16 11:21:07 +08:00 |
|
caoqianming
|
413ac262af
|
feat: mpointstat 增加correct功能
|
2024-05-16 10:24:33 +08:00 |
|
caoqianming
|
ff4984831e
|
doc: 注释修改
|
2024-05-15 10:41:39 +08:00 |
|
caoqianming
|
b4b3d6eadc
|
feat: hour计数改为sec计数 步骤2
|
2024-05-15 10:31:17 +08:00 |
|
caoqianming
|
a3f5e48b8c
|
feat: hour计数改为sec计数
|
2024-05-15 10:06:49 +08:00 |
|
caoqianming
|
6ba99f119a
|
fix: 更新所监测设备测点的total_production筛选条件错误
|
2024-05-14 13:53:23 +08:00 |
|
caoqianming
|
41370ee971
|
fix: 更新所监测设备测点的total_production的除0问题2
|
2024-05-13 18:25:23 +08:00 |
|
caoqianming
|
c2933a795a
|
fix: 更新所监测设备测点的total_production的除0问题
|
2024-05-13 18:10:34 +08:00 |
|
caoqianming
|
a2ff2c0a2c
|
fix: 去除所有exception只保留zerodi
|
2024-05-13 16:37:39 +08:00 |
|
caoqianming
|
89d9ac84d8
|
fix: ['sum']时要注意none值
|
2024-05-13 16:30:15 +08:00 |
|
caoqianming
|
c68feb4c8b
|
fix: 更新所监测设备测点的total_production
|
2024-05-13 16:08:41 +08:00 |
|
caoqianming
|
829e0b59f3
|
fix: cal_mpointstat_manual sum 获取bug
|
2024-05-11 12:33:46 +08:00 |
|
caoqianming
|
978b939ea1
|
feat: cal_mpointstats指定测点的优化
|
2024-05-10 16:11:37 +08:00 |
|
caoqianming
|
20e9ac451a
|
fix: 标煤耗计算修改3
|
2024-05-10 15:51:13 +08:00 |
|
caoqianming
|
489d4bb6e5
|
fix: 标煤耗计算修改2
|
2024-05-10 15:45:58 +08:00 |
|
caoqianming
|
5b4742f181
|
fix: 标煤耗计算修改
|
2024-05-10 15:41:09 +08:00 |
|
caoqianming
|
0e273a35c6
|
fix: 一些调整
|
2024-05-10 13:52:34 +08:00 |
|
caoqianming
|
295a971000
|
fix: ZeroDivisionError 时要把属性值反设为0
|
2024-05-10 13:33:47 +08:00 |
|
caoqianming
|
7c087024c9
|
feat: cal_mpointstats可指定cal_attrs
|
2024-05-10 13:17:02 +08:00 |
|
caoqianming
|
4e4e923476
|
feat: cal_mpointstats支持传入指定测点集
|
2024-05-10 13:04:52 +08:00 |
|
caoqianming
|
43aa4c83a8
|
feat: 增加吨熟料发电量及计算
|
2024-05-10 11:17:05 +08:00 |
|
caoqianming
|
bc4bc5b132
|
fix: enm 班统计错误处理
|
2024-05-09 14:41:40 +08:00 |
|
caoqianming
|
186c7ebf7c
|
fix: 清零处理时的逻辑bug
|
2024-05-09 11:37:24 +08:00 |
|
caoqianming
|
d01f12aa3f
|
fix: production_hour 计算错误
|
2024-05-09 10:09:23 +08:00 |
|
caoqianming
|
972b460a9f
|
feat: cal_mpointstat增加cal_exp_duration_hour 的前置处理
|
2024-05-08 16:34:25 +08:00 |
|
caoqianming
|
757c3f4ad8
|
fix: get_total_hour_now_and_shut_hour查询条件用work_date替换
|
2024-05-08 15:58:08 +08:00 |
|
caoqianming
|
30974d90b0
|
feat: 移除mgroups_allocate字段
|
2024-05-08 12:09:21 +08:00 |
|
caoqianming
|
02a8693a65
|
fix: cal_enstat前调用一下get_total_hour_now
|
2024-05-07 09:58:32 +08:00 |
|
caoqianming
|
35d6d7beb9
|
feat: 监控测点掉线函数优化
|
2024-05-06 18:33:16 +08:00 |
|
caoqianming
|
d73cc1af5b
|
feat: 料耗系数可用于测点
|
2024-05-06 16:14:35 +08:00 |
|
caoqianming
|
6cd255173f
|
refector: 改mpoint的处理逻辑添加mpoint_affect支持并重构部分代码
|
2024-05-06 00:06:08 +08:00 |
|
caoqianming
|
2263c0decb
|
fix: 如果结束时间为0点则取开始时间来返回年月日2
|
2024-04-30 19:00:19 +08:00 |
|
caoqianming
|
69db9db180
|
fix: 全厂电量计算enstat2.elec_consume拿不到默认0,3
|
2024-04-30 18:01:15 +08:00 |
|
caoqianming
|
a7d03321d8
|
fix: 全厂电量计算enstat2.elec_consume拿不到默认0,2
|
2024-04-30 17:49:53 +08:00 |
|
caoqianming
|
94c34480ec
|
fix: 全厂电量计算enstat2.elec_consume拿不到默认0
|
2024-04-30 17:39:57 +08:00 |
|
caoqianming
|
59c000670a
|
fix: 全厂电量计算bug
|
2024-04-30 16:53:06 +08:00 |
|
caoqianming
|
cb766247b0
|
fix: water_consume
|
2024-04-30 16:23:57 +08:00 |
|
caoqianming
|
5f20247818
|
feat: 添加一个log排查逻辑错误
|
2024-04-30 14:21:09 +08:00 |
|
caoqianming
|
dddab37c63
|
fix: get_sflog 取的时候与happen_time对比错误
|
2024-04-30 12:59:38 +08:00 |
|
caoqianming
|
90ed2927e6
|
feat: cal_mpointstat_hour 添加一个日志
|
2024-04-30 12:39:43 +08:00 |
|
caoqianming
|
9c9164b176
|
fix: translate_eval_formula 执行时不try
|
2024-04-29 21:28:29 +08:00 |
|
caoqianming
|
2e4f6f0445
|
fix: translate_eval_formula bug
|
2024-04-29 16:52:01 +08:00 |
|
caoqianming
|
48c6ad53b9
|
fix: 计算统计测点的时候按顺序计算
|
2024-04-29 16:15:11 +08:00 |
|
caoqianming
|
3fcb015fdd
|
feat: 添加多个函数来监测测点、设备、工段的运行或离线状态
|
2024-04-29 14:45:11 +08:00 |
|
caoqianming
|
a26656109c
|
feat: 优化mpointstat计算点选择
|
2024-04-29 12:53:55 +08:00 |
|
caoqianming
|
c179d91ebd
|
feat: 采集逻辑优化
|
2024-04-28 09:34:33 +08:00 |
|
caoqianming
|
9805b471d4
|
feat: 添加料耗系数
|
2024-04-26 15:24:42 +08:00 |
|
caoqianming
|
14bcf0833f
|
feat: 通过restful获取测点值
|
2024-04-24 17:57:31 +08:00 |
|
caoqianming
|
f3c5698283
|
feat: 优化cal_mpointstat_hour支持float int
|
2024-04-24 15:00:08 +08:00 |
|
caoqianming
|
a8fb69d747
|
fix: 去除mpoint无用字段及相应逻辑变动
|
2024-04-18 15:01:18 +08:00 |
|
caoqianming
|
17953a42aa
|
style: 代码格式化
|
2024-04-18 13:46:58 +08:00 |
|
caoqianming
|
16417e0016
|
feat: 优化亚控测点批量存库及相应enm逻辑更改
|
2024-04-11 11:08:32 +08:00 |
|
caoqianming
|
2030812c18
|
fix: 能管的工段异常修改
|
2023-11-22 16:07:00 +08:00 |
|
caoqianming
|
f3b43ab0ce
|
fix: mgroup 增加need_enm字段
|
2023-10-13 13:13:31 +08:00 |
|
caoqianming
|
7f1f3df956
|
feat: 煤粉热值系数修改
|
2023-10-09 16:52:16 +08:00 |
|
caoqianming
|
611aa28eee
|
style: 格式调整
|
2023-09-27 09:54:15 +08:00 |
|
caoqianming
|
fd6b5b5db7
|
feat: 完善enm_alarm保存的enm_data信息
|
2023-09-07 10:28:17 +08:00 |
|
caoqianming
|
95380fa826
|
fix: enm_alarm bug
|
2023-09-06 22:40:42 +08:00 |
|
caoqianming
|
5835e2f6a0
|
feat: enm_alarm任务函数
|
2023-09-06 08:43:31 +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
|
ed936082c7
|
feat: mpoint增加func_on_change以完成开停机处理需求
|
2023-08-30 15:19:28 +08:00 |
|
caoqianming
|
c0dd70982a
|
feat: enm增加重跑某一段时间的任务
|
2023-08-28 09:18:32 +08:00 |
|
caoqianming
|
7bfea08a7d
|
feat: mpointstat增加elec_consume_unit及相应逻辑
|
2023-08-25 17:01:22 +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
|
b31d3937f8
|
feat: enstat2 增加水耗和压缩空气统计
|
2023-08-21 09:18:58 +08:00 |
|
caoqianming
|
2c8a86d6f5
|
fix: if hour改为if hour is not None
|
2023-08-15 15:49:35 +08:00 |
|
caoqianming
|
cdc53fd14f
|
fix: month_st计算bug
|
2023-08-09 15:07:25 +08:00 |
|
caoqianming
|
2f42d8386e
|
feat: eval_formula测试通过
|
2023-08-04 16:57:12 +08:00 |
|
caoqianming
|
50a34a44bb
|
feat: 只更新必要的字段
|
2023-08-04 14:29:23 +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 |