From 07cf1ab12ba658dba501b6233add5d5f54db4332 Mon Sep 17 00:00:00 2001
From: VVT789 <67089238+VVT789@users.noreply.github.com>
Date: 星期二, 18 三月 2025 13:05:42 +0800
Subject: [PATCH] Merge pull request #6 from Andy-Yin/wt_from_develop1.0
---
readme/img/统计指标.png | 0
readme/img/2-2-首页-深色.png | 0
readme/img/4-2-峰平谷时段统计-深色.png | 0
readme/img/5-1-区域能耗分析-浅色.png | 0
readme/img/模型配置.png | 0
sql/postgre.sql | 7 ++++++-
README.md | 19 +++----------------
readme/img/2-1-首页-浅色.png | 0
readme/img/计算公式.png | 0
readme/img/1-登录页.png | 0
readme/img/3-1-能源实时监测-浅色.png | 0
readme/img/指标配置.png | 0
readme/img/3-2-能源实时监测-深色.png | 0
readme/img/4-1-峰平谷时段统计-浅色.png | 0
readme/img/5-2-区域能耗分析-深色.png | 0
15 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 6bafdf9..3f71c89 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">鏅虹⒊鑳芥簮绠＄悊绯荤粺</h1>
<p align="center">鍩轰簬SpringBoot鍜岃嫢渚濇鏋跺紑鍙�</p>
<p align="center">
- <a href='https://gitee.com/zhitancloud/zhitan-ems/stargazers'><img src='https://gitee.com/zhitancloud/zhitan-ems/badge/star.svg?theme=dark' alt='star'></img></a>
- <a href='https://gitee.com/zhitancloud/zhitan-ems/members'><img src='https://gitee.com/zhitancloud/zhitan-ems/badge/fork.svg?theme=dark' alt='fork'></img></a>
+ <a href='https://gitee.com/zhitan-ems/zhitan-ems/stargazers'><img src='https://gitee.com/zhitan-ems/zhitan-ems/badge/star.svg?theme=dark' alt='star'></img></a>
+ <a href='https://gitee.com/zhitan-ems/zhitan-ems/members'><img src='https://gitee.com/zhitan-ems/zhitan-ems/badge/fork.svg?theme=dark' alt='fork'></img></a>
</p>
## 浠嬬粛
@@ -14,20 +14,7 @@
閽堝瀹㈡埛鍦烘櫙锛氭斂搴溿�佸洯鍖恒�佷紒涓氥�佸伐鐭裤�佸叕鍏卞缓绛戠瓑銆�
-
-澧欏唴浠撳簱鍦板潃锛堢爜浜戯級锛歨ttps://gitee.com/ustcyc/zhitan-ems
-
-宸插悓姝ユ洿鏂板埌github浠撳簱锛歨ttps://github.com/Andy-Yin/zhitan-ems
-
-## 鍥犱负鎴戞斁鎴戠殑浜岀淮鐮佷氦娴侀摼鎺ワ紝鎬绘槸鏈変汉缇℃厱鎴戯紝缇℃厱鎴戞槸鍥藉唴姣旇緝鍏堣繘銆佹渶閫傚悎鍥藉唴绋嬪簭鍛樼殑java+鑻ヤ緷鐨勮兘婧愮郴缁燂紝浠栦滑灏辩溂绾紝鎭舵剰涓炬姤鎴戜滑璇存垜浠槸骞垮憡寮曟祦銆�
-## 寰堟棤濂堬紝寰堟棤鍔╋紝寰堢敓姘旓紝鎵�浠ユ垜鍘绘帀浜嗘墍鏈夌殑鑱旂郴鏂瑰紡鍜屼氦娴佺兢銆�
-## 璇峰ぇ瀹舵湁闂鎻恑ssue鍚с�傘�傘�俬ttps://gitee.com/zhitancloud/zhitan-ems/issues/new
-## 鎴戣涓轰腑鍥藉競鍦鸿冻澶熷ぇ锛屽浗鍐呮湁鍑犵櫨瀹跺仛鑳芥簮绯荤粺鐨勭殑浼佷笟鍜屼釜浜猴紝鎴戝紑婧愶紝鍗宠础鐚簡绀句細锛岃繕鍒╀粬锛屽悓鏃朵篃鏄负浜嗗吇娲昏嚜宸憋紝鏈�缁堜篃鏄负鎴戜滑鐨勫弻纰崇洰鏍囪�屽姫鍔涖��
-## 甯屾湜涓炬姤鎴戠殑浜猴紝鑳芥妸鏍煎眬鏀惧ぇ锛屼笉瑕佸儚涓コ浜轰竴鏍凤紝鍍忛珮涓彮閲屼袱涓コ鐢燂紝浜掔浉钘忓鏂归搮绗旓紝璁╁鏂硅�冧笉濂斤紝鍏朵笉鐭ラ亾锛屼粬鐨勭珵浜夊鎵嬫槸鍥藉唴鎵�鏈夌殑楂樿�冨鐢熴��
-## 鍚涘瓙鍧﹁崱鑽★紝灏忎汉甯告垰鎴氥��
-## 鏈涙煇浜涗汉锛屽ソ濂藉仛浜у搧锛屼笉瑕佹兂鐫�鎬庝箞姣忓ぉ鍘诲鍒汉銆�
-## 鏈涙煇浜涗汉锛屽仛涓ソ浜哄惂锛佷负鑷繁绉痉锛屼负鍥藉澶氬仛鐐硅础鐚�傘��
-
+## 璇峰ぇ瀹舵湁闂鎻恑ssue鍚с�傘�傘��
## 鍦ㄧ嚎浣撻獙
diff --git "a/readme/img/1-\347\231\273\345\275\225\351\241\265.png" "b/readme/img/1-\347\231\273\345\275\225\351\241\265.png"
index bf7816b..2d3d9d9 100644
--- "a/readme/img/1-\347\231\273\345\275\225\351\241\265.png"
+++ "b/readme/img/1-\347\231\273\345\275\225\351\241\265.png"
Binary files differ
diff --git "a/readme/img/2-1-\351\246\226\351\241\265-\346\265\205\350\211\262.png" "b/readme/img/2-1-\351\246\226\351\241\265-\346\265\205\350\211\262.png"
index 5c76e52..8033d92 100644
--- "a/readme/img/2-1-\351\246\226\351\241\265-\346\265\205\350\211\262.png"
+++ "b/readme/img/2-1-\351\246\226\351\241\265-\346\265\205\350\211\262.png"
Binary files differ
diff --git "a/readme/img/2-2-\351\246\226\351\241\265-\346\267\261\350\211\262.png" "b/readme/img/2-2-\351\246\226\351\241\265-\346\267\261\350\211\262.png"
index fae6f08..88a10eb 100644
--- "a/readme/img/2-2-\351\246\226\351\241\265-\346\267\261\350\211\262.png"
+++ "b/readme/img/2-2-\351\246\226\351\241\265-\346\267\261\350\211\262.png"
Binary files differ
diff --git "a/readme/img/3-1-\350\203\275\346\272\220\345\256\236\346\227\266\347\233\221\346\265\213-\346\265\205\350\211\262.png" "b/readme/img/3-1-\350\203\275\346\272\220\345\256\236\346\227\266\347\233\221\346\265\213-\346\265\205\350\211\262.png"
index 4c3921f..70998c3 100644
--- "a/readme/img/3-1-\350\203\275\346\272\220\345\256\236\346\227\266\347\233\221\346\265\213-\346\265\205\350\211\262.png"
+++ "b/readme/img/3-1-\350\203\275\346\272\220\345\256\236\346\227\266\347\233\221\346\265\213-\346\265\205\350\211\262.png"
Binary files differ
diff --git "a/readme/img/3-2-\350\203\275\346\272\220\345\256\236\346\227\266\347\233\221\346\265\213-\346\267\261\350\211\262.png" "b/readme/img/3-2-\350\203\275\346\272\220\345\256\236\346\227\266\347\233\221\346\265\213-\346\267\261\350\211\262.png"
index 0f6fb3e..0ec8359 100644
--- "a/readme/img/3-2-\350\203\275\346\272\220\345\256\236\346\227\266\347\233\221\346\265\213-\346\267\261\350\211\262.png"
+++ "b/readme/img/3-2-\350\203\275\346\272\220\345\256\236\346\227\266\347\233\221\346\265\213-\346\267\261\350\211\262.png"
Binary files differ
diff --git "a/readme/img/4-1-\345\263\260\345\271\263\350\260\267\346\227\266\346\256\265\347\273\237\350\256\241-\346\265\205\350\211\262.png" "b/readme/img/4-1-\345\263\260\345\271\263\350\260\267\346\227\266\346\256\265\347\273\237\350\256\241-\346\265\205\350\211\262.png"
index dd999f4..a3e382b 100644
--- "a/readme/img/4-1-\345\263\260\345\271\263\350\260\267\346\227\266\346\256\265\347\273\237\350\256\241-\346\265\205\350\211\262.png"
+++ "b/readme/img/4-1-\345\263\260\345\271\263\350\260\267\346\227\266\346\256\265\347\273\237\350\256\241-\346\265\205\350\211\262.png"
Binary files differ
diff --git "a/readme/img/4-2-\345\263\260\345\271\263\350\260\267\346\227\266\346\256\265\347\273\237\350\256\241-\346\267\261\350\211\262.png" "b/readme/img/4-2-\345\263\260\345\271\263\350\260\267\346\227\266\346\256\265\347\273\237\350\256\241-\346\267\261\350\211\262.png"
index fde06f5..10db3ca 100644
--- "a/readme/img/4-2-\345\263\260\345\271\263\350\260\267\346\227\266\346\256\265\347\273\237\350\256\241-\346\267\261\350\211\262.png"
+++ "b/readme/img/4-2-\345\263\260\345\271\263\350\260\267\346\227\266\346\256\265\347\273\237\350\256\241-\346\267\261\350\211\262.png"
Binary files differ
diff --git "a/readme/img/5-1-\345\214\272\345\237\237\350\203\275\350\200\227\345\210\206\346\236\220-\346\265\205\350\211\262.png" "b/readme/img/5-1-\345\214\272\345\237\237\350\203\275\350\200\227\345\210\206\346\236\220-\346\265\205\350\211\262.png"
index 2d8e933..71693ab 100644
--- "a/readme/img/5-1-\345\214\272\345\237\237\350\203\275\350\200\227\345\210\206\346\236\220-\346\265\205\350\211\262.png"
+++ "b/readme/img/5-1-\345\214\272\345\237\237\350\203\275\350\200\227\345\210\206\346\236\220-\346\265\205\350\211\262.png"
Binary files differ
diff --git "a/readme/img/5-2-\345\214\272\345\237\237\350\203\275\350\200\227\345\210\206\346\236\220-\346\267\261\350\211\262.png" "b/readme/img/5-2-\345\214\272\345\237\237\350\203\275\350\200\227\345\210\206\346\236\220-\346\267\261\350\211\262.png"
index 6e14dbd..4f4f422 100644
--- "a/readme/img/5-2-\345\214\272\345\237\237\350\203\275\350\200\227\345\210\206\346\236\220-\346\267\261\350\211\262.png"
+++ "b/readme/img/5-2-\345\214\272\345\237\237\350\203\275\350\200\227\345\210\206\346\236\220-\346\267\261\350\211\262.png"
Binary files differ
diff --git "a/readme/img/\346\214\207\346\240\207\351\205\215\347\275\256.png" "b/readme/img/\346\214\207\346\240\207\351\205\215\347\275\256.png"
index 80da8ae..58e6746 100644
--- "a/readme/img/\346\214\207\346\240\207\351\205\215\347\275\256.png"
+++ "b/readme/img/\346\214\207\346\240\207\351\205\215\347\275\256.png"
Binary files differ
diff --git "a/readme/img/\346\250\241\345\236\213\351\205\215\347\275\256.png" "b/readme/img/\346\250\241\345\236\213\351\205\215\347\275\256.png"
index 6a77de9..b999b73 100644
--- "a/readme/img/\346\250\241\345\236\213\351\205\215\347\275\256.png"
+++ "b/readme/img/\346\250\241\345\236\213\351\205\215\347\275\256.png"
Binary files differ
diff --git "a/readme/img/\347\273\237\350\256\241\346\214\207\346\240\207.png" "b/readme/img/\347\273\237\350\256\241\346\214\207\346\240\207.png"
index c2421ff..454eb72 100644
--- "a/readme/img/\347\273\237\350\256\241\346\214\207\346\240\207.png"
+++ "b/readme/img/\347\273\237\350\256\241\346\214\207\346\240\207.png"
Binary files differ
diff --git "a/readme/img/\350\256\241\347\256\227\345\205\254\345\274\217.png" "b/readme/img/\350\256\241\347\256\227\345\205\254\345\274\217.png"
index 5c90a8f..ea123e5 100644
--- "a/readme/img/\350\256\241\347\256\227\345\205\254\345\274\217.png"
+++ "b/readme/img/\350\256\241\347\256\227\345\205\254\345\274\217.png"
Binary files differ
diff --git a/sql/postgre.sql b/sql/postgre.sql
index 239a8bb..97643d9 100644
--- a/sql/postgre.sql
+++ b/sql/postgre.sql
@@ -2234,6 +2234,7 @@
"update_time" timestamp(6)
)
;
+INSERT INTO "public"."sys_dept" ("dept_id", "parent_id", "ancestors", "dept_name", "order_num", "leader", "phone", "email", "status", "del_flag", "create_by", "create_time", "update_by", "update_time") VALUES (1, 0, NULL, '鏅虹⒊鏈潵绉戞妧鏈夐檺鍏徃', 1, NULL, NULL, NULL, '0', 0, 'admin', '2025-03-17 13:09:00', NULL, NULL);
ALTER TABLE "sys_dept" OWNER TO "postgres";
COMMENT ON COLUMN "sys_dept"."dept_id" IS '閮ㄩ棬id';
COMMENT ON COLUMN "sys_dept"."parent_id" IS '鐖堕儴闂╥d';
@@ -3433,7 +3434,11 @@
BEGIN;
LOCK TABLE "public"."sys_user" IN SHARE MODE;
DELETE FROM "public"."sys_user";
-INSERT INTO "public"."sys_user" ("user_id","dept_id","user_name","nick_name","user_type","email","phone_number","sex","avatar","password","status","del_flag","login_ip","login_date","create_by","create_time","update_by","update_time","remark","single_user") VALUES (25, NULL, 'aa1', 'aa', '00', NULL, NULL, '0', NULL, '$2a$10$u9ub/tiHDlQ56DiE6123auKlHdpbXACgHtP4RX2tPpYCGaq7FMdSq', '0', '0', '120.225.217.49', '2024-12-18 15:11:57.426', 'thirdPartGetAuth', '2024-12-18 15:11:57.374536', NULL, '2024-12-18 15:11:57.445301', NULL, '24'),(22, NULL, 'a13', 'a', '00', NULL, NULL, '0', NULL, '$2a$10$dOeiuOTt/2c3MDW0Tn35h.yr5OBvwQuhL7JChmoRkG70V5AkA/ova', '0', '0', NULL, NULL, 'admin', '2024-11-14 15:22:53.251616', NULL, NULL, NULL, NULL),(24, NULL, 'guestUser', '浣撻獙鐢ㄦ埛', '00', NULL, NULL, '0', '/profile/avatar/2025/01/11/寰俊鎴浘_20250109121925_20250111184045A003.png', '$2a$10$OZGdFJV3D7CBKurqiLFaTOInMXZUVc4boSyOPOqVfCiWRVLAGHkRW', '0', '0', '123.168.102.234', '2025-01-18 12:06:26.002', 'admin', '2024-12-04 10:44:29.111243', 'admin', '2025-01-18 12:06:26.005789', NULL, NULL),(23, NULL, 'ceshi', 'ceshi', '00', NULL, NULL, '0', NULL, '$2a$10$ziJEqBj4EuKcp0pwcEffluauZnvoVpSrNtdOwMfQOIZBzBNVu9Ixa', '0', '0', '27.219.144.165', '2024-11-20 10:04:56.266', 'admin', '2024-11-15 14:37:26.096551', 'admin', '2025-01-09 19:01:36.016128', NULL, NULL),(1, 103, 'admin', '绠＄悊鍛�', '00', '', '', '0', '/profile/avatar/2025/01/10/寰俊鎴浘_20250109121925_20250110145027A002.png', '$2a$10$5OXwz0BDzpEmGcI.fXJID.ZNVdNQiD78gYXp5gSUoCkvagcbWwPne', '0', '0', '192.168.110.134', '2025-01-18 14:37:39.517', 'admin', '2018-03-16 11:33:00', 'admin', '2025-01-18 14:37:39.105126', '绠＄悊鍛�', NULL);
+INSERT INTO "public"."sys_user" ("user_id","dept_id","user_name","nick_name","user_type","email","phone_number","sex","avatar","password","status","del_flag","login_ip","login_date","create_by","create_time","update_by","update_time","remark","single_user") VALUES
+(1, 103, 'admin', '绠＄悊鍛�', '00', '', '', '0', '/profile/avatar/2025/01/10/寰俊鎴浘_20250109121925_20250110145027A002.png', '$2a$10$GCHJecgeMGEd0IfS5R17tOP9KxgHJ4SjO.m.e2yyJs95h7LvKyxhi', '0', '0', '192.168.110.134', '2025-01-18 14:37:39.517', 'admin', '2018-03-16 11:33:00', 'admin', '2025-01-18 14:37:39.105126', '绠＄悊鍛�', NULL),
+(23, NULL, 'ceshi', 'ceshi', '00', NULL, NULL, '0', NULL, '$2a$10$GCHJecgeMGEd0IfS5R17tOP9KxgHJ4SjO.m.e2yyJs95h7LvKyxhi', '0', '0', '27.219.144.165', '2024-11-20 10:04:56.266', 'admin', '2024-11-15 14:37:26.096551', 'admin', '2025-01-09 19:01:36.016128', NULL, NULL),
+(24, NULL, 'guestUser', '浣撻獙鐢ㄦ埛', '00', NULL, NULL, '0', '/profile/avatar/2025/01/11/寰俊鎴浘_20250109121925_20250111184045A003.png', '$2a$10$GCHJecgeMGEd0IfS5R17tOP9KxgHJ4SjO.m.e2yyJs95h7LvKyxhi', '0', '0', '123.168.102.234', '2025-01-18 12:06:26.002', 'admin', '2024-12-04 10:44:29.111243', 'admin', '2025-01-18 12:06:26.005789', NULL, NULL);
+
COMMIT;
BEGIN;
LOCK TABLE "public"."sys_user_post" IN SHARE MODE;
--
Gitblit v1.9.3