From a3f430f02d284bf458d2ba0d036f1e076dfd77f5 Mon Sep 17 00:00:00 2001
From: zlm133588 <13996255+zlm133588@user.noreply.gitee.com>
Date: Sat, 15 Mar 2025 19:57:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=8F=AD=E7=BA=A7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E6=89=80=E6=9C=89=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AES-front/src/api/admin.js                    |  7 ++
 .../views/admin/class/class-assistant-add.vue |  8 ++-
 .../admin/class/class-assistant-list.vue      | 13 ++--
 .../src/views/admin/class/class-list.vue      |  2 +-
 .../class/components/class-assistant-add.vue  |  6 +-
 .../components/class-assistant-select.vue     |  1 -
 .../global/config/HttpInterceptorConfig.java  |  2 +-
 .../user/controller/AdminusersController.java | 31 ++++++++
 .../controller/AssistantClassController.java  | 47 ++++++++++++
 .../example/aes/user/dao/AdminusersDaoI.java  |  9 +++
 .../aes/user/dao/impl/AdminusersDaoImpl.java  | 72 +++++++++++++++++++
 .../example/aes/user/model/UAssistant.java    | 29 ++++++++
 .../aes/user/service/AdminusersServiceI.java  |  3 +
 .../service/impl/AdminusersServiceImpl.java   | 51 +++++++++++++
 14 files changed, 266 insertions(+), 15 deletions(-)
 create mode 100644 AES/src/main/java/com/example/aes/user/controller/AssistantClassController.java
 create mode 100644 AES/src/main/java/com/example/aes/user/model/UAssistant.java

diff --git a/AES-front/src/api/admin.js b/AES-front/src/api/admin.js
index 6ede440..811aabb 100644
--- a/AES-front/src/api/admin.js
+++ b/AES-front/src/api/admin.js
@@ -63,4 +63,11 @@ export default {
       responseType: 'blob',
       params: config,
     }),
+  getAssistantByClassIdPage: (data) => request.post('/adminusers/getAssistantByClassIdPage', data),
+  deleteClassAssistant: (data) => request.post('/assistantClass/deleteClassAssistant', data),
+  findAdminuserByAccount: (data) =>
+    request.post('/adminusers/findAdminuserByAccount', data, { noNeedToken: true }),
+  addClassAssistant: (data) => request.post('/assistantClass/addClassAssistant', data),
+  getAssistantNotBelongClass: (data) =>
+    request.post('/adminusers/getAssistantNotBelongClass', data),
 }
diff --git a/AES-front/src/views/admin/class/class-assistant-add.vue b/AES-front/src/views/admin/class/class-assistant-add.vue
index f9c2730..7fb7b85 100644
--- a/AES-front/src/views/admin/class/class-assistant-add.vue
+++ b/AES-front/src/views/admin/class/class-assistant-add.vue
@@ -46,8 +46,10 @@
 </template>
 
 <script setup>
-import ClassAssistantAdd from "./components/class-assistant-add.vue";
 
-import {PROBLEM_TAB_NAMES} from "@/constant";
-import ClassAssistantSelect from "@/views/admin/class/components/class-assistant-select.vue";
+import { PROBLEM_TAB_NAMES } from '@/constant'
+import ClassAssistantSelect
+  from '@/views/admin/class/components/class-assistant-select.vue'
+import ClassAssistantAdd
+  from '@/views/admin/class/components/class-assistant-add.vue'
 </script>
\ No newline at end of file
diff --git a/AES-front/src/views/admin/class/class-assistant-list.vue b/AES-front/src/views/admin/class/class-assistant-list.vue
index 67c735e..a5c79ef 100644
--- a/AES-front/src/views/admin/class/class-assistant-list.vue
+++ b/AES-front/src/views/admin/class/class-assistant-list.vue
@@ -62,9 +62,7 @@ const classInfoValue = ref({
   pageNum:paginationReactive.page,
   pageSize:paginationReactive.pageSize,
 });
