 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
|
f10cf8d67d
|
fix: mpoitstat correct 时save 出错
|
2024-05-16 11:29:57 +08:00 |
|
caoqianming
|
1574499874
|
fix: mpoitstat correct 时调用错误3
|
2024-05-16 11:27:27 +08:00 |
|
caoqianming
|
ee77a60d32
|
fix: mpoitstat correct 时调用错误2
|
2024-05-16 11:21:20 +08:00 |
|
caoqianming
|
4d65407e39
|
fix: mpoitstat correct 时调用错误
|
2024-05-16 11:21:07 +08:00 |
|
caoqianming
|
6bb6a2d2d7
|
fix: mpointstat correct功能传参错误
|
2024-05-16 10:50:15 +08:00 |
|
caoqianming
|
413ac262af
|
feat: mpointstat 增加correct功能
|
2024-05-16 10:24:33 +08:00 |
|
caoqianming
|
5a07b6f889
|
fix: set_eq_rs 逻辑缺陷2
|
2024-05-15 11:18:02 +08:00 |
|
caoqianming
|
ff05151ce2
|
fix: set_eq_rs 逻辑缺陷
|
2024-05-15 11:04:47 +08:00 |
|
caoqianming
|
ff4984831e
|
doc: 注释修改
|
2024-05-15 10:41:39 +08:00 |
|
caoqianming
|
3d6adedb8c
|
feat: hour计数改为sec计数 步骤3移除字段
|
2024-05-15 10:40:46 +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
|
5aee3282aa
|
fix: set_eq_rs 优先ep_monitored_id
|
2024-05-14 15:45:42 +08:00 |
|
caoqianming
|
6ba99f119a
|
fix: 更新所监测设备测点的total_production筛选条件错误
|
2024-05-14 13:53:23 +08:00 |
|
caoqianming
|
7f1dbda3b0
|
feat: mpointstat增加查询条件
|
2024-05-14 13:26:11 +08:00 |
|
caoqianming
|
da444f720d
|
fix: 设备运行状态set_eq_rs先belong后mointored 2
|
2024-05-13 22:33:14 +08:00 |
|
caoqianming
|
c434e94205
|
fix: 设备运行状态set_eq_rs先belong后mointored
|
2024-05-13 22:19:27 +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
|
9fe86eeb63
|
feat: envdata create时忽略IntegrityError
|
2024-05-11 16:35:52 +08:00 |
|
caoqianming
|
77434b0ec8
|
feat: envdata create时忽略IntegrityError
|
2024-05-11 16:34:02 +08:00 |
|
caoqianming
|
829e0b59f3
|
fix: cal_mpointstat_manual sum 获取bug
|
2024-05-11 12:33:46 +08:00 |
|
caoqianming
|
2c6d586d85
|
fix: 测点更新设备状态修复
|
2024-05-11 11:23:24 +08:00 |
|
caoqianming
|
99ef705529
|
fix: insert_mplogx_from_king_rest_chunk envdata save
|
2024-05-11 11:01:32 +08:00 |
|
caoqianming
|
f6f342e552
|
feat: mpointview增加查询条件
|
2024-05-11 10:18:27 +08:00 |
|
caoqianming
|
69e75cc1d7
|
feat: mpointstat手动录入在create时校验唯一
|
2024-05-10 16:38:42 +08:00 |
|
caoqianming
|
d5b5014bf9
|
fix: cal_mpointstat_manual传参错误
|
2024-05-10 16:25:01 +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
|
10024f0d05
|
feat: 增加吨熟料发电量及计算
|
2024-05-10 11:17:15 +08:00 |
|
caoqianming
|
43aa4c83a8
|
feat: 增加吨熟料发电量及计算
|
2024-05-10 11:17:05 +08:00 |
|
caoqianming
|
ebccaa2a50
|
feat: customlist替代listmixin
|
2024-05-10 09:13:08 +08:00 |
|
caoqianming
|
a9b2d67302
|
feat: mpointview增加查询条件
|
2024-05-10 08:52:12 +08:00 |
|
caoqianming
|
72e8129619
|
feat: mpointstat增加查询条件
|
2024-05-09 15:22:11 +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
|
895b8c1810
|
fix: mpointcache set时更新设备状态的优化
|
2024-05-08 09:11:42 +08:00 |
|
caoqianming
|
1cb9b3495a
|
feat: mpoitstatserializer增加mpoint_nickname返回
|
2024-05-07 13:50:13 +08:00 |
|
caoqianming
|
ec9260f353
|
feat: mpointstat增加排序条件
|
2024-05-07 13:37:10 +08:00 |
|
caoqianming
|
03e073e00a
|
feat: mpointstat增加查询条件
|
2024-05-07 13:19:59 +08:00 |
|
caoqianming
|
25965c7072
|
fix: transfer_mpoint_val_to_ep_running_state 对expr_str的replace
|
2024-05-07 13:07:52 +08:00 |
|
caoqianming
|
52fc0c6bd3
|
fix: translate_eval_formula enm_lhxs的处理
|
2024-05-07 11:09:19 +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
|
cb1576b797
|
fix: 尝试修改信号量计算测点
|
2024-05-06 18:13:32 +08:00 |
|
caoqianming
|
d73cc1af5b
|
feat: 料耗系数可用于测点
|
2024-05-06 16:14:35 +08:00 |
|
caoqianming
|
6ae849150f
|
fix: cache_key mpoint保留
|
2024-05-06 00:10:47 +08:00 |
|
caoqianming
|
6cd255173f
|
refector: 改mpoint的处理逻辑添加mpoint_affect支持并重构部分代码
|
2024-05-06 00:06:08 +08:00 |
|
caoqianming
|
a46cfe59ed
|
feat: 添加mpoint_affect字段
|
2024-05-06 00:05:24 +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
|
1e8e4c6f70
|
refector: formular无需用$符号
|
2024-04-30 11:01:56 +08:00 |
|
caoqianming
|
3a0d229ec0
|
feat: mpoint view增加查询条件
|
2024-04-29 21:31:28 +08:00 |
|
caoqianming
|
9c9164b176
|
fix: translate_eval_formula 执行时不try
|
2024-04-29 21:28:29 +08:00 |
|
caoqianming
|
836c2a2baf
|
fix: translate_eval_formula bug2
|
2024-04-29 17:29:04 +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
|
61e84bd302
|
feat: mpoint增加查询条件need_display
|
2024-04-28 17:52:12 +08:00 |
|
caoqianming
|
5b1575bca0
|
fix: update_mpoint_cache 更新设备信号的bug
|
2024-04-28 15:25:08 +08:00 |
|
caoqianming
|
85fce01834
|
fix: shutdown_or_startup 启动
|
2024-04-28 14:56:27 +08:00 |
|
caoqianming
|
b803cac69f
|
fix: 测点orderingbug
|
2024-04-28 10:10:49 +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
|
070ccd72f4
|
fix: insert_mplogx_item忽略唯一性插入错误
|
2024-04-26 10:31:55 +08:00 |
|
caoqianming
|
00e3129751
|
feat: 设备运行状态的缓存优化
|
2024-04-25 15:12:39 +08:00 |
|
caoqianming
|
53b1ceafa0
|
feat: ctask_run delay执行及相应优化
|
2024-04-24 23:54:35 +08:00 |
|
caoqianming
|
c834f996f5
|
fix: 获取val_mrs错误
|
2024-04-24 18:32:30 +08:00 |
|
caoqianming
|
4ff503f1b0
|
fix: update_mpoint_cache state变动或超时更新设备运行状态2
|
2024-04-24 18:20:39 +08:00 |
|
caoqianming
|
ecb95da787
|
fix: update_mpoint_cache state变动或超时更新设备运行状态
|
2024-04-24 18:13:21 +08:00 |
|
caoqianming
|
4c3fa8acac
|
fix: update_mpoint_cache 更新错误
|
2024-04-24 18:07:45 +08:00 |
|
caoqianming
|
14bcf0833f
|
feat: 通过restful获取测点值
|
2024-04-24 17:57:31 +08:00 |
|
caoqianming
|
53ce0ea0f7
|
feat: runningstate统一修改
|
2024-04-24 16:23:13 +08:00 |
|
caoqianming
|
f3c5698283
|
feat: 优化cal_mpointstat_hour支持float int
|
2024-04-24 15:00:08 +08:00 |
|
caoqianming
|
86053bed93
|
feat: mpoint增加是否可手动录入的字段
|
2024-04-24 14:59:37 +08:00 |
|
caoqianming
|
c1d55ce618
|
fix: rename mplogx to val_mrs
|
2024-04-23 16:28:26 +08:00 |
|
caoqianming
|
339fc639e8
|
fix: king insert mplogx 参数1获取
|
2024-04-23 16:18:50 +08:00 |
|
caoqianming
|
1a80031d6e
|
fix: 亚控请求修改2
|
2024-04-23 15:03:35 +08:00 |
|
caoqianming
|
aecec48002
|
fix: mpoint_last_timex 处理的优化
|
2024-04-22 15:30:42 +08:00 |
|
caoqianming
|
45fda773ab
|
fix: mqtt插入数据时需校验enabled
|
2024-04-22 15:23:24 +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
|
ff035096e5
|
feat: update mplogx表结构
|
2024-04-16 15:11:40 +08:00 |
|
caoqianming
|
dfaed5e5e5
|
feat: 采集逻辑整体重构
|
2024-04-16 15:03:59 +08:00 |
|
caoqianming
|
10632d9cae
|
fix: 启动时无需缓存测点
|
2024-04-16 15:02:53 +08:00 |
|
caoqianming
|
74cbaa8497
|
refector: 修改函数名
|
2024-04-11 15:01:23 +08:00 |
|
caoqianming
|
16417e0016
|
feat: 优化亚控测点批量存库及相应enm逻辑更改
|
2024-04-11 11:08:32 +08:00 |
|
caoqianming
|
0fdb230822
|
feat: mplog视图层转mplogx
|
2024-04-11 10:58:33 +08:00 |
|
caoqianming
|
813301e7e1
|
feat: 变更mpoint字段
|
2024-04-11 10:52:13 +08:00 |
|
caoqianming
|
23eac91491
|
feat: enm启动时缓存测点
|
2024-04-11 10:47:06 +08:00 |
|
caoqianming
|
93022f7c40
|
feat: king_sync以d做name
|
2024-04-07 18:34:47 +08:00 |
|
caoqianming
|
bec6644138
|
feat: enm mpoint增加third_info字段
|
2024-04-02 12:07:53 +08:00 |
|
caoqianming
|
2d8f546104
|
fix: cache_mpoints 标注错误
|
2024-04-02 11:40:46 +08:00 |
|
caoqianming
|
a104191341
|
feat: 从kioserver中获取数据
|
2024-04-02 10:18:42 +08:00 |
|
caoqianming
|
356ef262de
|
feat: mpoint增加interval字段
|
2024-03-22 18:22:06 +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
|
f719702432
|
fix: shutdown_or_startup 优化
|
2023-09-04 15:36:16 +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
|
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
|
64c2d86cd7
|
feat: enstat2增加查询条件
|
2023-08-31 14:14:00 +08:00 |
|
caoqianming
|
ed936082c7
|
feat: mpoint增加func_on_change以完成开停机处理需求
|
2023-08-30 15:19:28 +08:00 |
|
caoqianming
|
c9fc726139
|
fix: recal bug修复
|
2023-08-28 10:22:20 +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
|
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
|
6e1ab8a967
|
feat: enstat2 返回时保留2位小数
|
2023-08-24 10:28:07 +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
|
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 |