factory

Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

ec9260f353 feat: mpointstat增加排序条件 caoqianming 2024-05-07 13:37:10 +0800
03e073e00a feat: mpointstat增加查询条件 caoqianming 2024-05-07 13:19:59 +0800
25965c7072 fix: transfer_mpoint_val_to_ep_running_state 对expr_str的replace caoqianming 2024-05-07 13:07:52 +0800
52fc0c6bd3 fix: translate_eval_formula enm_lhxs的处理 caoqianming 2024-05-07 11:09:19 +0800
ce38c3e338 fix: get_total_hour_now exclude 错误 caoqianming 2024-05-07 10:16:22 +0800
6ee42a6993 fix: get_total_hour_now默认参数为空 caoqianming 2024-05-07 10:00:24 +0800
02a8693a65 fix: cal_enstat前调用一下get_total_hour_now caoqianming 2024-05-07 09:58:32 +0800
35d6d7beb9 feat: 监控测点掉线函数优化 caoqianming 2024-05-06 18:33:16 +0800
cb1576b797 fix: 尝试修改信号量计算测点 caoqianming 2024-05-06 18:13:32 +0800
d73cc1af5b feat: 料耗系数可用于测点 caoqianming 2024-05-06 16:14:35 +0800
6ae849150f fix: cache_key mpoint保留 caoqianming 2024-05-06 00:10:47 +0800
6cd255173f refector: 改mpoint的处理逻辑添加mpoint_affect支持并重构部分代码 caoqianming 2024-05-06 00:06:08 +0800
a46cfe59ed feat: 添加mpoint_affect字段 caoqianming 2024-05-06 00:05:24 +0800
a1999fb53d fix: 上个改动没有必要现在回退 caoqianming 2024-05-02 00:33:57 +0800
ca15092c5c feat: shutdown_or_startup 如果不是工段不用关心其开停 caoqianming 2024-05-02 00:25:37 +0800
634884f336 doc: 增加注释 caoqianming 2024-05-02 00:02:41 +0800
6ea5e0b5d7 fix: make_sflogs当天班生成缺少的bug caoqianming 2024-05-02 00:01:47 +0800
2263c0decb fix: 如果结束时间为0点则取开始时间来返回年月日2 caoqianming 2024-04-30 19:00:19 +0800
a6914413f7 fix: 如果结束时间为0点则取开始时间来返回年月日 caoqianming 2024-04-30 18:20:31 +0800
69db9db180 fix: 全厂电量计算enstat2.elec_consume拿不到默认0,3 caoqianming 2024-04-30 18:01:15 +0800
a7d03321d8 fix: 全厂电量计算enstat2.elec_consume拿不到默认0,2 caoqianming 2024-04-30 17:49:53 +0800
94c34480ec fix: 全厂电量计算enstat2.elec_consume拿不到默认0 caoqianming 2024-04-30 17:39:57 +0800
59c000670a fix: 全厂电量计算bug caoqianming 2024-04-30 16:53:06 +0800
cb766247b0 fix: water_consume caoqianming 2024-04-30 16:23:57 +0800
5f20247818 feat: 添加一个log排查逻辑错误 caoqianming 2024-04-30 14:21:09 +0800
dddab37c63 fix: get_sflog 取的时候与happen_time对比错误 caoqianming 2024-04-30 12:59:38 +0800
90ed2927e6 feat: cal_mpointstat_hour 添加一个日志 caoqianming 2024-04-30 12:39:43 +0800
1e8e4c6f70 refector: formular无需用$符号 caoqianming 2024-04-30 11:01:56 +0800
5f67673c45 feat: base 完整的task on_failure日志记录和邮件推送 caoqianming 2024-04-29 21:46:49 +0800
513d37e9ac feat: base 完整的task on_failure日志记录和邮件推送 caoqianming 2024-04-29 21:45:35 +0800
3a0d229ec0 feat: mpoint view增加查询条件 caoqianming 2024-04-29 21:31:28 +0800
9c9164b176 fix: translate_eval_formula 执行时不try caoqianming 2024-04-29 21:28:29 +0800
836c2a2baf fix: translate_eval_formula bug2 caoqianming 2024-04-29 17:29:04 +0800
2e4f6f0445 fix: translate_eval_formula bug caoqianming 2024-04-29 16:52:01 +0800
48c6ad53b9 fix: 计算统计测点的时候按顺序计算 caoqianming 2024-04-29 16:15:11 +0800
3fcb015fdd feat: 添加多个函数来监测测点、设备、工段的运行或离线状态 caoqianming 2024-04-29 14:45:11 +0800
408bb37b67 fix: is_runing字段错误 caoqianming 2024-04-29 14:43:45 +0800
a26656109c feat: 优化mpointstat计算点选择 caoqianming 2024-04-29 12:53:55 +0800
32a1cd08d0 feat: check offline 关于mgroup更完善 caoqianming 2024-04-29 10:21:22 +0800
d720dc9c9b fix: mgroup is_running字段更改2 caoqianming 2024-04-29 10:17:42 +0800
fa6d6da1d2 fix: mgroup is_running字段更改 caoqianming 2024-04-29 10:17:31 +0800
1f227c7645 feat: 优化shutdown_or_startup导致的并发存库问题 caoqianming 2024-04-28 18:22:25 +0800
61e84bd302 feat: mpoint增加查询条件need_display caoqianming 2024-04-28 17:52:12 +0800
df5a6d5d96 feat: 生成值班记录只对工段 caoqianming 2024-04-28 17:50:44 +0800
5b1575bca0 fix: update_mpoint_cache 更新设备信号的bug caoqianming 2024-04-28 15:25:08 +0800
13adb0d4ea feat: 添加一处log以定位问题 caoqianming 2024-04-28 15:19:32 +0800
107f0fc61d fix: 监控掉线的bug caoqianming 2024-04-28 15:07:17 +0800
85fce01834 fix: shutdown_or_startup 启动 caoqianming 2024-04-28 14:56:27 +0800
601bb0ae60 fix: set_eq_rs 更新设备状态忘记传参数 caoqianming 2024-04-28 14:45:28 +0800
d443277e28 feat: base 生产环境关闭swagger2 caoqianming 2024-04-28 14:18:29 +0800
323be38d38 feat: base 生产环境关闭swagger caoqianming 2024-04-28 13:59:06 +0800
ece11699f8 feat: sflogexp返回更多信息 caoqianming 2024-04-28 13:32:53 +0800
acad9c6acf fix: stlog create时validate3 caoqianming 2024-04-28 13:10:01 +0800
8375345e56 fix: stlog create时validate2 caoqianming 2024-04-28 11:30:05 +0800
05f675f610 fix: stlog create时validate caoqianming 2024-04-28 11:26:55 +0800
29b88077b4 fix: base get_sysconfig caoqianming 2024-04-28 11:13:23 +0800
b803cac69f fix: 测点orderingbug caoqianming 2024-04-28 10:10:49 +0800
6f98d9dfb3 fix: stlog validate total_secondsbug caoqianming 2024-04-28 10:04:30 +0800
d01bb012b9 fix: 异常值班处理的权限 caoqianming 2024-04-28 09:35:16 +0800
c179d91ebd feat: 采集逻辑优化 caoqianming 2024-04-28 09:34:33 +0800
9805b471d4 feat: 添加料耗系数 caoqianming 2024-04-26 15:24:42 +0800
7642f23423 fix: return self.request caoqianming 2024-04-26 10:47:55 +0800
070ccd72f4 fix: insert_mplogx_item忽略唯一性插入错误 caoqianming 2024-04-26 10:31:55 +0800
a4cecb86cb fix: king request 6 caoqianming 2024-04-25 21:46:18 +0800
932ef2d2c8 fix: king request 6 caoqianming 2024-04-25 21:37:58 +0800
dd61b1ba01 fix: king request 5 caoqianming 2024-04-25 20:54:35 +0800
4004278f31 fix: kingClient get_token request 4 caoqianming 2024-04-25 18:43:44 +0800
1a2baa82d9 fix: kingClient get_token request 3 caoqianming 2024-04-25 18:35:33 +0800
41c79c1fdd fix: kingClient get_token request 2 caoqianming 2024-04-25 18:25:38 +0800
facecacc38 fix: kingClient get_token request caoqianming 2024-04-25 18:05:02 +0800
2319ecde61 feat: base get_sysconfig支持传入具体key值 caoqianming 2024-04-25 16:57:00 +0800
00e3129751 feat: 设备运行状态的缓存优化 caoqianming 2024-04-25 15:12:39 +0800
7d8585856d feat: kingclient优化 caoqianming 2024-04-25 14:59:46 +0800
9600e95272 fix: check_equipment_offline后需更新缓存 caoqianming 2024-04-25 13:45:07 +0800
8b8b65c8ba fix: kingclient err_detail记录错误 caoqianming 2024-04-25 13:01:53 +0800
bf3b61413a fix: kingclient logout不抛出异常只记录日志 caoqianming 2024-04-25 12:50:02 +0800
f1e1ae5dc6 feat: kingClient登录优化 caoqianming 2024-04-25 12:34:56 +0800
0c6fe5e37c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-04-25 12:24:36 +0800
9164464b10 fix: kingclient get_token问题 caoqianming 2024-04-25 12:24:34 +0800
8cb9cfb849 feat: set_equip_rs caoqianming 2024-04-25 00:02:20 +0800
53b1ceafa0 feat: ctask_run delay执行及相应优化 caoqianming 2024-04-24 23:54:35 +0800
c834f996f5 fix: 获取val_mrs错误 caoqianming 2024-04-24 18:32:30 +0800
4ff503f1b0 fix: update_mpoint_cache state变动或超时更新设备运行状态2 caoqianming 2024-04-24 18:20:39 +0800
ecb95da787 fix: update_mpoint_cache state变动或超时更新设备运行状态 caoqianming 2024-04-24 18:13:21 +0800
4c3fa8acac fix: update_mpoint_cache 更新错误 caoqianming 2024-04-24 18:07:45 +0800
14bcf0833f feat: 通过restful获取测点值 caoqianming 2024-04-24 17:57:31 +0800
53ce0ea0f7 feat: runningstate统一修改 caoqianming 2024-04-24 16:23:13 +0800
7b83cd1095 refector: 检验撤回根据count_notok进行update_mb caoqianming 2024-04-24 16:22:36 +0800
e33b4e5902 fix: dahua_enabled通过getattr获取 caoqianming 2024-04-24 15:55:58 +0800
f3c5698283 feat: 优化cal_mpointstat_hour支持float int caoqianming 2024-04-24 15:00:08 +0800
86053bed93 feat: mpoint增加是否可手动录入的字段 caoqianming 2024-04-24 14:59:37 +0800
4d559222ba feat: mqtt 去除不必要的log caoqianming 2024-04-24 10:48:08 +0800
54fc93de73 feat: 根据测点采集监测设备是否掉线使用celery caoqianming 2024-04-23 16:56:08 +0800
c1d55ce618 fix: rename mplogx to val_mrs caoqianming 2024-04-23 16:28:26 +0800
339fc639e8 fix: king insert mplogx 参数1获取 caoqianming 2024-04-23 16:18:50 +0800
41cd2f343d fix: king self._get_token bug caoqianming 2024-04-23 16:13:04 +0800
1a80031d6e fix: 亚控请求修改2 caoqianming 2024-04-23 15:03:35 +0800
8fe2069948 fix: 亚控请求修改 caoqianming 2024-04-23 15:00:49 +0800
b204037699 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-04-23 09:13:23 +0800
22e5ff6180 refector: 检验撤回的优化 caoqianming 2024-04-23 09:13:21 +0800