班级管理

src/main/java/com/stu/stusystem/controller/dto/RegisterDTO.java

@@ -21,7 +21,7 @@ public class RegisterDTO {
     @NotBlank(message = "账号不能为空")
     private String account;
 
-    private String className;
+    private String classId;
 
     @NotBlank(message = "密码不能为空")
     private String password;

src/main/java/com/stu/stusystem/model/StuUser.java

@@ -31,8 +31,8 @@ public class StuUser extends BaseModel {
     @Column(name = "account")
     private String account;
 
-    @Column(name = "class_name")
-    private String className;
+    @Column(name = "class_id")
+    private String classId;
 
     @NotBlank(message = "密码不能为空")
     @Column(name = "password")

src/main/java/com/stu/stusystem/service/LoginService.java

@@ -62,7 +62,7 @@ public class LoginService {
         }
         String authorization = (String) currentUser.getSession().getId();
         StuUser user = (StuUser) SecurityUtils.getSubject().getPrincipal();
-        return new LoginVO(user.getAccount(), user.getName(), user.getClassName(), user.getPhone(), authorization);
+        return new LoginVO(user.getAccount(), user.getName(), user.getClassId(), user.getPhone(), authorization);
     }
 
     /**

src/main/java/com/stu/stusystem/service/dto/UserManagerDTO.java

@@ -26,7 +26,7 @@ public class UserManagerDTO {
     private String account;
 
     @ApiModelProperty("班级id")
-    private String className;
+    private String classId;
 
     @ApiModelProperty("电话")
     private String phone;

src/main/java/com/stu/stusystem/service/dto/UserManagerQuery.java

@@ -13,7 +13,7 @@ public class UserManagerQuery extends OffsetPage {
     @ApiModelProperty("用户名")
     private String name;
 
-    @ApiModelProperty("班级名称")
+    @ApiModelProperty("班级id")
     private String classId;
 
     @ApiModelProperty("联系电话")

src/main/java/com/stu/stusystem/service/IndexService.java → src/main/java/com/stu/stusystem/service/stuClassService.java

@@ -7,6 +7,6 @@ import org.springframework.stereotype.Service;
  * @date 2020/9/24
  */
 @Service
-public class IndexService {
+public class stuClassService {
 
 }

src/main/java/com/stu/stusystem/service/vo/LoginVO.java

@@ -19,8 +19,8 @@ public class LoginVO {
     @ApiModelProperty("用户名")
     private String name;
 
-    @ApiModelProperty("班级")
-    private String className;
+    @ApiModelProperty("班级id")
+    private String classId;
 
     @ApiModelProperty("电话")
     private String phone;

src/main/java/com/stu/stusystem/service/vo/StuUserVO.java

@@ -18,8 +18,8 @@ public class StuUserVO {
     @ApiModelProperty("账号")
     private String account;
 
-    @ApiModelProperty("班级名称")
-    private String className;
+    @ApiModelProperty("班级id")
+    private String classId;
 
     @ApiModelProperty("联系电话")
     private String phone;

src/main/resources/config/liquibase/20200907_creat_table_StuUser.xml

@@ -25,7 +25,7 @@
                 <constraints nullable="true"/>
             </column>
 
-            <column name="class_name" type="varchar(30)" remarks="班级">
+            <column name="class_id" type="varchar(22)" remarks="班级id">
                 <constraints nullable="true"/>
             </column>
 

src/main/resources/config/liquibase/2020_test.xml → src/main/resources/config/liquibase/20210323_creat_table_stuClass.xml

@@ -9,23 +9,47 @@
     <property name="floatType" value="float4" dbms="postgresql, h2"/>
     <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
     <!--
-        Added the entity test.
+        Added the entity stu_class.
     -->
-    <changeSet id="2020-01" author="cxt">
-        <createTable tableName="test" remarks="test表">
+    <changeSet id="2021-03" author="cxt">
+        <createTable tableName="stu_class" remarks="班级表">
             <column name="id" type="varchar(22)">
                 <constraints primaryKey="true" nullable="false"/>
             </column>
 
-            <column name="account" type="varchar(22)" remarks="用户账号">
+            <column name="hospital_name" type="varchar(50)" remarks="学院名称">
                 <constraints nullable="true"/>
             </column>
 
-            <column name="address" type="varchar(20)" remarks="IP地址">
+            <column name="department_name" type="varchar(50)" remarks="系名称">
                 <constraints nullable="true"/>
             </column>
 
-            <column name="time" type="varchar(20)" remarks="时间">
+            <column name="grade" type="varchar(15)" remarks="年级">
+                <constraints nullable="true"/>
+            </column>
+
+            <column name="class_name" type="varchar(50)" remarks="班级名称">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="user_id" type="varchar(22)" remarks="班主任id">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="create_time" type="time" remarks="创建时间">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="create_by" type="varchar(18)" remarks="创建人">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="update_time" type="time" remarks="更新时间">
+                <constraints nullable="true"/>
+            </column>
+
+            <column name="update_by" type="varchar(18)" remarks="更新人">
                 <constraints nullable="true"/>
             </column>
         </createTable>

src/main/resources/config/master.xml

@@ -6,6 +6,6 @@
     <!-- 这里写清楚更改数据的xml文件路径和名字 -->
     <include file="classpath:config/liquibase/20200907_creat_table_StuUser.xml" relativeToChangelogFile="false"/>
     <include file="classpath:config/liquibase/20200914_creat_table_log.xml" relativeToChangelogFile="false"/>
-<!--    <include file="classpath:config/liquibase/2020_test.xml" relativeToChangelogFile="false"/>-->
+    <include file="classpath:config/liquibase/20210323_creat_table_stuClass.xml" relativeToChangelogFile="false"/>
 
 </databaseChangeLog>
\ No newline at end of file

src/main/resources/mapper/StuMapper.xml

@@ -3,17 +3,16 @@
 <mapper namespace="com.stu.stusystem.mapper.StuMapper">
     <select id="getStuMangerPage" resultType="com.stu.stusystem.service.vo.StuUserVO">
                 SELECT  id,name,account,
-                class_name AS className ,
+                class_id AS classId ,
                 phone,id_card AS idCard
                 FROM stu_user
         <where>
             <if test="query.name != null and query.name != ''">
                 name like concat('%', #{query.name},'%')
-
             </if>
-            <!--<if test="param1.classId != null and param1.classId != ''">-->
-            <!--    AND class_id = #{query.classId}-->
-            <!--</if>-->
+            <if test="param1.classId != null and param1.classId != ''">
+                AND class_id = #{query.classId}
+            </if>
             <if test="query.phone != null and query.phone != ''">
 
                                 AND phone = #{query.phone}