| 
						
					 | 
					
						
						
						
						
							
						
						
							ccdc6e76c9
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-22 10:09:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ba6fc268f0
							
						
					 | 
					
						
						
							
							[後端] 修改table問題, db新增table
						
						
						
						
						
					 | 
					
						2023-05-22 10:09:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a2ac8e393
							
						
					 | 
					
						
						
							
							[緊急應變] 簡訊發送程序建置
						
						
						
						
						
					 | 
					
						2023-05-19 18:47:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1a05f2207
							
						
					 | 
					
						
						
							
							[後端] 修改前台 class building_tag問題
						
						
						
						
						
					 | 
					
						2023-05-19 14:22:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							606826eb66
							
						
					 | 
					
						
						
							
							[後端] 修改緊急api問題, 新增office 的mysqldatabase
						
						
						
						
						
					 | 
					
						2023-05-19 14:06:25 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1ce1e8400b
							
						
					 | 
					
						
						
							
							[後端] 修改前台 緊急使用api
						
						
						
						
						
					 | 
					
						2023-05-19 11:18:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							47f29cdddf
							
						
					 | 
					
						
						
							
							[後端] 修改前台登入時流程
						
						
						
						
						
					 | 
					
						2023-05-18 16:05:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af7d66e5ee
							
						
					 | 
					
						
						
							
							合併衝突
						
						
						
						
						
					 | 
					
						2023-05-18 12:49:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							faa2ddca2f
							
						
					 | 
					
						
						
							
							後台 [歷史資料] api 程序調整
						
						
						
						
						
					 | 
					
						2023-05-18 12:45:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3350dbc6f0
							
						
					 | 
					
						
						
							
							[後端] 修改get device api
						
						
						
						
						
					 | 
					
						2023-05-18 12:44:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							48dfbe134c
							
						
					 | 
					
						
						
							
							[後端] 完成hinet程序, 修改historyData loadtable 程序
						
						
						
						
						
					 | 
					
						2023-05-17 11:42:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8840d501ed
							
						
					 | 
					
						
						
							
							[後端] 修改判斷table存在問題
						
						
						
						
						
					 | 
					
						2023-05-17 10:41:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da9b6f678d
							
						
					 | 
					
						
						
							
							更新
						
						
						
						
						
					 | 
					
						2023-05-17 09:29:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d2624226ac
							
						
					 | 
					
						
						
							
							[前台] History HistoryRawData Start_timestamp 調整
						
						
						
						
						
					 | 
					
						2023-05-16 18:37:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7c7dc74c41
							
						
					 | 
					
						
						
							
							合併調整
						
						
						
						
						
					 | 
					
						2023-05-16 18:35:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5d193a8b1e
							
						
					 | 
					
						
						
							
							[前台api][後端] PostHistoryRawDataFilter Model 調整 | API 調整
						
						
						
						
						
					 | 
					
						2023-05-16 18:33:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fc1e8b0241
							
						
					 | 
					
						
						
							
							[後端] 修改歷史資料api, 修改hinet架構
						
						
						
						
						
					 | 
					
						2023-05-16 18:29:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							104260b662
							
						
					 | 
					
						
						
							
							[後端] 修改api錯誤
						
						
						
						
						
					 | 
					
						2023-05-16 15:18:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d8ec06a859
							
						
					 | 
					
						
						
							
							[後端] 修改historyapi
						
						
						
						
						
					 | 
					
						2023-05-16 14:43:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							81dc79f31c
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-16 14:12:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4fff1630c9
							
						
					 | 
					
						
						
							
							[後端] 修改同步niagara_item full_name 問題, 修改即使歷史資料api輸出架構, 修改get floor問題
						
						
						
						
						
					 | 
					
						2023-05-16 14:12:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							68ef0a1685
							
						
					 | 
					
						
						
							
							[圖資管理] 資料結構調整 | API 調整 | [歷史資料] API GetDevice 調整
						
						
						
						
						
					 | 
					
						2023-05-16 12:15:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8c0738addf
							
						
					 | 
					
						
						
							
							[後端] 修改年份結束日期
						
						
						
						
						
					 | 
					
						2023-05-15 17:15:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a8e836451a
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-15 17:10:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4e0b457bbe
							
						
					 | 
					
						
						
							
							[後台][後端] 水電報表 Export 匯出報表 api 部分程序調整
						
						
						
						
						
					 | 
					
						2023-05-15 17:10:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							012bc49651
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
						
						
						
						
						
					 | 
					
						2023-05-15 16:26:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |