 caoqianming
|
05beed5146
|
feat: enm enstat调整一下排序
|
2024-12-06 17:26:08 +08:00 |
|
caoqianming
|
3cfc4393de
|
feat: mpointvalues 聚合查询bug
|
2024-12-06 15:05:06 +08:00 |
|
caoqianming
|
9c0160f556
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-12-06 14:46:28 +08:00 |
|
caoqianming
|
0cf481a69b
|
feat: enm end_time 查询包前不包后
|
2024-12-06 14:46:26 +08:00 |
 zty
|
3901a57986
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-12-06 13:55:50 +08:00 |
|
zty
|
8c059fabe4
|
feat: enm/view 增加一个返回字段（峰谷平用）
|
2024-12-06 13:55:47 +08:00 |
|
caoqianming
|
438406842d
|
feat: enstat提供排序条件2
|
2024-12-06 13:25:36 +08:00 |
|
caoqianming
|
3ba0ddaaa9
|
feat: enstat提供排序条件
|
2024-12-06 13:24:06 +08:00 |
|
zty
|
22abc35d4b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-12-05 15:22:35 +08:00 |
|
zty
|
918df6b345
|
feat: 新增tkx 测点 聚合
|
2024-12-05 15:22:33 +08:00 |
|
caoqianming
|
62fae4ceac
|
feat: mpoint增加筛选条件
|
2024-12-05 15:09:27 +08:00 |
|
zty
|
c4c50670fd
|
feat: 修改 tkx 峰谷平
|
2024-12-04 16:08:43 +08:00 |
|
zty
|
284dc01f69
|
add : enm/filter 增加峰谷平查询字段
|
2024-12-03 18:27:48 +08:00 |
|
zty
|
55b8564f0d
|
feat:tkx 计量设备临期预警
|
2024-12-03 18:02:17 +08:00 |
|
zty
|
a08e66a06a
|
fix： task bug 修字段名
|
2024-12-02 15:36:36 +08:00 |
|
zty
|
c0169d25ac
|
add : enm 增加峰谷平电量统计
|
2024-12-02 15:26:12 +08:00 |
|
zty
|
2f31997b43
|
feat: enm/task 修改报警事件
|
2024-11-28 16:13:00 +08:00 |
|
zty
|
c0f796f4a0
|
fix: em/service 修改tkx 设备model
|
2024-11-26 17:54:59 +08:00 |
|
zty
|
9db524dfdb
|
feat: em/filter apps 修改设备字段信息
|
2024-11-25 18:14:12 +08:00 |
|
zty
|
3fff294189
|
fix : enm 修改 单位产品综合能耗
|
2024-11-18 13:51:04 +08:00 |
|
zty
|
c2cae12c4f
|
fix:enm/service 修改小数点
|
2024-11-18 09:34:27 +08:00 |
|
zty
|
9d5d7eceaf
|
fix : tkx enm bug fix
|
2024-11-14 17:48:48 +08:00 |
|
caoqianming
|
c1d140a082
|
feat: mpointstat filterset 支持hour,day,month,year
|
2024-11-12 15:26:02 +08:00 |
|
zty
|
9c8e0081e2
|
feat: 修改 last_val - first_val 值
|
2024-11-07 16:50:11 +08:00 |
|
zty
|
8ec5f8c6dd
|
feat: enm 回转窑综合电耗计算
|
2024-11-06 10:43:45 +08:00 |
|
zty
|
336f35ed28
|
feat:修改喇叭内容
|
2024-11-05 13:34:42 +08:00 |
|
zty
|
1ff55c6ee4
|
feat: apps/enm/view 修改offline状态
|
2024-10-29 09:36:28 +08:00 |
|
zty
|
e6e18c6c30
|
feat: enm/task nick_name
|
2024-10-15 09:54:24 +08:00 |
|
zty
|
96f4b0c445
|
feat: apps/enm 新增成本计算
|
2024-10-10 13:33:58 +08:00 |
|
zty
|
66af6475d9
|
feat: 修改采集时候出现0的处理
|
2024-10-09 09:26:29 +08:00 |
|
zty
|
9c6e8f5992
|
fix: 电表水表0值处理
|
2024-09-30 16:21:18 +08:00 |
|
zty
|
956500d3aa
|
fix :enm/serializer round
|
2024-09-26 15:56:18 +08:00 |
|
zty
|
008219e9ba
|
fix : em enm wpm 修改更新设备运行状态
|
2024-09-25 16:03:59 +08:00 |
|
zty
|
d5e48c1ab8
|
fix: enm、fim 修改费用过滤和能源加入班组开始结束时间
|
2024-09-23 10:04:43 +08:00 |
|
zty
|
0453499ee5
|
add: new migrations file
|
2024-09-13 15:08:42 +08:00 |
|
zty
|
7aae49b378
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2024-09-13 13:41:29 +08:00 |
|
zty
|
c4607e1608
|
fix /enm/service.py 停机时间短 无班组 加入异常原因
|
2024-09-13 13:40:45 +08:00 |
|
caoqianming
|
81a90f31cd
|
feat: 计算测点可不指定物料2
|
2024-08-29 13:47:16 +08:00 |
|
caoqianming
|
0f0bc9bd37
|
feat: 计算测点可不指定物料
|
2024-08-29 10:28:59 +08:00 |
|
caoqianming
|
e94996471f
|
feat: 优化enstat2
|
2024-08-29 09:28:39 +08:00 |
|
caoqianming
|
cf10f02829
|
fix: xscript change_data 变更
|
2024-08-28 17:14:49 +08:00 |
|
caoqianming
|
da3b0f62e5
|
feat: 增加change_data字段
|
2024-08-28 17:09:24 +08:00 |
|
caoqianming
|
4ac5d1f1f7
|
feat: xscript添加logger
|
2024-08-28 16:27:35 +08:00 |
|
caoqianming
|
43d0d90e41
|
fix: tag_update 先判断是否本地时间
|
2024-08-28 16:17:14 +08:00 |
|
caoqianming
|
730aa68966
|
feat: tag_update 先判断是否本地时间
|
2024-08-28 16:12:31 +08:00 |
|
caoqianming
|
038e7f86cd
|
feat: xscript相关调整
|
2024-08-28 14:11:42 +08:00 |
|
caoqianming
|
4bfa8a5460
|
feat: insert_mplogx_from_xscript 修改
|
2024-08-27 18:42:18 +08:00 |
|
caoqianming
|
417dae76fd
|
fix: xscript update bug
|
2024-08-27 17:40:05 +08:00 |
|
caoqianming
|
2be34d3caa
|
feat: enm添加xscript
|
2024-08-27 17:28:30 +08:00 |
|
zty
|
28834f88cd
|
fix ： 煤磨
|
2024-08-23 17:20:57 +08:00 |
|
zty
|
4960ee7fac
|
feat: 增加水泥包装
|
2024-08-21 17:55:23 +08:00 |
|
zty
|
5a35ea6028
|
feat: 增加出厂水泥 和 计算
|
2024-08-21 08:59:24 +08:00 |
|
zty
|
206e33d091
|
fix ：apps\enm filter
|
2024-08-20 14:43:53 +08:00 |
|
zty
|
c3b62f1831
|
fix: equip_elec_data 计算
|
2024-08-16 18:45:31 +08:00 |
|
zty
|
7a780ebd0d
|
fix: set coefficient
|
2024-08-16 18:44:50 +08:00 |
|
zty
|
cbce4998d9
|
feat: mpoint stat添加筛选条件
|
2024-08-16 18:44:30 +08:00 |
|
zty
|
4cdc48e549
|
fix: equip_elec_data 计算
|
2024-08-16 18:44:00 +08:00 |
|
zty
|
13fb91e83a
|
fix：enm/service 修改稿last_val
|
2024-08-15 10:47:43 +08:00 |
|
zty
|
f52b501aa1
|
feat : enm/service 增加测点采集系数
|
2024-08-15 09:19:19 +08:00 |
|
zty
|
47acf9ceb4
|
fix: enm/service 修改service
|
2024-08-12 16:04:55 +08:00 |
|
zty
|
169a31da5a
|
fix : apps/em /enm 更改缓存存储
|
2024-08-08 14:52:36 +08:00 |
|
zty
|
6bdc5a04aa
|
fix :enm service.py 修改缓存不存在直接返回
|
2024-08-07 09:30:56 +08:00 |
|
zty
|
f97c99bf8a
|
fix: cal_mpointstat_hour对于is_unit的计算错误
|
2024-08-06 17:52:21 +08:00 |
|
zty
|
91e9ac38f6
|
fix: db_insert_mplogx_batch bug
|
2024-08-06 17:22:28 +08:00 |
|
zty
|
679165cbd0
|
feat: db_insert_mplogx 添加限制参数
|
2024-08-06 17:12:58 +08:00 |
|
zty
|
4d498f99a3
|
fix: enm/task 水泥批号插入
|
2024-08-06 16:11:27 +08:00 |
|
zty
|
50cdbf9428
|
fix :enm/task 修改数据库连接
|
2024-08-06 10:53:01 +08:00 |
|
zty
|
f09a8fe4cd
|
add : db_ins_mplogx 增加测点插入数据库
|
2024-08-06 10:01:21 +08:00 |
|
caoqianming
|
fa56d61ffc
|
feat: 修改nowx使用aware
|
2024-08-02 16:39:07 +08:00 |
|
caoqianming
|
dc7e6f9d03
|
fix: get_total_sec_now及cal_exp_duration_sec 添加now参数
|
2024-08-02 13:50:05 +08:00 |
|
caoqianming
|
757bf89d71
|
fix: enstat hour_s查询时按真实事件查询
|
2024-08-02 10:50:22 +08:00 |
|
caoqianming
|
a589fec67e
|
feat: enstat2添加统计字段
|
2024-07-31 16:53:23 +08:00 |
|
caoqianming
|
893781ec7f
|
feat: db_insert_mplogx不用thread
|
2024-07-30 10:01:42 +08:00 |
|
caoqianming
|
05b46b5351
|
fix: EnvData get_or_create 避免报错
|
2024-07-29 08:38:57 +08:00 |
|
caoqianming
|
b0004ba12e
|
feat: mpointcache 存库时若测点不存在删除缓存
|
2024-07-25 10:51:54 +08:00 |
|
caoqianming
|
83ec822f9d
|
fix: db_insert_mplogx bug
|
2024-07-16 15:36:40 +08:00 |
|
caoqianming
|
d31cf4d143
|
feat: 从数据库转存到超表做count限制
|
2024-07-16 14:50:50 +08:00 |
|
caoqianming
|
bf98ea8a48
|
feat: 从数据库转存到超表
|
2024-07-16 14:06:46 +08:00 |
|
caoqianming
|
9572614b02
|
fix: enstat to_repre时若使用query时的bug
|
2024-06-27 09:05:45 +08:00 |
|
caoqianming
|
85bbdd6cd9
|
feat: 优化transfer_mpoint_val_to_ep_running_state
|
2024-06-26 10:11:43 +08:00 |
|
caoqianming
|
02d672a39d
|
feat: 增加mpoint查询条件
|
2024-06-26 10:11:21 +08:00 |
|
caoqianming
|
643efa448e
|
fix: mpointserializer获取last_data优化
|
2024-06-24 16:45:05 +08:00 |
|
caoqianming
|
499e5732aa
|
fix: 更新所监测设备测点的total_production忽略必须指定设备
|
2024-06-24 10:02:54 +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
|
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 |