factory

Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

3.1.2026033008

3.1.2026042912

bd33a33ed6 fix: get_pcoal_heat 逻辑严谨 caoqianming 2024-05-16 17:18:17 +0800
a90396099b fix: 更新煤粉热值触发计算的bug3 caoqianming 2024-05-16 16:57:00 +0800
9a1074caf8 fix: 更新煤粉热值触发计算的bug caoqianming 2024-05-16 16:48:42 +0800
5093eb7b29 feat: 更新煤粉热值触发计算的bug caoqianming 2024-05-16 16:26:33 +0800
e81cfbe10d fix: month_st 需提前返回 caoqianming 2024-05-16 14:18:12 +0800
9e15b34ed7 fix: month_st 需提前返回 caoqianming 2024-05-16 13:15:13 +0800
924c5d09b1 fix: 计算month_st时必须有sflog caoqianming 2024-05-16 12:34:26 +0800
f836def404 fix: mpoitstat correct 时除0错误 caoqianming 2024-05-16 11:34:06 +0800
f10cf8d67d fix: mpoitstat correct 时save 出错 caoqianming 2024-05-16 11:29:57 +0800
1574499874 fix: mpoitstat correct 时调用错误3 caoqianming 2024-05-16 11:27:27 +0800
ee77a60d32 fix: mpoitstat correct 时调用错误2 caoqianming 2024-05-16 11:21:20 +0800
4d65407e39 fix: mpoitstat correct 时调用错误 caoqianming 2024-05-16 11:21:07 +0800
6bb6a2d2d7 fix: mpointstat correct功能传参错误 caoqianming 2024-05-16 10:50:15 +0800
413ac262af feat: mpointstat 增加correct功能 caoqianming 2024-05-16 10:24:33 +0800
e1172c2fcf feat: SfLogExp添加约束及cal_exp_duration_sec优化 caoqianming 2024-05-15 12:59:12 +0800
5a07b6f889 fix: set_eq_rs 逻辑缺陷2 caoqianming 2024-05-15 11:18:02 +0800
ff05151ce2 fix: set_eq_rs 逻辑缺陷 caoqianming 2024-05-15 11:04:47 +0800
ff4984831e doc: 注释修改 caoqianming 2024-05-15 10:41:39 +0800
3d6adedb8c feat: hour计数改为sec计数步骤3移除字段 caoqianming 2024-05-15 10:40:46 +0800
b4b3d6eadc feat: hour计数改为sec计数步骤2 caoqianming 2024-05-15 10:31:17 +0800
8753994468 fix: hour计数改为sec计数 make_sflogs 的bug caoqianming 2024-05-15 10:14:57 +0800
a3f5e48b8c feat: hour计数改为sec计数 caoqianming 2024-05-15 10:06:49 +0800
e6fb2c8c72 feat: base 增加is_close函数 caoqianming 2024-05-15 08:30:10 +0800
5aee3282aa fix: set_eq_rs 优先ep_monitored_id caoqianming 2024-05-14 15:45:42 +0800
6ba99f119a fix: 更新所监测设备测点的total_production筛选条件错误 caoqianming 2024-05-14 13:53:23 +0800
7f1dbda3b0 feat: mpointstat增加查询条件 caoqianming 2024-05-14 13:26:11 +0800
3fc8e17266 feat: stlog添加约束 caoqianming 2024-05-13 23:06:47 +0800
da444f720d fix: 设备运行状态set_eq_rs先belong后mointored 2 caoqianming 2024-05-13 22:33:14 +0800
c434e94205 fix: 设备运行状态set_eq_rs先belong后mointored caoqianming 2024-05-13 22:19:27 +0800
41370ee971 fix: 更新所监测设备测点的total_production的除0问题2 caoqianming 2024-05-13 18:25:23 +0800
c2933a795a fix: 更新所监测设备测点的total_production的除0问题 caoqianming 2024-05-13 18:10:34 +0800
a2ff2c0a2c fix: 去除所有exception只保留zerodi caoqianming 2024-05-13 16:37:39 +0800
89d9ac84d8 fix: ['sum']时要注意none值 caoqianming 2024-05-13 16:30:15 +0800
c68feb4c8b fix: 更新所监测设备测点的total_production caoqianming 2024-05-13 16:08:41 +0800
52d9407346 feat: 班次表增加排序 caoqianming 2024-05-13 09:39:15 +0800
9fe86eeb63 feat: envdata create时忽略IntegrityError caoqianming 2024-05-11 16:35:52 +0800
77434b0ec8 feat: envdata create时忽略IntegrityError caoqianming 2024-05-11 16:34:02 +0800
2647992b42 feat: envdata增加氨逃逸字段 caoqianming 2024-05-11 15:40:50 +0800
829e0b59f3 fix: cal_mpointstat_manual sum 获取bug caoqianming 2024-05-11 12:33:46 +0800
2c6d586d85 fix: 测点更新设备状态修复 caoqianming 2024-05-11 11:23:24 +0800
99ef705529 fix: insert_mplogx_from_king_rest_chunk envdata save caoqianming 2024-05-11 11:01:32 +0800
f6f342e552 feat: mpointview增加查询条件 caoqianming 2024-05-11 10:18:27 +0800
69e75cc1d7 feat: mpointstat手动录入在create时校验唯一 caoqianming 2024-05-10 16:38:42 +0800
d5b5014bf9 fix: cal_mpointstat_manual传参错误 caoqianming 2024-05-10 16:25:01 +0800
978b939ea1 feat: cal_mpointstats指定测点的优化 caoqianming 2024-05-10 16:11:37 +0800
20e9ac451a fix: 标煤耗计算修改3 caoqianming 2024-05-10 15:51:13 +0800
489d4bb6e5 fix: 标煤耗计算修改2 caoqianming 2024-05-10 15:45:58 +0800
5b4742f181 fix: 标煤耗计算修改 caoqianming 2024-05-10 15:41:09 +0800
0e273a35c6 fix: 一些调整 caoqianming 2024-05-10 13:52:34 +0800
295a971000 fix: ZeroDivisionError 时要把属性值反设为0 caoqianming 2024-05-10 13:33:47 +0800
7c087024c9 feat: cal_mpointstats可指定cal_attrs caoqianming 2024-05-10 13:17:02 +0800
4e4e923476 feat: cal_mpointstats支持传入指定测点集 caoqianming 2024-05-10 13:04:52 +0800
10024f0d05 feat: 增加吨熟料发电量及计算 caoqianming 2024-05-10 11:17:15 +0800
43aa4c83a8 feat: 增加吨熟料发电量及计算 caoqianming 2024-05-10 11:17:05 +0800
ebccaa2a50 feat: customlist替代listmixin caoqianming 2024-05-10 09:13:08 +0800
ac524778e3 feat: base 使用custommodelmixin替代listmodelmixin以定制返回数据 caoqianming 2024-05-10 09:11:33 +0800
a9b2d67302 feat: mpointview增加查询条件 caoqianming 2024-05-10 08:52:12 +0800
72e8129619 feat: mpointstat增加查询条件 caoqianming 2024-05-09 15:22:11 +0800
bc4bc5b132 fix: enm 班统计错误处理 caoqianming 2024-05-09 14:41:40 +0800
186c7ebf7c fix: 清零处理时的逻辑bug caoqianming 2024-05-09 11:37:24 +0800
d01f12aa3f fix: production_hour 计算错误 caoqianming 2024-05-09 10:09:23 +0800
972b460a9f feat: cal_mpointstat增加cal_exp_duration_hour 的前置处理 caoqianming 2024-05-08 16:34:25 +0800
2e67f7c468 fix: cal_exp_duration_hour 默认一个参数值 caoqianming 2024-05-08 16:32:00 +0800
b22058d0bb feat: cal_exp_duration_hour 添加参数以做测试 caoqianming 2024-05-08 16:07:03 +0800
035b9b392a fix: get_pcoal_heat 时以work_date为准 caoqianming 2024-05-08 16:06:08 +0800
757c3f4ad8 fix: get_total_hour_now_and_shut_hour查询条件用work_date替换 caoqianming 2024-05-08 15:58:08 +0800
30974d90b0 feat: 移除mgroups_allocate字段 caoqianming 2024-05-08 12:09:21 +0800
895b8c1810 fix: mpointcache set时更新设备状态的优化 caoqianming 2024-05-08 09:11:42 +0800
8321a3272e refector: 去除set_eq_rs打的日志 caoqianming 2024-05-07 18:21:03 +0800
451e1e7eae feat: 先打一个日志看看啥情况 caoqianming 2024-05-07 18:08:28 +0800
1cb9b3495a feat: mpoitstatserializer增加mpoint_nickname返回 caoqianming 2024-05-07 13:50:13 +0800
ec9260f353 feat: mpointstat增加排序条件 caoqianming 2024-05-07 13:37:10 +0800
03e073e00a feat: mpointstat增加查询条件 caoqianming 2024-05-07 13:19:59 +0800
25965c7072 fix: transfer_mpoint_val_to_ep_running_state 对expr_str的replace caoqianming 2024-05-07 13:07:52 +0800
52fc0c6bd3 fix: translate_eval_formula enm_lhxs的处理 caoqianming 2024-05-07 11:09:19 +0800
ce38c3e338 fix: get_total_hour_now exclude 错误 caoqianming 2024-05-07 10:16:22 +0800
6ee42a6993 fix: get_total_hour_now默认参数为空 caoqianming 2024-05-07 10:00:24 +0800
02a8693a65 fix: cal_enstat前调用一下get_total_hour_now caoqianming 2024-05-07 09:58:32 +0800
35d6d7beb9 feat: 监控测点掉线函数优化 caoqianming 2024-05-06 18:33:16 +0800
cb1576b797 fix: 尝试修改信号量计算测点 caoqianming 2024-05-06 18:13:32 +0800
d73cc1af5b feat: 料耗系数可用于测点 caoqianming 2024-05-06 16:14:35 +0800
6ae849150f fix: cache_key mpoint保留 caoqianming 2024-05-06 00:10:47 +0800
6cd255173f refector: 改mpoint的处理逻辑添加mpoint_affect支持并重构部分代码 caoqianming 2024-05-06 00:06:08 +0800
a46cfe59ed feat: 添加mpoint_affect字段 caoqianming 2024-05-06 00:05:24 +0800
a1999fb53d fix: 上个改动没有必要现在回退 caoqianming 2024-05-02 00:33:57 +0800
ca15092c5c feat: shutdown_or_startup 如果不是工段不用关心其开停 caoqianming 2024-05-02 00:25:37 +0800
634884f336 doc: 增加注释 caoqianming 2024-05-02 00:02:41 +0800
6ea5e0b5d7 fix: make_sflogs当天班生成缺少的bug caoqianming 2024-05-02 00:01:47 +0800
2263c0decb fix: 如果结束时间为0点则取开始时间来返回年月日2 caoqianming 2024-04-30 19:00:19 +0800
a6914413f7 fix: 如果结束时间为0点则取开始时间来返回年月日 caoqianming 2024-04-30 18:20:31 +0800
69db9db180 fix: 全厂电量计算enstat2.elec_consume拿不到默认0,3 caoqianming 2024-04-30 18:01:15 +0800
a7d03321d8 fix: 全厂电量计算enstat2.elec_consume拿不到默认0,2 caoqianming 2024-04-30 17:49:53 +0800
94c34480ec fix: 全厂电量计算enstat2.elec_consume拿不到默认0 caoqianming 2024-04-30 17:39:57 +0800
59c000670a fix: 全厂电量计算bug caoqianming 2024-04-30 16:53:06 +0800
cb766247b0 fix: water_consume caoqianming 2024-04-30 16:23:57 +0800
5f20247818 feat: 添加一个log排查逻辑错误 caoqianming 2024-04-30 14:21:09 +0800
dddab37c63 fix: get_sflog 取的时候与happen_time对比错误 caoqianming 2024-04-30 12:59:38 +0800
90ed2927e6 feat: cal_mpointstat_hour 添加一个日志 caoqianming 2024-04-30 12:39:43 +0800
1e8e4c6f70 refector: formular无需用$符号 caoqianming 2024-04-30 11:01:56 +0800
5f67673c45 feat: base 完整的task on_failure日志记录和邮件推送 caoqianming 2024-04-29 21:46:49 +0800