Commit Graph

1128 Commits

Author SHA1 Message Date
caoqianming b8fadbda35 feat: 工单ws推送 2023-09-01 11:24:47 +08:00
caoqianming 46d127758a fix: roomconsumer bug修改 2023-09-01 10:16:36 +08:00
caoqianming df6fbf500e feat: 增加async def ticket 2023-09-01 09:39:03 +08:00
caoqianming efa6651748 feat: remind_push 2023-09-01 09:38:07 +08:00
caoqianming 83957c8e9c feat: 增加事件等级等字段并进行相应处理 2023-09-01 09:37:38 +08:00
caoqianming 8e0724bbec feat: 添加websocket模块 2023-09-01 09:12:18 +08:00
caoqianming d5386ccd84 feat: 优化ws 认证 2023-09-01 09:11:43 +08:00
caoqianming 16490c5907 feat: 增加serverservice 2023-09-01 09:11:18 +08:00
caoqianming 35d001e4e5 feat: 任务派发测试 2023-09-01 09:08:49 +08:00
caoqianming 64c2d86cd7 feat: enstat2增加查询条件 2023-08-31 14:14:00 +08:00
caoqianming c71557b82b feat: 允许修改身份证号 2023-08-30 16:16:24 +08:00
caoqianming ed936082c7 feat: mpoint增加func_on_change以完成开停机处理需求 2023-08-30 15:19:28 +08:00
caoqianming 8b0733f1fc feat: mgroup增加is_runing字段 2023-08-30 15:18:20 +08:00
caoqianming 13d9d6a752 feat: 短信服务连接不上时raise exception 2023-08-29 10:48:47 +08:00
caoqianming c9fc726139 fix: recal bug修复 2023-08-28 10:22:20 +08:00
caoqianming 5ff0cf43a8 fix: send_mail_task 未获取config 2023-08-28 09:50:17 +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 620351c8bf feat: send_mail_task优化 2023-08-28 09:18:09 +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 ad30803836 feat: sflogExp增加查询条件 2023-08-24 10:52:06 +08:00
caoqianming 6e1ab8a967 feat: enstat2 返回时保留2位小数 2023-08-24 10:28:07 +08:00
caoqianming 909499fc44 feat: 默认密码设置复杂 2023-08-24 10:11:11 +08:00
caoqianming 4f6838423b feat: 密码登录复杂度校验可选择 2023-08-24 09:14:39 +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 beb9624548 feat: price change 时计算加锁 2023-08-23 12:45:14 +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 11ced96400 feat: ecm filter 查询 2023-08-22 14:28:00 +08:00
caoqianming 315f832ff2 fix: 先调整回来再处理 2023-08-22 14:10:00 +08:00
caoqianming 74e81e1a7c feat: ecm filter 查询 2023-08-22 14:06:31 +08:00
caoqianming a0135ec965 feat: compress img 默认40kb 2023-08-22 13:58:59 +08:00
caoqianming 31b0f33751 feat: 提高导出限制 2023-08-22 13:56:17 +08:00
caoqianming c615d20a5c feat: 提高导出限制 2023-08-22 13:55:19 +08:00
caoqianming ab9b9d9804 fix: event 导出bug 2023-08-22 11:25:21 +08:00
caoqianming 563893efac feat: event增加压缩图片字段 2023-08-22 11:13:09 +08:00
caoqianming 39a3001211 fix: 导出时用压缩图 2023-08-22 10:42:01 +08:00
caoqianming 9ba12d06da feat: global img 压缩 2023-08-22 10:33:19 +08:00
caoqianming 0772be47de fix: 导出时的bug 2023-08-22 09:20:29 +08:00
caoqianming 6f7a732618 feat: ecm 提高导出数据限制 2023-08-22 09:12:58 +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 ad9027d888 fix: 煤粉热值取白班值 2023-08-17 15:05:40 +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 fba349191c feat: 作业未选证书时默认选择全部该成员全部证书 2023-08-10 17:12:42 +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 ccfeb9d901 feat: sflogexp合并stlog 2023-08-08 14:41:50 +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 ebe6ab9f3b feat: 增加生产异常动态记录表 2023-08-04 14:26:53 +08:00
caoqianming 4e5adc6dc3 feat: 获取工段全年目标 2023-08-04 14:26:00 +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 959fc60e24 feat: 获取工段全年目标值 2023-08-04 09:24:00 +08:00
caoqianming c7b7d9cec4 fix: cal_enstat_when_pcoal_heat_change的qs获取bug 2023-08-03 14:09:47 +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 8ab973749d feat: goal增加查询条件 2023-08-02 17:42:19 +08:00
caoqianming 67d04a9a41 feat: 可以不用间隔运行get_total_hour_now 2023-08-02 17:25:07 +08:00
caoqianming 40ecd52fee feat: 可根据时间段生成排版记录 2023-08-02 15:54:09 +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 ad2f903c89 fix: init_test bug 2023-08-02 10:51:48 +08:00
caoqianming 6fa1d379d3 feat: priceset feeset change触发enstat重新计算 2023-08-02 10:23:42 +08:00
caoqianming 3dc647272a feat: cal_enstat_when_pcoal_val_change 未完成 2023-08-02 10:22:51 +08:00
caoqianming 5402f2181c feat: 增加enstat 统计数据,优化task执行 2023-08-02 10:22:29 +08:00
caoqianming ab581f2851 fix: after_bulk_update执行后不用return 2023-08-02 10:19:38 +08:00
caoqianming 251e373d5b feat: get_total_hour_now 修改 2023-08-01 16:41:47 +08:00
caoqianming 80b61c9f8b fix: get_total_hour_now bug 2023-08-01 08:54:01 +08:00
caoqianming d2e4439b73 fix: get_total_hour_now bug 2023-08-01 08:50:06 +08:00
caoqianming a29ed1edc8 fix: get_total_hour_now sql查询bug 2023-07-31 17:46:56 +08:00
caoqianming 8e3802966e feat: enstat参数计算并新建enstat2表 2023-07-28 17:36:44 +08:00
caoqianming 6d5d2f84d4 feat: 停机记录分配到每一个班 2023-07-28 17:36:09 +08:00
caoqianming d487f0889f feat: 获取煤粉热值 2023-07-28 17:20:54 +08:00
caoqianming 56bc87c913 feat: 启动时重新加载系统配置json 2023-07-28 17:19:36 +08:00