Merge branch 'wheng' of wuheng/eas-system into master

authority.json

@@ -0,0 +1,140 @@
+{
+    "student":[
+        "/login/getUserInfo",
+        "/login/refreshToken",
+        "/login/logout",
+        "/login/userProFile",
+        "/login/getUserProFile",
+        
+        "/classroom/query",
+        "/class/selectTotal",
+        "/attendance/queryAttendance",
+        "/archive/refreshArchive",
+        
+        "/userinfo/queryAll",
+        "/category/query",
+        "/class/selectTotal",
+        "/classroom/query",
+        "/schedule/querySchedule",
+        "/schedule/dashboardWorkbench",
+        
+        "/attendance/getStudentList",
+        
+        "/scores/queryScores",
+        
+        "/student/getStudentByKeyword",
+        "/archive/getArchives",
+        "/archive/getTokenByArchiveNumber",
+        "/archive/getFileByToken"
+    ],
+    "teacher":[
+        
+        "/login/getUserInfo",
+        "/login/refreshToken",
+        "/login/logout",
+        "/login/userProFile",
+        "/login/getUserProFile",
+        
+        "/userinfo/queryAll",
+        "/classroom/query",
+        "/schedule/querySchedule",
+        "/schedule/dashboardWorkbench",
+        
+        
+        "/class/selectCondition",
+        "/class/groupStudent",
+        "/classroom/query",
+        
+        "/student/getStudentByKeyword",
+        "/archive/getArchives",
+        "/archive/getTokenByArchiveNumber",
+        "/archive/getFileByToken",
+        "/archive/refreshArchive",
+        
+        "/class/selectTotal",
+        "/category/query",
+        "/attendance/getStudentList",
+        "/scores/queryScores",
+        "/attendance/queryAttendance",
+        
+        "/department/query",
+        "/userinfo/query",
+        "/student/query",
+        "/subject/query",
+        
+        "/attendance/update"
+        
+    ],
+    "easgroup":[
+    
+        "/login/getUserInfo",
+        "/login/refreshToken",
+        "/login/logout",
+        "/login/userProFile",
+        "/login/getUserProFile",
+        
+        "/userinfo/queryAll",
+        "/classroom/query",
+        "/schedule/querySchedule",
+        "/schedule/dashboardWorkbench",
+        "/schedule/delete"
+        
+        "/class/selectCondition",
+        "/class/groupStudent",
+        "/classroom/query",
+        
+        "/student/getStudentByKeyword",
+        "/archive/getArchives",
+        "/archive/getTokenByArchiveNumber",
+        "/archive/getFileByToken",
+        "/archive/refreshArchive",
+        
+        "/class/selectTotal",
+        "/category/query",
+        "/attendance/getStudentList",
+        "/scores/queryScores",
+        "/attendance/queryAttendance",
+        
+        "/department/query",
+        "/userinfo/query",
+        "/student/query",
+        "/subject/query",
+        
+        "/class/addClass",
+        "/student/getAll",
+        "/class/deleteClass/*",
+        "/class/updateClass",
+        "/class/queryClassStudentByGroupId/*",
+        "/class/groupStudent/*",
+        "/schedule/add*",
+        
+        "/department/add",
+        
+        "/userinfo/add",
+        "/userinfo/delete",
+        "/userinfo/update",
+        
+        "/student/add",
+        "/student/del/*",
+        "/student/update",
+        "/student/upload*",
+        "/student/addArchives",
+        "/student/delArchives/*",
+        "/student/downloadArchives",
+        "/student/importExcel",
+        
+        "/category/add",
+        "/category/update",
+        "/category/delete/*",
+        
+        "/subject/add",
+        "/category/update",
+        "/category/delete/*"
+    ],
+    "admin":[
+        "/**"
+    ]
+}
+
+
+

controller/src/main/resources/application.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8080
 spring:
   profiles:
     active: wheng

dao/src/main/java/com/koobietech/eas/dao/mapper/LessonMapper.java