-const onAdd = ()=>{
-  router.push({name: 'ClassAssistantAdd',params:{clId}})
-}
+
 const columns = [
   {
     key: 'no',
@@ -128,8 +126,11 @@ const onChangePage =  (page) => {
     queryByPage()
   }
 }
-const onDetailedAssistant = async (classId)=>{
-  const {id} = classId
+const onAdd = ()=>{
+  router.push({name: 'ClassAssistantAdd',params:{clId}})
+}
+const onDetailedAssistant = async (assistantId)=>{
+  const {id} = assistantId
   await router.push({name: 'ClassAssistantDetail', params: {clId: id}})
 }
 const onPasswordAssistant= async (classId)=>{
@@ -142,7 +143,7 @@ const onDeleteAssistant = async (classId)=>{
   const ids=classInfoValue.value.classId
   const idss=parseInt(ids)
   try {
-    const res = await api.deleteClassAssistan({
+    const res = await api.deleteClassAssistant({
        classId:idss,
       assistantId:id,
   })
diff --git a/AES-front/src/views/admin/class/class-list.vue b/AES-front/src/views/admin/class/class-list.vue
index 7dfd6d7..dbdf6da 100644
--- a/AES-front/src/views/admin/class/class-list.vue
+++ b/AES-front/src/views/admin/class/class-list.vue
@@ -32,7 +32,7 @@
             <n-form-item v-if="
                   userStore.getRole().length > 0 && (userStore.getRole().some((r) => r === 'admin'|| userStore.getRole().some((r) => r === 'teacher')))
                 ">
-              <n-button type="primary" style="margin-right: 10px" @click="onAdd">添加课程班级</n-button>
+              <n-button type="primary" style="margin-right: 10px" @click="onAdd">添加班级</n-button>
             </n-form-item>
           </div>
         </n-form>
diff --git a/AES-front/src/views/admin/class/components/class-assistant-add.vue b/AES-front/src/views/admin/class/components/class-assistant-add.vue
index 989cdb0..bde92ba 100644
--- a/AES-front/src/views/admin/class/components/class-assistant-add.vue
+++ b/AES-front/src/views/admin/class/components/class-assistant-add.vue
@@ -67,7 +67,7 @@ const path=ref('')
 const route = useRoute()
 const router = useRouter()
 const userStore = useUserStore()
-const ids=userStore.getSchoolId()
+// const ids=userStore.getSchoolId()
 const loading =  ref(true)
 const {clId}=route.params
 const assistantInfoValue = ref({
@@ -93,14 +93,14 @@ const Add=async ()=>{
             password:sha256(assistantInfoValue.value.password.trim()).toString(),
             sessionId: generateRandomString(64)+assistantInfoValue.value.password.trim(),
             no:assistantInfoValue.value.no,
-            schoolId:ids
+            // schoolId:ids
       })
       if (res.code==='400'){
       }else {
         if (res.data !== null) {
           const res1 = await api.findAdminuserByAccount({
             account: assistantInfoValue.value.account,
-            schoolId: ids
+            // schoolId: ids
           })
           await api.addClassAssistant({
             classId: clId,
diff --git a/AES-front/src/views/admin/class/components/class-assistant-select.vue b/AES-front/src/views/admin/class/components/class-assistant-select.vue
index 37ee424..1f4ba95 100644
--- a/AES-front/src/views/admin/class/components/class-assistant-select.vue
+++ b/AES-front/src/views/admin/class/components/class-assistant-select.vue
@@ -62,7 +62,6 @@
 
 <script setup>
 import {onMounted, reactive, ref} from "vue";
-import ProblemActions from "@/views/admin/question/components/ProblemActions.vue";
 import api from "@/api/admin";
 import {useRoute, useRouter} from 'vue-router';
 import AssistantAction from "@/views/admin/class/components/assistant-action.vue";
diff --git a/AES/src/main/java/com/example/aes/global/config/HttpInterceptorConfig.java b/AES/src/main/java/com/example/aes/global/config/HttpInterceptorConfig.java
index a64c1a0..47956bc 100644
--- a/AES/src/main/java/com/example/aes/global/config/HttpInterceptorConfig.java
+++ b/AES/src/main/java/com/example/aes/global/config/HttpInterceptorConfig.java
@@ -25,7 +25,7 @@ public class HttpInterceptorConfig extends WebMvcConfigurationSupport {
                         "/api/adminusers" +
                                 "/signTeacher",
                         "/api/adminusers" +
-                                "/confirmQuestionAnswer","/api/adminusers/updatePasswordByAccount");
+                                "/confirmQuestionAnswer","/api/adminusers/updatePasswordByAccount","/api/adminusers/findAdminuserByAccount");
     }
 
 
diff --git a/AES/src/main/java/com/example/aes/user/controller/AdminusersController.java b/AES/src/main/java/com/example/aes/user/controller/AdminusersController.java
index ab894ee..5e85cca 100644
--- a/AES/src/main/java/com/example/aes/user/controller/AdminusersController.java
+++ b/AES/src/main/java/com/example/aes/user/controller/AdminusersController.java
@@ -273,6 +273,37 @@ public class AdminusersController {
 		}
 
 	}
+	@PostMapping("/findAdminuserByAccount")
+	public RespBean findAdminuserByAccount(@RequestBody PMAdminusers pmadminusers) {
+		PMAdminusers adminuser = adminusersServiceI
+				.getAdminuserByAccount(pmadminusers.getAccount());
+		if (adminuser != null) {
+			return RespBean.ok("查询教师信息成功", adminuser);
+		} else {
+			return RespBean.ok("查询教师信息失败");
+		}
+	}
+	@PostMapping("/getAssistantNotBelongClass")
+	public RespBean getAssistantNotBelongClass(@RequestBody UAdminusers uAdminusers) // 查看不属于班级的助教
+	{
+		if(uAdminusers.getPageNum() < 1 || uAdminusers.getPageSize() < 1)
+			return RespBean.error("参数错误");
+		DataGrid dg = adminusersServiceI
+				.getAssistantNotBelongClass(uAdminusers.getClassId(),
+						uAdminusers.getAccount(), uAdminusers.getName(), uAdminusers.getEmail(), uAdminusers.getNo(), uAdminusers.getPageNum(), uAdminusers.getPageSize());
+		return RespBean.ok("查看不属于班级的助教信息成功", dg);
+
+	}
+	@PostMapping("/getAssistantByClassIdPage")
+	public RespBean getAssistantByClassIdPage(@RequestBody UAdminusers uAdminusers) // 获取班级所属的助教
+	{
+		if(uAdminusers.getPageNum() < 1 || uAdminusers.getPageSize() < 1)
+			return RespBean.error("参数错误");
+
+		DataGrid dg = adminusersServiceI
+				.getAssistantByClassIdPage(uAdminusers.getClassId(), uAdminusers.getPageNum(), uAdminusers.getPageSize());
+		return RespBean.ok("查看助教信息成功", dg);
+	}
 
 }
 
diff --git a/AES/src/main/java/com/example/aes/user/controller/AssistantClassController.java b/AES/src/main/java/com/example/aes/user/controller/AssistantClassController.java
new file mode 100644
index 0000000..d326679
--- /dev/null
+++ b/AES/src/main/java/com/example/aes/user/controller/AssistantClassController.java
@@ -0,0 +1,47 @@
+package com.example.aes.user.controller;
+
+
+import com.example.aes.global.model.RespBean;
+import com.example.aes.user.dao.AssistantClassDaoI;
+import com.example.aes.user.model.UAssistant;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/assistantClass")
+@Transactional
+public class AssistantClassController {
+	@Autowired
+	AssistantClassDaoI assistantClassDao;
+
+
+
+	@PostMapping("/deleteClassAssistant")
+	public RespBean deleteClassAssistant(@RequestBody UAssistant uAssistant) // 删除班级的助教
+	{
+		boolean result = assistantClassDao.delAssistantClass(uAssistant.getAssistantId(),
+				uAssistant.getClassId());
+		if (result) {
+			return RespBean.ok("删除班级助教成功");
+		} else {
+			return RespBean.error("删除班级助教失败");
+		}
+	}
+
+	@PostMapping("/addClassAssistant")
+	public RespBean addClassAssistant(@RequestBody UAssistant uAssistant) // 为班级添加助教
+	{
+		boolean result = assistantClassDao.addAssistantClass(uAssistant.getAssistantId(),
+				uAssistant.getClassId());
+		if (result) {
+			return RespBean.ok("添加班级助教成功");
+		} else {
+			return RespBean.error("添加班级助教失败");
+		}
+
+	}
+}
diff --git a/AES/src/main/java/com/example/aes/user/dao/AdminusersDaoI.java b/AES/src/main/java/com/example/aes/user/dao/AdminusersDaoI.java
index 04d88fe..cfa0e46 100644
--- a/AES/src/main/java/com/example/aes/user/dao/AdminusersDaoI.java
+++ b/AES/src/main/java/com/example/aes/user/dao/AdminusersDaoI.java
@@ -26,4 +26,13 @@ public interface AdminusersDaoI extends BaseDaoI<Adminusers> {
 	public boolean addAdminuser(PMAdminusers pmadminusers); // 添加教师
 	public Map<String, String> findTeachersByteacherIdList(String teacherIdList);
 	public List<Adminusers> getTeacher();
+	public long getAssistantByClassIdNum(int classId);
+
+	public List<Adminusers> getAssistantByClassIdPage(int classId, int pageNum, int pageSize); // 获取班级所属的助教
+
+	public List<Adminusers> getAssistantNotBelongClass(int classId,
+													   String account, String name, String email, String no, int pageNum, int pageSize); // 查看不属于班级的助教
+
+	public long getAssistantNotBelongClassNum(int classId,
+											  String account, String name, String email, String no);
 }
diff --git a/AES/src/main/java/com/example/aes/user/dao/impl/AdminusersDaoImpl.java b/AES/src/main/java/com/example/aes/user/dao/impl/AdminusersDaoImpl.java
index e8b34fc..327a5fe 100644
--- a/AES/src/main/java/com/example/aes/user/dao/impl/AdminusersDaoImpl.java
+++ b/AES/src/main/java/com/example/aes/user/dao/impl/AdminusersDaoImpl.java
@@ -373,5 +373,77 @@ public class AdminusersDaoImpl extends BaseDaoImpl<Adminusers> implements
 		List<Adminusers> adminusersList = this.find(hql);
 		return adminusersList;
 	}
+	@Override
+	public long getAssistantByClassIdNum(int classId){
+		String hql = "select count(distinct(a)) from Adminusers a,AssistantClass ac where a.id=ac.assistantId and ac.classId="
+				+ classId;
+		return this.count(hql).longValue();
+	}
 
+	@Override
+	public List<Adminusers> getAssistantByClassIdPage(int classId, int pageNum, int pageSize){
+		// TODO Auto-generated method stub
+		String hql = "select distinct(a) from Adminusers a,AssistantClass ac where a.id=ac.assistantId and ac.classId="
+				+ classId;
+		return this.find(hql, pageNum, pageSize);
+	}
+	@Override
+	public List<Adminusers> getAssistantNotBelongClass(int classId,
+													   String account, String name, String email, String no, int pageNum, int pageSize) {
+		// TODO Auto-generated method stub
+		String hql = "select distinct(a) from Adminusers a where a.role='assistant' and a.id not in (select ac.assistantId from AssistantClass ac where ac.classId=:classId)";
+		if (account != null && account.length() > 0) {
+			hql = hql + " and a.account like :account";
+		}
+		if (name != null && name.length() > 0) {
+			hql = hql + " and a.name like :name";
+		}
+		if(email != null && email.length() > 0){
+			hql = hql + " and a.email like :email";
+		}
+		if(no != null && no.length() > 0){
+			hql = hql + " and a.no like :no";
+		}
+		Query q = this.getCurrentSession().createQuery(hql);
+		q.setParameter("classId", classId);
+		if (account != null && account.length() > 0)
+			q.setParameter("account", "%" + account + "%");
+		if (name != null && name.length() > 0)
+			q.setParameter("name", "%" + name + "%");
+		if(email != null && email.length() > 0)
+			q.setParameter("email","%" + email + "%");
+		if(no != null && no.length() > 0)
+			q.setParameter("no", "%" + no + "%");
+		return q.setFirstResult((pageNum - 1) * pageSize).setMaxResults(pageSize).list();
+	}
+
+	@Override
+	public long getAssistantNotBelongClassNum(int classId,
+											  String account, String name, String email, String no){
+		// TODO Auto-generated method stub
+		String hql = "select distinct(a) from Adminusers a where a.role='assistant' and a.id not in (select ac.assistantId from AssistantClass ac where ac.classId=:classId)";
+		if (account != null && account.length() > 0) {
+			hql = hql + " and a.account like :account";
+		}
+		if (name != null && name.length() > 0) {
+			hql = hql + " and a.name like :name";
+		}
+		if(email != null && email.length() > 0){
+			hql = hql + " and a.email like :email";
+		}
+		if(no != null && no.length() > 0){
+			hql = hql + " and a.no like :no";
+		}
+		Query q = this.getCurrentSession().createQuery(hql);
+		q.setParameter("classId", classId);
+		if (account != null && account.length() > 0)
+			q.setParameter("account", "%" + account + "%");
+		if (name != null && name.length() > 0)
+			q.setParameter("name", "%" + name + "%");
+		if(email != null && email.length() > 0)
+			q.setParameter("email","%" + email + "%");
+		if(no != null && no.length() > 0)
+			q.setParameter("no", "%" + no + "%");
+		return q.list().size();
+	}
 }
diff --git a/AES/src/main/java/com/example/aes/user/model/UAssistant.java b/AES/src/main/java/com/example/aes/user/model/UAssistant.java
new file mode 100644
index 0000000..da93e30
--- /dev/null
+++ b/AES/src/main/java/com/example/aes/user/model/UAssistant.java
@@ -0,0 +1,29 @@
+package com.example.aes.user.model;
+
+public class UAssistant {
+    private int assistantId;
+    private int classId;
+
+    public UAssistant(){}
+
+    public UAssistant(int assistantId, int classId) {
+        this.assistantId = assistantId;
+        this.classId = classId;
+    }
+
+    public int getAssistantId() {
+        return assistantId;
+    }
+
+    public void setAssistantId(int assistantId) {
+        this.assistantId = assistantId;
+    }
+
+    public int getClassId() {
+        return classId;
+    }
+
+    public void setClassId(int classId) {
+        this.classId = classId;
+    }
+}
diff --git a/AES/src/main/java/com/example/aes/user/service/AdminusersServiceI.java b/AES/src/main/java/com/example/aes/user/service/AdminusersServiceI.java
index 918e5ef..aec1b31 100644
--- a/AES/src/main/java/com/example/aes/user/service/AdminusersServiceI.java
+++ b/AES/src/main/java/com/example/aes/user/service/AdminusersServiceI.java
@@ -28,5 +28,8 @@ public interface AdminusersServiceI {
 	public boolean editAdminuser(PMAdminusers pmadminusers); // 编辑教师信息
 	public boolean addAdminuser(PMAdminusers pmadminusers); // 添加教师
 	public List<Adminusers> getTeacher();
+	public DataGrid getAssistantByClassIdPage(int classId, int pageNum, int pageSize); // 获取班级所属的助教
+	public DataGrid getAssistantNotBelongClass(int classId,
+											   String account, String name, String email, String no, int pageNum, int pageSize); // 查看不属于班级的助教
 
 }
diff --git a/AES/src/main/java/com/example/aes/user/service/impl/AdminusersServiceImpl.java b/AES/src/main/java/com/example/aes/user/service/impl/AdminusersServiceImpl.java
index c35ce9d..fcbb4c8 100644
--- a/AES/src/main/java/com/example/aes/user/service/impl/AdminusersServiceImpl.java
+++ b/AES/src/main/java/com/example/aes/user/service/impl/AdminusersServiceImpl.java
@@ -264,5 +264,56 @@ public class AdminusersServiceImpl implements AdminusersServiceI {
 		else
 			return null;
 	}
+	@Override
+	public DataGrid getAssistantByClassIdPage(int classId, int pageNum, int pageSize){
+		long totalLines = adminusersDao.getAssistantByClassIdNum(classId);
+		List<Adminusers> list = adminusersDao.getAssistantByClassIdPage(classId, pageNum, pageSize);
+		List<PMAdminusers> plist = new ArrayList();
+		for (int i = 0; i < list.size(); i++) {
+			Adminusers a = list.get(i);
+			PMAdminusers p = new PMAdminusers();
+			p.setId(a.getId());
+			p.setAccount(a.getAccount());
+			p.setName(a.getName());
+			p.setNo(a.getNo());
+			p.setEmail(a.getEmail());
+			plist.add(p);
+		}
+		DataGrid dg = new DataGrid();
+		dg.setTotal(totalLines);
+		dg.setPageSize(pageSize);
+		dg.setTotalPages((long) (Math.ceil((double) dg.getTotal() / (double) dg.getPageSize())));
+		dg.setPageNum(pageNum);
+		dg.setCurrentPageLineNum(plist.size());
+		dg.setList(plist);
+		return dg;
+	}
+	@Override
+	public DataGrid getAssistantNotBelongClass(int classId,
+											   String account, String name, String email, String no, int pageNum, int pageSize) {
+		// TODO Auto-generated method stub
+		DataGrid dg = new DataGrid();
+		long totalLines = adminusersDao.getAssistantNotBelongClassNum(classId, account, name, email, no);
+		List<Adminusers> list = adminusersDao.getAssistantNotBelongClass(
+				classId, account, name, email, no, pageNum, pageSize);
+		List<PMAdminusers> plist = new ArrayList();
+		for (int i = 0; i < list.size(); i++) {
+			Adminusers a = list.get(i);
+			PMAdminusers p = new PMAdminusers();
+			p.setId(a.getId());
+			p.setAccount(a.getAccount());
+			p.setName(a.getName());
+			p.setEmail(a.getEmail());
+			p.setNo(a.getNo());
+			plist.add(p);
+		}
+		dg.setTotal(totalLines);
+		dg.setPageSize(pageSize);
+		dg.setTotalPages((long) (Math.ceil((double) dg.getTotal() / (double) dg.getPageSize())));
+		dg.setPageNum(pageNum);
+		dg.setCurrentPageLineNum(plist.size());
+		dg.setList(plist);
+		return dg;
+	}
 
 }