factory

Commit Graph

Select branches

Hide Pull Requests

base

dev_cqm

dev_sj

master

#2

#3

#4

#5

#6

#7

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

3.1.2026033008

3.1.2026042912

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
717fe20821 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-04-22 20:13:57 +0800
1e9c562b85 feat: 添加gitignore caoqianming 2024-04-22 20:13:55 +0800
aecec48002 fix: mpoint_last_timex 处理的优化 caoqianming 2024-04-22 15:30:42 +0800
45fda773ab fix: mqtt插入数据时需校验enabled caoqianming 2024-04-22 15:23:24 +0800
6f8ab25b5c feat: 增加半成品检验撤回功能 caoqianming 2024-04-22 11:14:53 +0800
509fa02939 feat: base 添加gitignore caoqianming 2024-04-19 16:28:54 +0800
e0d4c4beff feat: base wxmp, wx无需显示在conf指定 caoqianming 2024-04-19 16:28:05 +0800
3e56fa7390 feat: 物料删除时进行校验和相应的数据矫正 caoqianming 2024-04-19 14:32:06 +0800
196209d60c feat: 支持多种开停信号联动 caoqianming 2024-04-19 13:03:30 +0800
a8fb69d747 fix: 去除mpoint无用字段及相应逻辑变动 caoqianming 2024-04-18 15:01:18 +0800
aee63ef771 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-04-18 13:46:59 +0800
17953a42aa style: 代码格式化 caoqianming 2024-04-18 13:46:58 +0800
f7d5375a5f fix: 优化物料批次导入 caoqianming 2024-04-17 22:46:05 +0800
92bf0ac29e fix: enp drain2serializer sql查询优化 caoqianming 2024-04-17 11:18:15 +0800
fdc7ceff8d fix: 优化模拟数据生成generate_envdata caoqianming 2024-04-16 15:23:27 +0800
ff035096e5 feat: update mplogx表结构 caoqianming 2024-04-16 15:11:40 +0800
dfaed5e5e5 feat: 采集逻辑整体重构 caoqianming 2024-04-16 15:03:59 +0800
10632d9cae fix: 启动时无需缓存测点 caoqianming 2024-04-16 15:02:53 +0800
f9fc6f9d96 feat: equipment字段增加 caoqianming 2024-04-16 15:02:27 +0800
86e9bf6776 feat: 设备运行状态改变触发函数 caoqianming 2024-04-16 15:02:07 +0800
e78511b556 style: 格式调整 caoqianming 2024-04-16 15:01:33 +0800
640d1a1bce fix: 去除is_online字段引发的变动 caoqianming 2024-04-16 14:59:07 +0800
6e84e70852 fix: 生成envdata数据2 caoqianming 2024-04-16 14:47:05 +0800
67c0777fc9 fix: 生成envdata数据 caoqianming 2024-04-16 14:41:15 +0800
141e8ad4c8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2024-04-16 13:22:47 +0800
7b1eea0e20 feat: 添加check设备离线的脚本 caoqianming 2024-04-16 13:22:45 +0800
153fca308e feat: base systemuser增加筛选条件 caoqianming 2024-04-12 16:43:48 +0800
35387a8333 fix: envdata list filter bug caoqianming 2024-04-12 16:38:24 +0800
13c63a7aff feat: 调整独立运行的scripts的文件位置 caoqianming 2024-04-12 10:40:05 +0800