caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f3c5698283
								
							
						 | 
						
							
							
								
								feat: 优化cal_mpointstat_hour支持float int
							
							
							
							
							
						 | 
						
							2024-04-24 15:00:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								86053bed93
								
							
						 | 
						
							
							
								
								feat: mpoint增加是否可手动录入的字段
							
							
							
							
							
						 | 
						
							2024-04-24 14:59:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4d559222ba
								
							
						 | 
						
							
							
								
								feat: mqtt 去除不必要的log
							
							
							
							
							
						 | 
						
							2024-04-24 10:48:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								54fc93de73
								
							
						 | 
						
							
							
								
								feat: 根据测点采集监测设备是否掉线使用celery
							
							
							
							
							
						 | 
						
							2024-04-23 16:56:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c1d55ce618
								
							
						 | 
						
							
							
								
								fix: rename mplogx to val_mrs
							
							
							
							
							
						 | 
						
							2024-04-23 16:28:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								339fc639e8
								
							
						 | 
						
							
							
								
								fix: king insert mplogx 参数1获取
							
							
							
							
							
						 | 
						
							2024-04-23 16:18:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								41cd2f343d
								
							
						 | 
						
							
							
								
								fix: king self._get_token bug
							
							
							
							
							
						 | 
						
							2024-04-23 16:13:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1a80031d6e
								
							
						 | 
						
							
							
								
								fix: 亚控请求修改2
							
							
							
							
							
						 | 
						
							2024-04-23 15:03:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8fe2069948
								
							
						 | 
						
							
							
								
								fix: 亚控请求修改
							
							
							
							
							
						 | 
						
							2024-04-23 15:00:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b204037699
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-04-23 09:13:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								22e5ff6180
								
							
						 | 
						
							
							
								
								refector: 检验撤回的优化
							
							
							
							
							
						 | 
						
							2024-04-23 09:13:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								717fe20821
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-04-22 20:13:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1e9c562b85
								
							
						 | 
						
							
							
								
								feat: 添加gitignore
							
							
							
							
							
						 | 
						
							2024-04-22 20:13:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aecec48002
								
							
						 | 
						
							
							
								
								fix: mpoint_last_timex 处理的优化
							
							
							
							
							
						 | 
						
							2024-04-22 15:30:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								45fda773ab
								
							
						 | 
						
							
							
								
								fix: mqtt插入数据时需校验enabled
							
							
							
							
							
						 | 
						
							2024-04-22 15:23:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6f8ab25b5c
								
							
						 | 
						
							
							
								
								feat: 增加半成品检验撤回功能
							
							
							
							
							
						 | 
						
							2024-04-22 11:14:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								509fa02939
								
							
						 | 
						
							
							
								
								feat: base 添加gitignore
							
							
							
							
							
						 | 
						
							2024-04-19 16:28:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e0d4c4beff
								
							
						 | 
						
							
							
								
								feat: base wxmp, wx无需显示在conf指定
							
							
							
							
							
						 | 
						
							2024-04-19 16:28:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3e56fa7390
								
							
						 | 
						
							
							
								
								feat: 物料删除时进行校验和相应的数据矫正
							
							
							
							
							
						 | 
						
							2024-04-19 14:32:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								196209d60c
								
							
						 | 
						
							
							
								
								feat: 支持多种开停信号联动
							
							
							
							
							
						 | 
						
							2024-04-19 13:03:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a8fb69d747
								
							
						 | 
						
							
							
								
								fix: 去除mpoint无用字段及相应逻辑变动
							
							
							
							
							
						 | 
						
							2024-04-18 15:01:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aee63ef771
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-04-18 13:46:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								17953a42aa
								
							
						 | 
						
							
							
								
								style: 代码格式化
							
							
							
							
							
						 | 
						
							2024-04-18 13:46:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f7d5375a5f
								
							
						 | 
						
							
							
								
								fix: 优化物料批次导入
							
							
							
							
							
						 | 
						
							2024-04-17 22:46:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								92bf0ac29e
								
							
						 | 
						
							
							
								
								fix: enp drain2serializer sql查询优化
							
							
							
							
							
						 | 
						
							2024-04-17 11:18:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fdc7ceff8d
								
							
						 | 
						
							
							
								
								fix: 优化模拟数据生成generate_envdata
							
							
							
							
							
						 | 
						
							2024-04-16 15:23:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ff035096e5
								
							
						 | 
						
							
							
								
								feat: update mplogx表结构
							
							
							
							
							
						 | 
						
							2024-04-16 15:11:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dfaed5e5e5
								
							
						 | 
						
							
							
								
								feat: 采集逻辑整体重构
							
							
							
							
							
						 | 
						
							2024-04-16 15:03:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								10632d9cae
								
							
						 | 
						
							
							
								
								fix: 启动时无需缓存测点
							
							
							
							
							
						 | 
						
							2024-04-16 15:02:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f9fc6f9d96
								
							
						 | 
						
							
							
								
								feat: equipment字段增加
							
							
							
							
							
						 | 
						
							2024-04-16 15:02:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								86e9bf6776
								
							
						 | 
						
							
							
								
								feat: 设备运行状态改变触发函数
							
							
							
							
							
						 | 
						
							2024-04-16 15:02:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e78511b556
								
							
						 | 
						
							
							
								
								style: 格式调整
							
							
							
							
							
						 | 
						
							2024-04-16 15:01:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								640d1a1bce
								
							
						 | 
						
							
							
								
								fix: 去除is_online字段引发的变动
							
							
							
							
							
						 | 
						
							2024-04-16 14:59:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e84e70852
								
							
						 | 
						
							
							
								
								fix: 生成envdata数据2
							
							
							
							
							
						 | 
						
							2024-04-16 14:47:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								67c0777fc9
								
							
						 | 
						
							
							
								
								fix: 生成envdata数据
							
							
							
							
							
						 | 
						
							2024-04-16 14:41:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								141e8ad4c8
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-04-16 13:22:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7b1eea0e20
								
							
						 | 
						
							
							
								
								feat: 添加check设备离线的脚本
							
							
							
							
							
						 | 
						
							2024-04-16 13:22:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								153fca308e
								
							
						 | 
						
							
							
								
								feat: base systemuser增加筛选条件
							
							
							
							
							
						 | 
						
							2024-04-12 16:43:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								35387a8333
								
							
						 | 
						
							
							
								
								fix: envdata list filter bug
							
							
							
							
							
						 | 
						
							2024-04-12 16:38:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								13c63a7aff
								
							
						 | 
						
							
							
								
								feat: 调整独立运行的scripts的文件位置
							
							
							
							
							
						 | 
						
							2024-04-12 10:40:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2ea048cc53
								
							
						 | 
						
							
							
								
								fix: mqtt 包引入调整
							
							
							
							
							
						 | 
						
							2024-04-11 21:31:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3e75683ee1
								
							
						 | 
						
							
							
								
								fix: EnvDataSerializer round处理2
							
							
							
							
							
						 | 
						
							2024-04-11 16:59:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								68933e3e16
								
							
						 | 
						
							
							
								
								fix: EnvDataSerializer round处理
							
							
							
							
							
						 | 
						
							2024-04-11 16:57:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								99e4079c52
								
							
						 | 
						
							
							
								
								fix: equipment evdata add_info_for_list2
							
							
							
							
							
						 | 
						
							2024-04-11 16:38:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d191a18f7b
								
							
						 | 
						
							
							
								
								fix: equipment evdata add_info_for_list
							
							
							
							
							
						 | 
						
							2024-04-11 16:32:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0061285355
								
							
						 | 
						
							
							
								
								feat: 变更一下envdata表结构
							
							
							
							
							
						 | 
						
							2024-04-11 15:49:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								74cbaa8497
								
							
						 | 
						
							
							
								
								refector: 修改函数名
							
							
							
							
							
						 | 
						
							2024-04-11 15:01:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bd1897f6f6
								
							
						 | 
						
							
							
								
								feat: correct_material_cate
							
							
							
							
							
						 | 
						
							2024-04-11 11:29:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								16417e0016
								
							
						 | 
						
							
							
								
								feat: 优化亚控测点批量存库及相应enm逻辑更改
							
							
							
							
							
						 | 
						
							2024-04-11 11:08:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6fde78574b
								
							
						 | 
						
							
							
								
								fix: base period_dict错误修改
							
							
							
							
							
						 | 
						
							2024-04-11 10:59:13 +08:00 |