| 
						
					 | 
					
						
						
						
						
							
						
						
							0117bc8016
							
						
					 | 
					
						
						
							
							[後台]修改 Forge 帳號 | [前台]樓層燈號顯示
						
						
						
						
						
					 | 
					
						2023-05-15 16:26:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5e45a6cca4
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-15 15:18:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0adecac5d8
							
						
					 | 
					
						
						
							
							[後台]後端 buildController getallfloor order by 程序補上 | 取得水電列表 api 調整
						
						
						
						
						
					 | 
					
						2023-05-15 15:18:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							93fb080c01
							
						
					 | 
					
						
						
							
							[後端] 修改水電表列表年份問題
						
						
						
						
						
					 | 
					
						2023-05-15 13:27:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c3b09e6452
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-15 12:59:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a4756fffca
							
						
					 | 
					
						
						
							
							[後端] 新增歷史即使趨勢點位圖api
						
						
						
						
						
					 | 
					
						2023-05-15 12:59:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a55aa592c7
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-15 12:49:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							67943d276b
							
						
					 | 
					
						
						
							
							[後台][水電報表] 後端部分判斷微調
						
						
						
						
						
					 | 
					
						2023-05-15 12:49:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f99a583fea
							
						
					 | 
					
						
						
							
							[後端] 完成水電表匯出
						
						
						
						
						
					 | 
					
						2023-05-15 12:04:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							61c0f90979
							
						
					 | 
					
						
						
							
							[後端] 修改水電表sql語法, 新增水電表費用api, 新增會出excel水電表, 修改hinet賬密
						
						
						
						
						
					 | 
					
						2023-05-12 18:42:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b4f79d4a0f
							
						
					 | 
					
						
						
							
							[後端] 修改waterList param問題
						
						
						
						
						
					 | 
					
						2023-05-12 15:00:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							40a3cf68e6
							
						
					 | 
					
						
						
							
							[前台] MeterList 後端程序調整
						
						
						
						
						
					 | 
					
						2023-05-12 14:55:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7dc2e0b5ae
							
						
					 | 
					
						
						
							
							[後端] 修改後去水電表列表問題
						
						
						
						
						
					 | 
					
						2023-05-12 13:02:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							938a7cdb7e
							
						
					 | 
					
						
						
							
							[後端] 修改device_item些api 增加判斷building_tag, niagara同步device_item增加building_tag
						
						
						
						
						
						
						
						[前端] 修改api發送增加building_tag 
						
					 | 
					
						2023-05-12 12:20:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							188dc425a6
							
						
					 | 
					
						
						
							
							[後端] 修改水電表參數輸入, 修改查詢sql
						
						
						
						
						
					 | 
					
						2023-05-12 11:06:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |