 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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
67d04a9a41
|
feat: 可以不用间隔运行get_total_hour_now
|
2023-08-02 17:25:07 +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
|
5402f2181c
|
feat: 增加enstat 统计数据，优化task执行
|
2023-08-02 10:22:29 +08:00 |
|
caoqianming
|
8e3802966e
|
feat: enstat参数计算并新建enstat2表
|
2023-07-28 17:36:44 +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
|
b634bac616
|
feat: sflog获取年月日优化
|
2023-07-25 11:23:36 +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
|
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
|
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
|
9498e5eb22
|
feat: 测点统计记录支持手动创建
|
2023-07-06 17:03:28 +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
|
3b427cce59
|
feat: 测点统计表及相关逻辑cal_val修改
|
2023-06-30 10:21:34 +08:00 |
|
caoqianming
|
783869638f
|
fix: mpoint添加时mgroup必填
|
2023-06-27 16:08:45 +08:00 |
|
caoqianming
|
06c896c97f
|
fix: perms_map 修改
|
2023-06-26 17:17:37 +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
|
1d16949d8a
|
feat: 增加wpm,qm,mtm三个app
|
2023-06-20 17:05:50 +08:00 |
|
caoqianming
|
d2392a3c74
|
feat: 完善enm task相关功能
|
2023-06-15 16:57:29 +08:00 |
|
caoqianming
|
21a1cc4e63
|
fix: 修改enm swagger read_only的展示
|
2023-06-15 08:37:14 +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
|
cf4654a532
|
feat: 添加enm相关内容
|
2023-06-09 09:42:46 +08:00 |
|
caoqianming
|
9d9e670240
|
feat: enm models初步设计
|
2023-06-07 13:48:00 +08:00 |
|
caoqianming
|
46b0638bfb
|
feat: 添加enm app
|
2023-06-02 17:50:41 +08:00 |