Merge branch 'master' of D:\liuwanr with conflicts.

src/main/java/com/yipin/liuwanr/controller/ExperimentalClassController.java

@@ -297,7 +297,7 @@ public class ExperimentalClassController {
 		Integer schoolId = experimentalClass.getSchoolId();
 		if (schoolId==null) {
 			resp.setStatus(300);
-			resp.setErrmessage("Parameter Invalid");
+			resp.setErrmessage("学校为空，新增失败！");
 		}else {
 			HashMap<String, Object> ret = classService.addExperimentalClass(experimentalClass);
 			Integer experimentalClassId = experimentalClass.getExperimentalClassId();
@@ -336,7 +336,7 @@ public class ExperimentalClassController {
 		Integer experimentalClassId = experimentalClass.getExperimentalClassId();
 		if (experimentalClassId==null) {
 			resp.setStatus(300);
-			resp.setErrmessage("Parameter cannot be empty");
+			resp.setErrmessage("实验班级为空，删除失败！");
 		}else {
 			HashMap<String, Object> ret = classService.deleteExperimentalClass(experimentalClassId);
 			int status = (int) ret.get("retcode");

src/main/java/com/yipin/liuwanr/mapper/ExperimentalClassMapper.java

@@ -14,8 +14,8 @@ import com.yipin.liuwanr.entity.Professional;
 import com.yipin.liuwanr.entity.StuProfessionalArchitecture;
 import com.yipin.liuwanr.entity.Student;
 
-public interface ExperimentalClassMapper {
 
+public interface ExperimentalClassMapper {
 	@Insert("INSERT INTO experimental_class_student(studentId,experimentalClassId)"
 			+ "VALUES(#{studentId},#{experimentalClassId})")
 	void experimentClassAddStudent(Student student);
@@ -64,6 +64,9 @@ public interface ExperimentalClassMapper {
 	@Update("UPDATE experimental_class_ning SET isdel = 1 where experimentalClassId = #{experimentalClassId}")
 	void deleteExperimentalClass(Integer experimentalClassId);
 
+	@Delete("Delete from experimental_class_student where experimentalClassId = #{experimentalClassId}")
+	void deleteExperimentalClassStu(Integer experimentalClassId);
+
 	@Update("UPDATE experimental_class_ning SET experimentalClassName = #{experimentalClassName},classSize = #{classSize},practiceNumber = #{practiceNumber},inspectionNumber = #{inspectionNumber},courseSchedule = #{courseSchedule},founder = #{founder},courseId = #{courseId} where experimentalClassId = #{experimentalClassId}")
 	void updateExperimentalClass(ExperimentalClass experimentalClass);
 	

src/main/java/com/yipin/liuwanr/mapper/ExperimentallearningMapper.java

@@ -68,8 +68,8 @@ public interface ExperimentallearningMapper {
 	 * @param studentId
 	 * @return
 	 */
-	@Select("select ecn.experimentalClassId from experimental_class_ning ecn left join experimental_class_student ecs on ecn.experimentalClassId=ecs.experimentalClassId where\n" +
+	@Select("select ecn.experimentalClassId from experimental_class_ning ecn left join experimental_class_student ecs on ecn.experimentalClassId=ecs.experimentalClassId where " +
-			"ecn.courseId=#{courseId} and ecs.studentId=#{studentId} GROUP BY ecn.experimentalClassId")
+			"ecn.courseId=#{courseId} and ecs.studentId=#{studentId} and ecn.isdel=0 GROUP BY ecn.experimentalClassId")
 	Integer queryExperimentalClassId(@Param("courseId") Integer courseId,@Param("studentId")Integer studentId);
 
 	/**
@@ -123,6 +123,6 @@ public interface ExperimentallearningMapper {
 
 
 	@Select("select DISTINCT hpm.projectId,projectName,isAttendance from hr_project_management hpm left join teacher_project tp on hpm.projectId=tp.projectId " +
-			" where tp.courseId=#{courseId} and tp.experimentalClassId=#{experimentalClassId} and  tp.isOpenProject=0 and hpm.isShow=0")
+			" where tp.courseId=#{courseId} and tp.experimentalClassId=#{experimentalClassId} and  tp.isOpenProject=0")
 	List<Project_Management> getBycourseId(@Param("experimentalClassId")Integer experimentalClassId,@Param("courseId") Integer courseId);
 }

src/main/java/com/yipin/liuwanr/service/ExperimentalClassService.java

@@ -233,11 +233,12 @@ public class ExperimentalClassService {
         return resp;
     }
 
-
+    //删除实验班级和删除实验班级下所有学生
     public HashMap<String, Object> deleteExperimentalClass(Integer experimentalClassId) {
         HashMap<String, Object> resp = new HashMap<String, Object>();
         try {
             experimentalClassMapper.deleteExperimentalClass(experimentalClassId);
+            experimentalClassMapper.deleteExperimentalClassStu(experimentalClassId);
             resp.put("retcode", 200);
         } catch (RuntimeException e) {
             logger.error(e.getMessage());
@@ -247,6 +248,20 @@ public class ExperimentalClassService {
         }
         return resp;
     }
+    //删除实验班级下的所有学生
+//    public HashMap<String, Object> deleteExperimentalClassStu(Integer experimentalClassId) {
+//        HashMap<String, Object> resp = new HashMap<String, Object>();
+//        try {
+//            experimentalClassMapper.deleteExperimentalClassStu(experimentalClassId);
+//            resp.put("retcode", 200);
+//        } catch (RuntimeException e) {
+//            logger.error(e.getMessage());
+//            resp.put("retcode", 500);
+//            resp.put("retvalue", "删除实验班级失败！");
+//            return resp;
+//        }
+//        return resp;
+//    }
 
     public HashMap<String, Object> updateExperimentalClass(ExperimentalClass experimentalClass) {
         HashMap<String, Object> resp = new HashMap<String, Object>();

src/main/java/com/yipin/liuwanr/service/ExperimentallearningService.java

@@ -44,6 +44,7 @@ public class ExperimentallearningService {
 		try {
 			if(!StringUtils.isEmpty(courseId)&&!StringUtils.isEmpty(studentId)){
 				Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId);
+				if(!StringUtils.isEmpty(experimentalClassId)){
 					List<Integer> projectIds = mapper.queryIsAttendance(studentId, courseId);
 					List<Project_Management> projects = mapper.getBycourseId(experimentalClassId,courseId);
 					for (int i = 0; i < projects.size(); i++) {
@@ -61,6 +62,7 @@ public class ExperimentallearningService {
 					}
 					resp.put("retvalue", projects);
 				}
+			}
 			resp.put("retcode", 200);
 	}catch(Exception e){
 		logger.error(e.getMessage());
@@ -107,10 +109,12 @@ public class ExperimentallearningService {
 			if(!StringUtils.isEmpty(courseId)){
 				//实验班级
 				Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId);
+				if(!StringUtils.isEmpty(experimentalClassId)){
 					//学生信息
 					List<UserM> users =mapper.queryStudentName(experimentalClassId);
 					resp.put("retvalue", users);
 				}
+			}
 			resp.put("retcode", 200);
 		} catch (Exception e) {
 			logger.error(e.getMessage());
@@ -130,10 +134,12 @@ public class ExperimentallearningService {
 			if(!StringUtils.isEmpty(courseId)){
 				//实验班级
 				Integer experimentalClassId=mapper.queryExperimentalClassId(courseId,studentId);
+				if(!StringUtils.isEmpty(experimentalClassId)){
 					//教师信息
 					UserM user =mapper.queryTeacherName(experimentalClassId);
 					resp.put("retvalue",user);
 				}
+			}
 			resp.put("retcode", 200);
 		} catch (Exception e) {
 			logger.error(e.getMessage());

src/test/java/com/yipin/liuwanr/AliyunOssServiceTest.java

@@ -34,20 +34,20 @@ public class AliyunOssServiceTest {
     /**
      * 测试上传文件
      */
-    @Test
+//    @Test
-    public void testUploadFiles() throws IOException {
+//    public void testUploadFiles() throws IOException {
-        File file = new File("D:\\pic\\1.jpg");
+//        File file = new File("D:\\pic\\1.jpg");
-        FileItem fileItem = new DiskFileItem("file",
+//        FileItem fileItem = new DiskFileItem("file",
-                Files.probeContentType(file.toPath()),
+//                Files.probeContentType(file.toPath()),
-                false,
+//                false,
-                file.getName(),
+//                file.getName(),
-                (int) file.length(),
+//                (int) file.length(),
-                file.getParentFile());
+//                file.getParentFile());
-        IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream());
+//        IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream());
-        MultipartFile multipartFile = new CommonsMultipartFile(fileItem);
+//        MultipartFile multipartFile = new CommonsMultipartFile(fileItem);
-        HashMap<String, Object> map = aliyunOssService.uploadFiles(multipartFile);
+//        HashMap<String, Object> map = aliyunOssService.uploadFiles(multipartFile);
-        map.forEach((key, value) -> System.out.println("key = " + key + "  ===>  value = " + value.toString()));
+//        map.forEach((key, value) -> System.out.println("key = " + key + "  ===>  value = " + value.toString()));
-    }
+//    }
 
     /**
      * 测试下载文件