update

edu-user/edu-student-server/src/main/java/com/keao/edu/controller/ExamSubjectController.java

@@ -25,9 +25,16 @@ public class ExamSubjectController extends BaseController {
 
     @ApiOperation("获取考试项目专业")
     @ApiImplicitParam(name = "ExamId", value = "考试项目id", required = true, dataType = "Integer")
-    @GetMapping(value = "/getExamSubjects")
-    public HttpResponseResult<List<Subject>> getExamSubjects(Integer examId) {
+    @GetMapping(value = "/getStudentExamSubjects")
+    public HttpResponseResult<List<ExamSubjectDto>> getExamSubjects(Integer examId) {
         return succeed(examSubjectService.getExamSubjects(examId));
     }
 
+    @ApiOperation("获取项目曲库专业")
+    @ApiImplicitParam(name = "ExamId", value = "考试项目id", required = true, dataType = "Integer")
+    @GetMapping(value = "/getExamSubjects")
+    public HttpResponseResult<List<Subject>> getStudentExamSubjects(Integer examId) {
+        return succeed(examSubjectService.getStudentExamSubjects(examId));
+    }
+
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamSubjectDao.java

@@ -29,7 +29,7 @@ public interface ExamSubjectDao extends BaseDAO<Long, ExamSubject> {
      * @param examId 考级项目编号
      * @return
      */
-    List<Subject> getSubjectWithExamId(@Param("examId") Integer examId,@Param("studentId") Integer studentId);
+    List<ExamSubjectDto> getSubjectWithExamId(@Param("examId") Integer examId);
 
     /**
      * @describe 获取与考级项目无关的专业
@@ -42,4 +42,10 @@ public interface ExamSubjectDao extends BaseDAO<Long, ExamSubject> {
     List<Subject> getUnRelatedWithExamSubjects(@Param("tenantId") Integer tenantId,
                                                @Param("examId") Integer examId);
 
+    /**
+     * 获取曲库专业
+     * @param examId
+     * @return
+     */
+    List<Subject> getStudentExamSubjects(@Param("examId")Integer examId,@Param("studentId") Integer studentId);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/ExamSubjectService.java

@@ -17,7 +17,7 @@ public interface ExamSubjectService extends BaseService<Long, ExamSubject> {
      * @param ExamId
      * @return
      */
-    List<Subject> getExamSubjects(Integer ExamId);
+    List<ExamSubjectDto> getExamSubjects(Integer ExamId);
 
     /**
      * @describe 获取与考级项目无关的专业
@@ -28,4 +28,11 @@ public interface ExamSubjectService extends BaseService<Long, ExamSubject> {
      * @return java.util.List<com.keao.edu.user.entity.Subject>
      */
     List<Subject> getUnRelatedWithExamSubjects(Integer tenantId,Integer examId);
+
+    /**
+     * 获取曲库专业
+     * @param examId
+     * @return
+     */
+    List<Subject> getStudentExamSubjects(Integer examId);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/ExcelInService.java

@@ -0,0 +1,14 @@
+package com.keao.edu.user.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+public interface ExcelInService{
+
+    /**
+     * 曲库导入
+     * @param file
+     */
+    void excelInSong(MultipartFile file) throws IOException;
+}

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamSubjectServiceImpl.java

@@ -28,13 +28,18 @@ public class ExamSubjectServiceImpl extends BaseServiceImpl<Long, ExamSubject> i
 	}
 
     @Override
-    public List<Subject> getExamSubjects(Integer ExamId) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		return examSubjectDao.getSubjectWithExamId(ExamId,sysUser.getId());
+    public List<ExamSubjectDto> getExamSubjects(Integer ExamId) {
+		return examSubjectDao.getSubjectWithExamId(ExamId);
     }
 
 	@Override
 	public List<Subject> getUnRelatedWithExamSubjects(Integer tenantId, Integer examId) {
 		return examSubjectDao.getUnRelatedWithExamSubjects(tenantId, examId);
 	}
+
+	@Override
+	public List<Subject> getStudentExamSubjects(Integer examId) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		return examSubjectDao.getStudentExamSubjects(examId,sysUser.getId());
+	}
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExcelInServiceImpl.java

@@ -0,0 +1,40 @@
+package com.keao.edu.user.service.impl;
+
+
+import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.user.service.ExcelInService;
+import com.keao.edu.util.collection.MapUtil;
+import com.keao.edu.util.excel.POIUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.beans.IntrospectionException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@Service
+public class ExcelInServiceImpl implements ExcelInService {
+	@Override
+	public void excelInSong(MultipartFile file) throws IOException {
+		Map<String, List<Map<String, Object>>> stringListMap = POIUtil.importExcel(file.getInputStream(), 2,file.getOriginalFilename());
+		Set<String> strings = stringListMap.keySet();
+		List<SysUser> sysUserList = new ArrayList<>();
+		strings.forEach(e->{
+			List<Map<String, Object>> maps = stringListMap.get(e);
+			maps.forEach(m->{
+				try {
+					sysUserList.add(MapUtil.mapToJavaBean(SysUser.class, m));
+				} catch (IllegalAccessException e1) {
+					e1.printStackTrace();
+				} catch (IntrospectionException e1) {
+					e1.printStackTrace();
+				} catch (InstantiationException e1) {
+					e1.printStackTrace();
+				}
+			});
+		});
+	}
+}

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamSubjectMapper.xml

@@ -84,11 +84,9 @@
 	<resultMap id="ExamSubjectDto" type="com.keao.edu.user.dto.ExamSubjectDto" extends="com.keao.edu.user.dao.SubjectDao.Subject" >
 		<result column="exam_subject_id_" property="examSubjectId" />
 	</resultMap>
-	<select id="getSubjectWithExamId" resultMap="com.keao.edu.user.dao.SubjectDao.Subject">
-		SELECT s.* FROM exam_registration er
-		LEFT JOIN subject s on er.subject_id_ = s.id_
-		WHERE er.examination_basic_id_ = #{examId} AND er.student_id_ = #{studentId}
-		GROUP BY s.id_
+	<select id="getSubjectWithExamId" resultMap="ExamSubjectDto">
+		SELECT es.id_ exam_subject_id_ ,s.* FROM exam_subject es
+		LEFT JOIN subject s on es.subject_id_ = s.id_ WHERE examination_basic_id_ = #{examId}
 	</select>
 
     <select id="getUnRelatedWithExamSubjects" resultMap="com.keao.edu.user.dao.SubjectDao.Subject">
@@ -102,4 +100,10 @@
 			AND s.tenant_id_ = #{tenantId}
 			AND NOT EXISTS (SELECT subject_id_ FROM exam_subject WHERE examination_basic_id_=#{examId} AND subject_id_=s.id_)
     </select>
+	<select id="getStudentExamSubjects" resultMap="com.keao.edu.user.dao.SubjectDao.Subject">
+		SELECT s.* FROM exam_registration er
+		LEFT JOIN subject s on er.subject_id_ = s.id_
+		WHERE er.examination_basic_id_ = #{examId} AND er.student_id_ = #{studentId}
+		GROUP BY s.id_
+	</select>
 </mapper>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExcelInController.java

@@ -3,10 +3,12 @@ package com.keao.edu.user.controller;
 
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.user.service.ExcelInService;
 import com.keao.edu.util.collection.MapUtil;
 import com.keao.edu.util.excel.POIUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,14 +24,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@RequestMapping
+@RequestMapping("excelIn")
 @Api(tags = "数据导入服务")
 @RestController
 public class ExcelInController extends BaseController {
 
-    @ApiOperation(value = "导入")
-    @PostMapping("/queryTeacherAttendances")
-    public void ImportTeacherAttendances(@RequestParam("file") MultipartFile file) throws IOException {
+    @Autowired
+    private ExcelInService excelInService;
+
+    @ApiOperation(value = "曲库导入")
+    @PostMapping("/song")
+    public void excelInSong(@RequestParam("file") MultipartFile file) throws IOException {
+        excelInService.excelInSong(file);
+
         Map<String, List<Map<String, Object>>> stringListMap = POIUtil.importExcel(file.getInputStream(), 2,file.getOriginalFilename());
         Set<String> strings = stringListMap.keySet();
         List<SysUser> sysUserList = new ArrayList<>();

edu-user/edu-user-server/src/main/resources/columnMapper.ini

@@ -1,6 +1,6 @@
 曲目名称=songName
 曲目作者=songAuthor
-所属声部=subjectList
+曲目专业=subjectList
 曲目级别=levelList
 曲目类别(练习曲or演奏曲)=type
 曲谱=fileUrlList