@@ -0,0 +1,13 @@
+package com.koobietech.eas.dao.mapper;
+
+import com.koobietech.eas.dao.pojo.LessonPojo;
+
+public interface LessonMapper {
+
+    LessonPojo getTeacherboard(int uid);
+
+    LessonPojo getStudentboard(int uid);
+
+    LessonPojo getAllboard();
+
+}

dao/src/main/java/com/koobietech/eas/dao/pojo/LessonPojo.java

@@ -0,0 +1,10 @@
+package com.koobietech.eas.dao.pojo;
+
+import lombok.Data;
+
+@Data
+public class LessonPojo {
+    private int alltotal;
+    private int pending;
+    private int attendance;
+}

dao/src/main/resources/com/koobietech/eas/dao/mapper/LessonMapper.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.koobietech.eas.dao.mapper.LessonMapper">
+
+    <select id="getTeacherboard" resultType="com.koobietech.eas.dao.pojo.LessonPojo" >
+        SELECT
+
+        ( SELECT COUNT(*) AS alltotal FROM eas_edu_schedule WHERE teacher_id = #{uid} ) AS alltotal,
+
+        ( SELECT COUNT(*) AS pending  FROM eas_edu_schedule  WHERE teacher_id = #{uid}  AND start_time &gt; NOW()
+        AND end_time &lt; DATE_FORMAT( CURDATE() + INTERVAL ( 24-1 ) HOUR, '%Y-%m-%d 23:59:59' )
+        ) AS pending,
+
+        ( SELECT count(*) AS attendance  FROM eas_arc_tls_attendance  WHERE schedule_id IN
+        ( SELECT id FROM eas_edu_schedule WHERE teacher_id = #{uid} AND end_time &lt; NOW() )  AND ( ISNULL( `month` ) OR ISNULL( `afternoon` ) )
+        ) AS attendance
+
+    </select>
+
+    <select id="getStudentboard" resultType="com.koobietech.eas.dao.pojo.LessonPojo" >
+        SELECT
+
+            ( SELECT COUNT(*) AS alltotal FROM eas_edu_schedule ) AS alltotal,
+
+            ( SELECT COUNT(*) AS pending  FROM eas_edu_schedule  WHERE start_time &gt; NOW()
+                   AND end_time &lt; DATE_FORMAT( CURDATE() + INTERVAL ( 24-1 ) HOUR, '%Y-%m-%d 23:59:59' )
+            ) AS pending,
+
+            ( SELECT count(*) AS attendance  FROM eas_arc_tls_attendance  WHERE schedule_id IN
+                 ( SELECT id FROM eas_edu_schedule WHERE end_time &lt; NOW() )  AND ( ISNULL( `month` ) OR ISNULL( `afternoon` ) )
+            ) AS attendance
+    </select>
+
+    <select id="getAllboard" resultType="com.koobietech.eas.dao.pojo.LessonPojo" >
+        SELECT
+        ( SELECT COUNT(*) AS alltotal FROM eas_edu_schedule WHERE class_id IN (
+        SELECT class_id FROM eas_edu_clt_relation WHERE student_id = #{uid}
+        ) ) AS alltotal,
+
+        ( SELECT COUNT(*) AS pending  FROM eas_edu_schedule  WHERE class_id IN (
+        SELECT class_id FROM eas_edu_clt_relation WHERE student_id = #{uid}
+        ) AND start_time &gt; NOW()
+        AND end_time &lt; DATE_FORMAT( CURDATE() + INTERVAL ( 24-1 ) HOUR, '%Y-%m-%d 23:59:59' )
+        ) AS pending,
+
+        ( SELECT count(*) AS attendance  FROM eas_arc_tls_attendance  WHERE schedule_id IN
+        ( SELECT id FROM eas_edu_schedule WHERE class_id IN (
+        SELECT class_id FROM eas_edu_clt_relation WHERE student_id = #{uid}
+        ) AND end_time &lt; NOW() )  AND ( ISNULL( `month` ) OR ISNULL( `afternoon` ) )
+        ) AS attendance
+    </select>
+</mapper>

docker-compose.yml

@@ -9,8 +9,4 @@ services:
       - local_public
 networks:
   local_public:
-    external: true
-    
-volumes:
-  uploadfiel:
     external: true