Commit Graph

1967 Commits

Author SHA1 Message Date
caoqianming 458385c0f6 feat: material增加count_mb字段 2024-05-28 14:29:20 +08:00
caoqianming 2ac4f5b04f refector: get_analyse_data_mgroups_duration 增加run_hour返回 2024-05-22 17:11:46 +08:00
caoqianming 8627d5f9dc feat: 增加工段数据按任意时间范围分析 2024-05-22 17:04:51 +08:00
caoqianming bf5df19a59 feat: mlog添加两个不合格项目 2024-05-22 14:53:46 +08:00
caoqianming 7819aa5b5e feat: stlog的sflog的cascad改一下 2024-05-21 18:18:13 +08:00
caoqianming dd5b88e300 feat: 增加吨熟料电耗计算功能 2024-05-21 18:17:51 +08:00
caoqianming 138d202a28 fix: 监测工段是否运行的bug2去除多余逻辑 2024-05-21 17:59:11 +08:00
caoqianming 34386ae26d fix: 监测工段是否运行的bug去除多余逻辑 2024-05-21 17:47:18 +08:00
caoqianming 5e8bdcf1a8 fix: 监测工段是否运行的bug 2024-05-21 17:44:03 +08:00
caoqianming f66cd0f277 feat: base 优化邮件报错频率过高自动屏蔽else未处理 2024-05-21 15:07:13 +08:00
caoqianming a7d7a312f8 feat: base 优化邮件报错频率过高自动屏蔽 2024-05-21 15:00:13 +08:00
caoqianming e8ced88547 feat: 邮件报错频率过高自动屏蔽2 2024-05-21 14:48:28 +08:00
caoqianming 5e905519bf feat: 邮件报错频率过高自动屏蔽 2024-05-21 14:46:06 +08:00
caoqianming 2ed77b9f0f feat: base task_error携带self.name 2024-05-21 13:49:38 +08:00
caoqianming cdfa35851d feat: 算总煤耗时month_s以day_s相加 2024-05-21 11:34:23 +08:00
caoqianming 617013f299 fix: sflog展示run_hour 2024-05-17 09:16:45 +08:00
caoqianming 32c1647b9b feat: sflog展示run_hour 2024-05-17 09:13:10 +08:00
caoqianming bd33a33ed6 fix: get_pcoal_heat 逻辑严谨 2024-05-16 17:18:17 +08:00
caoqianming a90396099b fix: 更新煤粉热值触发计算的bug3 2024-05-16 16:57:00 +08:00
caoqianming 9a1074caf8 fix: 更新煤粉热值触发计算的bug 2024-05-16 16:48:42 +08:00
caoqianming 5093eb7b29 feat: 更新煤粉热值触发计算的bug 2024-05-16 16:26:33 +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 e1172c2fcf feat: SfLogExp添加约束及cal_exp_duration_sec优化 2024-05-15 12:59:12 +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 8753994468 fix: hour计数改为sec计数 make_sflogs 的bug 2024-05-15 10:14:57 +08:00
caoqianming a3f5e48b8c feat: hour计数改为sec计数 2024-05-15 10:06:49 +08:00
caoqianming e6fb2c8c72 feat: base 增加is_close函数 2024-05-15 08:30:10 +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 3fc8e17266 feat: stlog添加约束 2024-05-13 23:06:47 +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 52d9407346 feat: 班次表增加排序 2024-05-13 09:39:15 +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 2647992b42 feat: envdata增加氨逃逸字段 2024-05-11 15:40:50 +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 ac524778e3 feat: base 使用custommodelmixin替代listmodelmixin以定制返回数据 2024-05-10 09:11:33 +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 2e67f7c468 fix: cal_exp_duration_hour 默认一个参数值 2024-05-08 16:32:00 +08:00
caoqianming b22058d0bb feat: cal_exp_duration_hour 添加参数以做测试 2024-05-08 16:07:03 +08:00
caoqianming 035b9b392a fix: get_pcoal_heat 时以work_date为准 2024-05-08 16:06:08 +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 8321a3272e refector: 去除set_eq_rs打的日志 2024-05-07 18:21:03 +08:00
caoqianming 451e1e7eae feat: 先打一个日志看看啥情况 2024-05-07 18:08:28 +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 ce38c3e338 fix: get_total_hour_now exclude 错误 2024-05-07 10:16:22 +08:00
caoqianming 6ee42a6993 fix: get_total_hour_now默认参数为空 2024-05-07 10:00:24 +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 a1999fb53d fix: 上个改动没有必要现在回退 2024-05-02 00:33:57 +08:00
caoqianming ca15092c5c feat: shutdown_or_startup 如果不是工段不用关心其开停 2024-05-02 00:25:37 +08:00
caoqianming 634884f336 doc: 增加注释 2024-05-02 00:02:41 +08:00
caoqianming 6ea5e0b5d7 fix: make_sflogs当天班生成缺少的bug 2024-05-02 00:01:47 +08:00
caoqianming 2263c0decb fix: 如果结束时间为0点则取开始时间来返回年月日2 2024-04-30 19:00:19 +08:00
caoqianming a6914413f7 fix: 如果结束时间为0点则取开始时间来返回年月日 2024-04-30 18:20:31 +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 5f67673c45 feat: base 完整的task on_failure日志记录和邮件推送 2024-04-29 21:46:49 +08:00
caoqianming 513d37e9ac feat: base 完整的task on_failure日志记录和邮件推送 2024-04-29 21:45:35 +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 408bb37b67 fix: is_runing字段错误 2024-04-29 14:43:45 +08:00
caoqianming a26656109c feat: 优化mpointstat计算点选择 2024-04-29 12:53:55 +08:00
caoqianming 32a1cd08d0 feat: check offline 关于mgroup更完善 2024-04-29 10:21:22 +08:00
caoqianming d720dc9c9b fix: mgroup is_running字段更改2 2024-04-29 10:17:42 +08:00
caoqianming fa6d6da1d2 fix: mgroup is_running字段更改 2024-04-29 10:17:31 +08:00
caoqianming 1f227c7645 feat: 优化shutdown_or_startup导致的并发存库问题 2024-04-28 18:22:25 +08:00
caoqianming 61e84bd302 feat: mpoint增加查询条件need_display 2024-04-28 17:52:12 +08:00
caoqianming df5a6d5d96 feat: 生成值班记录只对工段 2024-04-28 17:50:44 +08:00
caoqianming 5b1575bca0 fix: update_mpoint_cache 更新设备信号的bug 2024-04-28 15:25:08 +08:00
caoqianming 13adb0d4ea feat: 添加一处log以定位问题 2024-04-28 15:19:32 +08:00
caoqianming 107f0fc61d fix: 监控掉线的bug 2024-04-28 15:07:17 +08:00
caoqianming 85fce01834 fix: shutdown_or_startup 启动 2024-04-28 14:56:27 +08:00
caoqianming 601bb0ae60 fix: set_eq_rs 更新设备状态忘记传参数 2024-04-28 14:45:28 +08:00
caoqianming ece11699f8 feat: sflogexp返回更多信息 2024-04-28 13:32:53 +08:00
caoqianming acad9c6acf fix: stlog create时validate3 2024-04-28 13:10:01 +08:00
caoqianming 8375345e56 fix: stlog create时validate2 2024-04-28 11:30:05 +08:00
caoqianming 05f675f610 fix: stlog create时validate 2024-04-28 11:26:55 +08:00
caoqianming b803cac69f fix: 测点orderingbug 2024-04-28 10:10:49 +08:00
caoqianming 6f98d9dfb3 fix: stlog validate total_secondsbug 2024-04-28 10:04:30 +08:00
caoqianming d01bb012b9 fix: 异常值班处理的权限 2024-04-28 09:35:16 +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 7642f23423 fix: return self.request 2024-04-26 10:47:55 +08:00
caoqianming 070ccd72f4 fix: insert_mplogx_item忽略唯一性插入错误 2024-04-26 10:31:55 +08:00
caoqianming a4cecb86cb fix: king request 6 2024-04-25 21:46:18 +08:00
caoqianming 932ef2d2c8 fix: king request 6 2024-04-25 21:37:58 +08:00