diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..ec068fd7224c68060f4d425518cb3a8b1638c780
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/../../../../../:\zuoye\数据结构与算法分析\lec07-heap\.idea/dataSources/
+/dataSources.local.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1bb046f99d2e15d791ad96d4cecedb01f0d2b55d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="10" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b16effcb15582734970db92fdd35ef4b55314bc0
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/lec07-heap.iml" filepath="$PROJECT_DIR$/lec07-heap.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Heap.java b/Heap.java
new file mode 100644
index 0000000000000000000000000000000000000000..10691ff8b3f342d8600a9d31de667bb930286f09
--- /dev/null
+++ b/Heap.java
@@ -0,0 +1,70 @@
+
+public class Heap<T extends Comparable<T>> {
+    private T[] heap;
+    private int size;
+    private int count;
+
+    Heap(int size) {
+        this.size = size + 1;
+        // reference: https://stackoverflow.com/questions/34827626/cannot-be-cast-to-ljava-lang-comparable
+        heap = (T[]) new Comparable[this.size];
+        count = 0;
+    }
+
+    public void add(T item) {
+        if (count >= size) {
+            // throw new Exception("Heap Overflow");
+            System.out.println("Heap Full");
+            return;
+        }
+        heap[++count] = item;
+        int position = count;
+        while ((position >> 1) >= 1 && heap[position].compareTo(heap[position >> 1]) > 0) {
+            //成立交换位置
+            T t = heap[position];
+            heap[position] = heap[position >> 1];
+            heap[position >> 1] = t;
+            position = position >> 1;
+        }
+    }
+
+    public T removeTop() {
+        if (isNull()) {
+            System.out.println("Heap Null");
+            return null;
+        }
+        T returnData = heap[1];
+        heap[1] = heap[count--];//最后一个拿到第一个
+        int position = 1;
+        while (true) {
+            int positionBackup = position;
+            if ((2 * position) <= count && heap[2 * position].compareTo(heap[positionBackup]) > 0) {
+                positionBackup = 2 * position;
+            }
+            if ((2 * position + 1) <= count && heap[2 * position + 1].compareTo(heap[positionBackup]) > 0) {
+                positionBackup = 2 * position + 1;
+            }
+            if (positionBackup == position) {
+                break;//无需交换退出循环
+            }
+            T t = heap[position];
+            heap[position] = heap[positionBackup];
+            heap[positionBackup] = t;
+            position = positionBackup;
+        }
+        return returnData;
+    }
+
+    //isNull
+    public boolean isNull() {
+        return count == 0;
+    }
+
+    public void print() {
+        String str = "";
+        for (int i = 1; i < count; i++) {
+            str += heap[i] + " ";
+        }
+        System.out.println(str);
+    }
+}
\ No newline at end of file
diff --git a/HeapSort.java b/HeapSort.java
new file mode 100644
index 0000000000000000000000000000000000000000..030cc082fc1341bddb23e97a309b4ca41acfebe9
--- /dev/null
+++ b/HeapSort.java
@@ -0,0 +1,16 @@
+
+public class HeapSort<T extends Comparable<T>> {
+    public T[] sort(T[] array) {
+        int length = array.length;
+        Heap heap = new Heap(length);
+        for (int i=0;i<length;i++){
+            heap.add(array[i]);
+        }
+        T[] tArray = (T[]) new Comparable[length];
+        for (int i=0;i<length;i++){
+            tArray[i]= (T) heap.removeTop();
+        }
+        return tArray;
+    }
+
+}
diff --git a/Main.java b/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..6fb3ec40e61d96c62c4605d8ca6ce6c5196da194
--- /dev/null
+++ b/Main.java
@@ -0,0 +1,25 @@
+
+import java.util.Arrays;
+public class Main {
+
+    private static final int HeapSize = 30;
+
+    public static void main(String[] args) {
+        Heap heap = new Heap(HeapSize);
+        System.out.println("⼤顶堆");
+        for (int i = 0; i < HeapSize; i++) {
+            heap.add((Integer)i);
+        }
+        heap.print();
+        heap.removeTop();
+        heap.print();
+        heap.removeTop();
+        heap.print();
+        System.out.println("排序");
+        String [] strArrey = {"5","6","9","1","8","2","7"};
+        HeapSort heapSort=new HeapSort();
+        Comparable[] sortArrey = heapSort.sort(strArrey);
+        System.out.println("原始数组："+ Arrays.toString(strArrey));
+        System.out.println("堆排序："+Arrays.toString(sortArrey));
+    }
+}
diff --git a/README.md b/README.md
index e931f2f0393b17470887781a3e4325a8e502941d..41aca87a2caf0d420ec69ba324b7a612a5db5f15 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,12 @@
 
 ### 截止日期
 
-下次实验课上课前（12.16)
+- 基础-1 下次实验课上课前（12.16)
+- 基础-2 12.23
 
 ### 基础
 
-1. 实现⼀个小顶堆或者⼤顶堆
+1. 实现小顶堆或者大顶堆
  - (1) 定义堆的数据结构
  - (2) 实现入堆函数
  - (3) 实现出堆函数
@@ -20,7 +21,7 @@
 ### 进阶
 
 1. 利用优先级队列合并K个有序数组
-2. 求⼀组动态数据集合的最⼤Top K
+2. 求一组动态数据集合的Top K
 
 ## 工作流程
 
diff --git a/lec07-heap.iml b/lec07-heap.iml
new file mode 100644
index 0000000000000000000000000000000000000000..b107a2dd81165eaaf682ad3da030668b937fbb6c
--- /dev/null
+++ b/lec07-heap.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file