caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7642f23423
								
							
						 | 
						
							
							
								
								fix: return self.request
							
							
							
							
							
						 | 
						
							2024-04-26 10:47:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								070ccd72f4
								
							
						 | 
						
							
							
								
								fix:  insert_mplogx_item忽略唯一性插入错误
							
							
							
							
							
						 | 
						
							2024-04-26 10:31:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a4cecb86cb
								
							
						 | 
						
							
							
								
								fix: king request 6
							
							
							
							
							
						 | 
						
							2024-04-25 21:46:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								932ef2d2c8
								
							
						 | 
						
							
							
								
								fix: king request 6
							
							
							
							
							
						 | 
						
							2024-04-25 21:37:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dd61b1ba01
								
							
						 | 
						
							
							
								
								fix: king request 5
							
							
							
							
							
						 | 
						
							2024-04-25 20:54:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4004278f31
								
							
						 | 
						
							
							
								
								fix: kingClient get_token request 4
							
							
							
							
							
						 | 
						
							2024-04-25 18:43:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1a2baa82d9
								
							
						 | 
						
							
							
								
								fix: kingClient get_token request 3
							
							
							
							
							
						 | 
						
							2024-04-25 18:35:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								41c79c1fdd
								
							
						 | 
						
							
							
								
								fix: kingClient get_token request 2
							
							
							
							
							
						 | 
						
							2024-04-25 18:25:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								facecacc38
								
							
						 | 
						
							
							
								
								fix: kingClient get_token request
							
							
							
							
							
						 | 
						
							2024-04-25 18:05:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2319ecde61
								
							
						 | 
						
							
							
								
								feat: base get_sysconfig支持传入具体key值
							
							
							
							
							
						 | 
						
							2024-04-25 16:57:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								00e3129751
								
							
						 | 
						
							
							
								
								feat: 设备运行状态的缓存优化
							
							
							
							
							
						 | 
						
							2024-04-25 15:12:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7d8585856d
								
							
						 | 
						
							
							
								
								feat: kingclient优化
							
							
							
							
							
						 | 
						
							2024-04-25 14:59:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9600e95272
								
							
						 | 
						
							
							
								
								fix: check_equipment_offline后需更新缓存
							
							
							
							
							
						 | 
						
							2024-04-25 13:45:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8b8b65c8ba
								
							
						 | 
						
							
							
								
								fix: kingclient err_detail记录错误
							
							
							
							
							
						 | 
						
							2024-04-25 13:01:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bf3b61413a
								
							
						 | 
						
							
							
								
								fix: kingclient logout不抛出异常只记录日志
							
							
							
							
							
						 | 
						
							2024-04-25 12:50:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f1e1ae5dc6
								
							
						 | 
						
							
							
								
								feat: kingClient登录优化
							
							
							
							
							
						 | 
						
							2024-04-25 12:34:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0c6fe5e37c
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-04-25 12:24:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9164464b10
								
							
						 | 
						
							
							
								
								fix: kingclient get_token问题
							
							
							
							
							
						 | 
						
							2024-04-25 12:24:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8cb9cfb849
								
							
						 | 
						
							
							
								
								feat: set_equip_rs
							
							
							
							
							
						 | 
						
							2024-04-25 00:02:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								53b1ceafa0
								
							
						 | 
						
							
							
								
								feat: ctask_run delay执行及相应优化
							
							
							
							
							
						 | 
						
							2024-04-24 23:54:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c834f996f5
								
							
						 | 
						
							
							
								
								fix: 获取val_mrs错误
							
							
							
							
							
						 | 
						
							2024-04-24 18:32:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4ff503f1b0
								
							
						 | 
						
							
							
								
								fix: update_mpoint_cache state变动或超时更新设备运行状态2
							
							
							
							
							
						 | 
						
							2024-04-24 18:20:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ecb95da787
								
							
						 | 
						
							
							
								
								fix: update_mpoint_cache state变动或超时更新设备运行状态
							
							
							
							
							
						 | 
						
							2024-04-24 18:13:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4c3fa8acac
								
							
						 | 
						
							
							
								
								fix: update_mpoint_cache 更新错误
							
							
							
							
							
						 | 
						
							2024-04-24 18:07:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								14bcf0833f
								
							
						 | 
						
							
							
								
								feat: 通过restful获取测点值
							
							
							
							
							
						 | 
						
							2024-04-24 17:57:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								53ce0ea0f7
								
							
						 | 
						
							
							
								
								feat: runningstate统一修改
							
							
							
							
							
						 | 
						
							2024-04-24 16:23:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7b83cd1095
								
							
						 | 
						
							
							
								
								refector: 检验撤回根据count_notok进行update_mb
							
							
							
							
							
						 | 
						
							2024-04-24 16:22:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e33b4e5902
								
							
						 | 
						
							
							
								
								fix: dahua_enabled通过getattr获取
							
							
							
							
							
						 | 
						
							2024-04-24 15:55:58 +08:00 | 
						
					
				
					
						
							
							
								
								 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 |