| 
						
					 | 
					
						
						
						
						
							
						
						
							e8d553a292
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-12 10:55:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0811ba816b
							
						
					 | 
					
						
						
							
							/History/GetDevice、 /History/LookRealTime、 /History/GetMainSub 即時趨勢 API SQL調整
						
						
						
						
						
					 | 
					
						2023-05-12 10:55:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c3652ff48f
							
						
					 | 
					
						
						
							
							[後端] hinet增加關閉連綫
						
						
						
						
						
					 | 
					
						2023-05-12 10:18:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8c8030cb03
							
						
					 | 
					
						
						
							
							[後端] 新增HiNet api
						
						
						
						
						
					 | 
					
						2023-05-12 09:48:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb1f84d82b
							
						
					 | 
					
						
						
							
							[後端] 水電表 增加判斷jwt
						
						
						
						
						
					 | 
					
						2023-05-12 09:39:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5c2bbe0eb6
							
						
					 | 
					
						
						
							
							[後端] 修改水電表列表錯誤
						
						
						
						
						
					 | 
					
						2023-05-11 20:05:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f95d7109c6
							
						
					 | 
					
						
						
							
							[前台] 修正 GetAllFlooor API 部分程序 | 修正 MeterList 部分程序
						
						
						
						
						
					 | 
					
						2023-05-11 18:40:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							913aa9cbaf
							
						
					 | 
					
						
						
							
							[後端] 修改水電表 判斷日期格式
						
						
						
						
						
					 | 
					
						2023-05-11 18:25:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c88b3182e
							
						
					 | 
					
						
						
							
							[後端] 修改水電表列表 新增欄位
						
						
						
						
						
					 | 
					
						2023-05-11 17:57:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9058055e15
							
						
					 | 
					
						
						
							
							[後端] 新增獲取棟別樓層api
						
						
						
						
						
					 | 
					
						2023-05-11 17:01:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3bbbb22a7
							
						
					 | 
					
						
						
							
							[後端] 新增水電表列表api
						
						
						
						
						
					 | 
					
						2023-05-11 15:46:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							619fda32d3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-10 18:34:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							03c5cc13f5
							
						
					 | 
					
						
						
							
							[前台] 後端修正 GetMenu 無顯示資料問題
						
						
						
						
						
					 | 
					
						2023-05-10 18:34:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0538348866
							
						
					 | 
					
						
						
							
							[後端] 修改排成 增加獲取水表資料
						
						
						
						
						
					 | 
					
						2023-05-10 18:06:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							df02d1593b
							
						
					 | 
					
						
						
							
							[前台] 修改前台api, historycontroller 使用的舊格式sql 語法
						
						
						
						
						
					 | 
					
						2023-05-10 16:34:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							defb86dbc7
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-10 15:34:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							398acd2a74
							
						
					 | 
					
						
						
							
							[前台] 修改前台api jwttoken
						
						
						
						
						
					 | 
					
						2023-05-10 15:34:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e115cfd96
							
						
					 | 
					
						
						
							
							[前台] 後端 Build Sub_System model sub_system_guid 改為 sub_system_tag
						
						
						
						
						
					 | 
					
						2023-05-10 15:25:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							279950b63e
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-10 15:14:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							415902eb44
							
						
					 | 
					
						
						
							
							[後台] 修改niagara同步流程 改用東別去決定, 以及增加時長在資料庫上
						
						
						
						
						
						
						
						[前台] 修改realtime combination CRUD 
						
					 | 
					
						2023-05-10 15:14:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e96a24ae91
							
						
					 | 
					
						
						
							
							[前台] 後端 API BuildController GetSubSystem 寫死程序拿掉
						
						
						
						
						
					 | 
					
						2023-05-08 14:29:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							06cc65ff56
							
						
					 | 
					
						
						
							
							修改building system tag name API
						
						
						
						
						
					 | 
					
						2023-05-05 17:04:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a2bfe9895
							
						
					 | 
					
						
						
							
							修改參數
						
						
						
						
						
					 | 
					
						2023-05-05 16:47:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							74a6f1b66e
							
						
					 | 
					
						
						
							
							修改weather api
						
						
						
						
						
					 | 
					
						2023-05-05 16:46:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5acecf13cb
							
						
					 | 
					
						
						
							
							修改錯誤api
						
						
						
						
						
					 | 
					
						2023-05-05 16:45:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e9117db5d
							
						
					 | 
					
						
						
							
							修改api錯誤
						
						
						
						
						
					 | 
					
						2023-05-05 15:08:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be20f97f3b
							
						
					 | 
					
						
						
							
							修改測試錯誤
						
						
						
						
						
					 | 
					
						2023-05-05 11:45:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8071a0bb50
							
						
					 | 
					
						
						
							
							修改錯誤
						
						
						
						
						
					 | 
					
						2023-05-05 11:10:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1ce4aacc2d
							
						
					 | 
					
						
						
							
							修改前台api錯誤
						
						
						
						
						
					 | 
					
						2023-05-05 09:33:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							20f301fdfa
							
						
					 | 
					
						
						
							
							修改前台api
						
						
						
						
						
					 | 
					
						2023-05-04 18:15:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							665f9a69f8
							
						
					 | 
					
						
						
							
							修改排成程序
						
						
						
						
						
					 | 
					
						2023-05-04 16:45:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3f45fe7c2c
							
						
					 | 
					
						
						
							
							修改getmenu
						
						
						
						
						
					 | 
					
						2023-05-02 18:07:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							25945aad63
							
						
					 | 
					
						
						
							
							[後端] 修改getmenu api
						
						
						
						
						
					 | 
					
						2023-05-02 10:25:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							412a8ec909
							
						
					 | 
					
						
						
							
							[後端] 前台修改sql
						
						
						
						
						
					 | 
					
						2023-05-02 10:05:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ce792c2a5c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-04-28 14:02:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4e96375be4
							
						
					 | 
					
						
						
							
							照明設備開關 bug 修正
						
						
						
						
						
					 | 
					
						2023-04-28 14:01:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f7cc7cfb4c
							
						
					 | 
					
						
						
							
							修改錯誤
						
						
						
						
						
					 | 
					
						2023-04-27 17:58:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ec1f0f5bd
							
						
					 | 
					
						
						
							
							修改niagara 同步
						
						
						
						
						
					 | 
					
						2023-04-27 14:43:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4c956e3a4a
							
						
					 | 
					
						
						
							
							修改obix history
						
						
						
						
						
					 | 
					
						2023-04-26 17:43:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							605f3f8f87
							
						
					 | 
					
						
						
							
							平面圖原點訂閱及顏色變化
						
						
						
						
						
					 | 
					
						2023-04-26 10:49:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1847a7c2f2
							
						
					 | 
					
						
						
							
							取消解密 variable 中的 obix 參數
						
						
						
						
						
					 | 
					
						2023-04-26 01:16:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6fe713d22b
							
						
					 | 
					
						
						
							
							frontAPI 提供前端 device_node 狀態顏色
						
						
						
						
						
					 | 
					
						2023-04-25 22:22:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							95c1bc2403
							
						
					 | 
					
						
						
							
							merge 以周鵬的為主
						
						
						
						
						
					 | 
					
						2023-04-25 00:54:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5bcaad4256
							
						
					 | 
					
						
						
							
							debug: backend wsp niagara 同步
						
						
						
						
						
					 | 
					
						2023-04-25 00:48:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fc7a9713fd
							
						
					 | 
					
						
						
							
							fix obix config
						
						
						
						
						
					 | 
					
						2023-04-24 18:40:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							85b6553db7
							
						
					 | 
					
						
						
							
							修該obix config
						
						
						
						
						
					 | 
					
						2023-04-24 18:29:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ff2d6a4e68
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-04-24 16:18:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b403e2e631
							
						
					 | 
					
						
						
							
							修改同步table
						
						
						
						
						
					 | 
					
						2023-04-24 16:18:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ead6a13f4b
							
						
					 | 
					
						
						
							
							[系統監控] 各樓層上方增加燈號
						
						
						
						
						
					 | 
					
						2023-04-24 12:00:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a17604f77
							
						
					 | 
					
						
						
							
							[前台] 系統監控 燈具開關熱點顯示 | 多個 sensor 顯示 |  baja 增加 port
						
						
						
						
						
					 | 
					
						2023-04-24 11:55:46 +08:00 | 
					
					
						
						
							
							
							
						
					 |