huorantech
/
zt_liuwanr
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
zhiyong.ning 4 years ago
parent f6638674a2 58bcff8987
commit fcc34b7f50
19 changed files with 1003 additions and 400 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      pom.xml
  2. 30
      src/main/java/com/yipin/liuwanr/controller/AliyunOssController.java
  3. 9
      src/main/java/com/yipin/liuwanr/entity/City.java
  4. 292
      src/main/java/com/yipin/liuwanr/entity/Course.java
  5. 121
      src/main/java/com/yipin/liuwanr/entity/CourseLink.java
  6. 9
      src/main/java/com/yipin/liuwanr/entity/Discipline.java
  7. 9
      src/main/java/com/yipin/liuwanr/entity/Professional.java
  8. 9
      src/main/java/com/yipin/liuwanr/entity/ProfessionalClass.java
  9. 234
      src/main/java/com/yipin/liuwanr/entity/ServiceConfig.java
  10. 9
      src/main/java/com/yipin/liuwanr/entity/SutdentClass.java
  11. 143
      src/main/java/com/yipin/liuwanr/service/AliyunOssService.java
  12. 93
      src/main/java/com/yipin/liuwanr/service/AssesmentRecordService.java
  13. 1
      src/main/java/com/yipin/liuwanr/service/CityService.java
  14. 11
      src/main/java/com/yipin/liuwanr/vo/AssesmentRecordVo.java
  15. 70
      src/test/java/com/yipin/liuwanr/AliyunOssServiceTest.java
  16. 37
      src/test/java/com/yipin/liuwanr/AssesmentRecordServiceTest.java
  17. 54
      src/test/java/com/yipin/liuwanr/CityServiceTest.java
  18. 36
      src/test/java/com/yipin/liuwanr/ClassServiceTest.java
  19. 230
      src/test/java/com/yipin/liuwanr/CoursePermissionsServiceTest.java

6
pom.xml
Unescape View File

@ -232,6 +232,12 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.21</version> <version>1.7.21</version>
</dependency> </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.4</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>ROOT</finalName> <finalName>ROOT</finalName>

30
src/main/java/com/yipin/liuwanr/controller/AliyunOssController.java
Unescape View File

@ -19,27 +19,27 @@ import com.yipin.liuwanr.service.AliyunOssService;
@RequestMapping("/aliyun") @RequestMapping("/aliyun")
public class AliyunOssController { public class AliyunOssController {
@Autowired @Autowired
private AliyunOssService ossService; private AliyunOssService ossService;
/** /**
* 上传文件 * 上传文件
* @param file * @param file
* @return * @return
*/ */
@PostMapping("/uploadFiles") @PostMapping("/uploadFiles")
Response uploadFiles(MultipartFile file) { Response uploadFiles(MultipartFile file) {
Response resp = new Response(); Response resp = new Response();
HashMap<String, Object> ret = ossService.uploadFiles(file); HashMap<String, Object> ret = ossService.uploadFiles(file);
int status = (int) ret.get("retcode"); int status = (int) ret.get("retcode");
if (200 == status) { if (200 == status) {
resp.setStatus(status); resp.setStatus(status);
resp.setMessage(ret.get("retvalue")); resp.setMessage(ret.get("retvalue"));
} else { } else {
resp.setStatus(status); resp.setStatus(status);
resp.setErrmessage(ret.get("retvalue").toString()); resp.setErrmessage(ret.get("retvalue").toString());
} }
return resp; return resp;
} }

9
src/main/java/com/yipin/liuwanr/entity/City.java
Unescape View File

@ -26,4 +26,13 @@ public class City {
public void setProvinceId(Integer provinceId) { public void setProvinceId(Integer provinceId) {
this.provinceId = provinceId; this.provinceId = provinceId;
} }
@Override
public String toString() {
return "City{" +
"cityId=" + cityId +
", cityName='" + cityName + '\'' +
", provinceId=" + provinceId +
'}';
}
} }

292
src/main/java/com/yipin/liuwanr/entity/Course.java
Unescape View File

@ -1,125 +1,175 @@
package com.yipin.liuwanr.entity; package com.yipin.liuwanr.entity;
public class Course { public class Course {
//主键ID //主键ID
private Integer courseId; private Integer courseId;
//课程名称 //课程名称
private String courseName; private String courseName;
//课程类别 //课程类别
private Integer courseType; private Integer courseType;
//绑定学科id //绑定学科id
private Integer disciplineId; private Integer disciplineId;
//绑定专业类id //绑定专业类id
private Integer professionalClassId; private Integer professionalClassId;
//绑定专业id //绑定专业id
private Integer professionalId; private Integer professionalId;
//预计课时 //预计课时
private Integer courseHours; private Integer courseHours;
//市场价格 //市场价格
private double marketPrice; private double marketPrice;
//课程简介 //课程简介
private String courseIntroduction; private String courseIntroduction;
//教学目标 //教学目标
private String teachingGoal; private String teachingGoal;
//搜索内容 //搜索内容
private String searchContent; private String searchContent;
//绑定系统Id //绑定系统Id
private String systemId; private String systemId;
//绑定系统名称 //绑定系统名称
private String systemName; private String systemName;
//是否上架 //是否上架
private Integer isShelves; private Integer isShelves;
//创建时间 //创建时间
private String creationTime; private String creationTime;
public String getCreationTime() { public String getCreationTime() {
return creationTime; return creationTime;
} }
public void setCreationTime(String creationTime) {
this.creationTime = creationTime; public void setCreationTime(String creationTime) {
} this.creationTime = creationTime;
public String getSystemName() { }
return systemName;
} public String getSystemName() {
public void setSystemName(String systemName) { return systemName;
this.systemName = systemName; }
}
public Integer getIsShelves() { public void setSystemName(String systemName) {
return isShelves; this.systemName = systemName;
} }
public void setIsShelves(Integer isShelves) {
this.isShelves = isShelves; public Integer getIsShelves() {
} return isShelves;
public String getSystemId() { }
return systemId;
} public void setIsShelves(Integer isShelves) {
public void setSystemId(String systemId) { this.isShelves = isShelves;
this.systemId = systemId; }
}
public Integer getCourseId() { public String getSystemId() {
return courseId; return systemId;
} }
public void setCourseId(Integer courseId) {
this.courseId = courseId; public void setSystemId(String systemId) {
} this.systemId = systemId;
public String getCourseName() { }
return courseName;
} public Integer getCourseId() {
public void setCourseName(String courseName) { return courseId;
this.courseName = courseName; }
}
public Integer getCourseType() { public void setCourseId(Integer courseId) {
return courseType; this.courseId = courseId;
} }
public void setCourseType(Integer courseType) {
this.courseType = courseType; public String getCourseName() {
} return courseName;
public Integer getDisciplineId() { }
return disciplineId;
} public void setCourseName(String courseName) {
public void setDisciplineId(Integer disciplineId) { this.courseName = courseName;
this.disciplineId = disciplineId; }
}
public Integer getProfessionalClassId() { public Integer getCourseType() {
return professionalClassId; return courseType;
} }
public void setProfessionalClassId(Integer professionalClassId) {
this.professionalClassId = professionalClassId; public void setCourseType(Integer courseType) {
} this.courseType = courseType;
public Integer getProfessionalId() { }
return professionalId;
} public Integer getDisciplineId() {
public void setProfessionalId(Integer professionalId) { return disciplineId;
this.professionalId = professionalId; }
}
public Integer getCourseHours() { public void setDisciplineId(Integer disciplineId) {
return courseHours; this.disciplineId = disciplineId;
} }
public void setCourseHours(Integer courseHours) {
this.courseHours = courseHours; public Integer getProfessionalClassId() {
} return professionalClassId;
public String getCourseIntroduction() { }
return courseIntroduction;
} public void setProfessionalClassId(Integer professionalClassId) {
public void setCourseIntroduction(String courseIntroduction) { this.professionalClassId = professionalClassId;
this.courseIntroduction = courseIntroduction; }
}
public String getTeachingGoal() { public Integer getProfessionalId() {
return teachingGoal; return professionalId;
} }
public void setTeachingGoal(String teachingGoal) {
this.teachingGoal = teachingGoal; public void setProfessionalId(Integer professionalId) {
} this.professionalId = professionalId;
public String getSearchContent() { }
return searchContent;
} public Integer getCourseHours() {
public void setSearchContent(String searchContent) { return courseHours;
this.searchContent = searchContent; }
}
public double getMarketPrice() { public void setCourseHours(Integer courseHours) {
return marketPrice; this.courseHours = courseHours;
} }
public void setMarketPrice(double marketPrice) {
this.marketPrice = marketPrice; public String getCourseIntroduction() {
} return courseIntroduction;
}
public void setCourseIntroduction(String courseIntroduction) {
this.courseIntroduction = courseIntroduction;
}
public String getTeachingGoal() {
return teachingGoal;
}
public void setTeachingGoal(String teachingGoal) {
this.teachingGoal = teachingGoal;
}
public String getSearchContent() {
return searchContent;
}
public void setSearchContent(String searchContent) {
this.searchContent = searchContent;
}
public double getMarketPrice() {
return marketPrice;
}
public void setMarketPrice(double marketPrice) {
this.marketPrice = marketPrice;
}
@Override
public String toString() {
return "Course{" +
"courseId=" + courseId +
", courseName='" + courseName + '\'' +
", courseType=" + courseType +
", disciplineId=" + disciplineId +
", professionalClassId=" + professionalClassId +
", professionalId=" + professionalId +
", courseHours=" + courseHours +
", marketPrice=" + marketPrice +
", courseIntroduction='" + courseIntroduction + '\'' +
", teachingGoal='" + teachingGoal + '\'' +
", searchContent='" + searchContent + '\'' +
", systemId='" + systemId + '\'' +
", systemName='" + systemName + '\'' +
", isShelves=" + isShelves +
", creationTime='" + creationTime + '\'' +
'}';
}
} }

121
src/main/java/com/yipin/liuwanr/entity/CourseLink.java
Unescape View File

@ -4,53 +4,76 @@ import java.util.List;
public class CourseLink { public class CourseLink {
//课程环节主键id //课程环节主键id
private Integer linkId; private Integer linkId;
//项目id //项目id
private Integer projectId; private Integer projectId;
//文件链接 //文件链接
private String fileLink; private String fileLink;
//环节名称 //环节名称
private String linkName; private String linkName;
//绑定课程id //绑定课程id
private Integer courseId; private Integer courseId;
private List<CourseLink> courseLink; private List<CourseLink> courseLink;
public Integer getCourseId() { public Integer getCourseId() {
return courseId; return courseId;
} }
public void setCourseId(Integer courseId) {
this.courseId = courseId; public void setCourseId(Integer courseId) {
} this.courseId = courseId;
public List<CourseLink> getCourseLink() { }
return courseLink;
} public List<CourseLink> getCourseLink() {
public void setCourseLink(List<CourseLink> courseLink) { return courseLink;
this.courseLink = courseLink; }
}
public Integer getLinkId() { public void setCourseLink(List<CourseLink> courseLink) {
return linkId; this.courseLink = courseLink;
} }
public void setLinkId(Integer linkId) {
this.linkId = linkId; public Integer getLinkId() {
} return linkId;
public Integer getProjectId() { }
return projectId;
} public void setLinkId(Integer linkId) {
public void setProjectId(Integer projectId) { this.linkId = linkId;
this.projectId = projectId; }
}
public String getFileLink() { public Integer getProjectId() {
return fileLink; return projectId;
} }
public void setFileLink(String fileLink) {
this.fileLink = fileLink; public void setProjectId(Integer projectId) {
} this.projectId = projectId;
public String getLinkName() { }
return linkName;
} public String getFileLink() {
public void setLinkName(String linkName) { return fileLink;
this.linkName = linkName; }
}
public void setFileLink(String fileLink) {
this.fileLink = fileLink;
}
public String getLinkName() {
return linkName;
}
public void setLinkName(String linkName) {
this.linkName = linkName;
}
@Override
public String toString() {
return "CourseLink{" +
"linkId=" + linkId +
", projectId=" + projectId +
", fileLink='" + fileLink + '\'' +
", linkName='" + linkName + '\'' +
", courseId=" + courseId +
", courseLink=" + courseLink +
'}';
}
} }

9
src/main/java/com/yipin/liuwanr/entity/Discipline.java
Unescape View File

@ -26,4 +26,13 @@ public class Discipline {
public void setDisciplineLevelId(Integer disciplineLevelId) { public void setDisciplineLevelId(Integer disciplineLevelId) {
this.disciplineLevelId = disciplineLevelId; this.disciplineLevelId = disciplineLevelId;
} }
@Override
public String toString() {
return "Discipline{" +
"disciplineId=" + disciplineId +
", disciplineName='" + disciplineName + '\'' +
", disciplineLevelId=" + disciplineLevelId +
'}';
}
} }

9
src/main/java/com/yipin/liuwanr/entity/Professional.java
Unescape View File

@ -49,4 +49,13 @@ public class Professional {
this.professionalClassId = professionalClassId; this.professionalClassId = professionalClassId;
} }
@Override
public String toString() {
return "Professional{" +
"professionalId=" + professionalId +
", professionalName='" + professionalName + '\'' +
", professionalClassId=" + professionalClassId +
", grade=" + grade +
'}';
}
} }

9
src/main/java/com/yipin/liuwanr/entity/ProfessionalClass.java
Unescape View File

@ -27,4 +27,13 @@ public class ProfessionalClass {
public void setDisciplineId(String disciplineId) { public void setDisciplineId(String disciplineId) {
this.disciplineId = disciplineId; this.disciplineId = disciplineId;
} }
@Override
public String toString() {
return "ProfessionalClass{" +
"professionalClassId=" + professionalClassId +
", professionalClassName='" + professionalClassName + '\'' +
", disciplineId='" + disciplineId + '\'' +
'}';
}
} }

234
src/main/java/com/yipin/liuwanr/entity/ServiceConfig.java
Unescape View File

@ -1,102 +1,142 @@
package com.yipin.liuwanr.entity; package com.yipin.liuwanr.entity;
public class ServiceConfig { public class ServiceConfig {
//主键ID
private Integer systemId;
//系统名称
private String systemName;
//系统类型
private Integer systemType;
//系统归属
private Integer systemAttribution;
//系统状态
private Integer systemStatus;
//搜索内容
private String searchContent;
//项目名称
private String projectName;
//绑定课程Id
private Integer courseId;
//多个系统Id
private String systemIds;
//项目id
private Integer projectId;
//项目是否展示
private Integer isShow;
//系统地址
private String systemAddress;
//主键ID public String getSystemIds() {
private Integer systemId; return systemIds;
//系统名称 }
private String systemName;
//系统类型 public void setSystemIds(String systemIds) {
private Integer systemType; this.systemIds = systemIds;
//系统归属 }
private Integer systemAttribution;
//系统状态 public String getSystemAddress() {
private Integer systemStatus; return systemAddress;
//搜索内容 }
private String searchContent;
//项目名称 public void setSystemAddress(String systemAddress) {
private String projectName; this.systemAddress = systemAddress;
//绑定课程Id }
private Integer courseId;
//多个系统Id public Integer getIsShow() {
private String systemIds; return isShow;
//项目id }
private Integer projectId;
//项目是否展示 public void setIsShow(Integer isShow) {
private Integer isShow; this.isShow = isShow;
//系统地址 }
private String systemAddress;
public Integer getProjectId() {
public String getSystemIds() { return projectId;
return systemIds; }
}
public void setSystemIds(String systemIds) { public void setProjectId(Integer projectId) {
this.systemIds = systemIds; this.projectId = projectId;
} }
public String getSystemAddress() {
return systemAddress; public Integer getCourseId() {
} return courseId;
public void setSystemAddress(String systemAddress) { }
this.systemAddress = systemAddress;
} public void setCourseId(Integer courseId) {
public Integer getIsShow() { this.courseId = courseId;
return isShow; }
}
public void setIsShow(Integer isShow) { public String getProjectName() {
this.isShow = isShow; return projectName;
} }
public Integer getProjectId() {
return projectId; public void setProjectName(String projectName) {
} this.projectName = projectName;
public void setProjectId(Integer projectId) { }
this.projectId = projectId;
} public Integer getSystemId() {
public Integer getCourseId() { return systemId;
return courseId; }
}
public void setCourseId(Integer courseId) { public void setSystemId(Integer systemId) {
this.courseId = courseId; this.systemId = systemId;
} }
public String getProjectName() {
return projectName; public String getSystemName() {
} return systemName;
public void setProjectName(String projectName) { }
this.projectName = projectName;
} public void setSystemName(String systemName) {
public Integer getSystemId() { this.systemName = systemName;
return systemId; }
}
public void setSystemId(Integer systemId) { public Integer getSystemType() {
this.systemId = systemId; return systemType;
} }
public String getSystemName() {
return systemName; public void setSystemType(Integer systemType) {
} this.systemType = systemType;
public void setSystemName(String systemName) { }
this.systemName = systemName;
} public Integer getSystemAttribution() {
public Integer getSystemType() { return systemAttribution;
return systemType; }
}
public void setSystemType(Integer systemType) { public void setSystemAttribution(Integer systemAttribution) {
this.systemType = systemType; this.systemAttribution = systemAttribution;
} }
public Integer getSystemAttribution() {
return systemAttribution; public Integer getSystemStatus() {
} return systemStatus;
public void setSystemAttribution(Integer systemAttribution) { }
this.systemAttribution = systemAttribution;
} public void setSystemStatus(Integer systemStatus) {
public Integer getSystemStatus() { this.systemStatus = systemStatus;
return systemStatus; }
}
public void setSystemStatus(Integer systemStatus) { public String getSearchContent() {
this.systemStatus = systemStatus; return searchContent;
} }
public String getSearchContent() {
return searchContent; public void setSearchContent(String searchContent) {
} this.searchContent = searchContent;
public void setSearchContent(String searchContent) { }
this.searchContent = searchContent;
} @Override
public String toString() {
return "ServiceConfig{" +
"systemId=" + systemId +
", systemName='" + systemName + '\'' +
", systemType=" + systemType +
", systemAttribution=" + systemAttribution +
", systemStatus=" + systemStatus +
", searchContent='" + searchContent + '\'' +
", projectName='" + projectName + '\'' +
", courseId=" + courseId +
", systemIds='" + systemIds + '\'' +
", projectId=" + projectId +
", isShow=" + isShow +
", systemAddress='" + systemAddress + '\'' +
'}';
}
} }

9
src/main/java/com/yipin/liuwanr/entity/SutdentClass.java
Unescape View File

@ -36,5 +36,12 @@ public class SutdentClass {
this.gradeId = gradeId; this.gradeId = gradeId;
} }
@Override
public String toString() {
return "SutdentClass{" +
"classId=" + classId +
", className='" + className + '\'' +
", gradeId=" + gradeId +
'}';
}
} }

143
src/main/java/com/yipin/liuwanr/service/AliyunOssService.java
Unescape View File

@ -19,76 +19,79 @@ import com.yipin.liuwanr.helper.OssConfigUtil;
@Service @Service
public class AliyunOssService { public class AliyunOssService {
@Autowired @Autowired
private AliyunOssConfig config; private AliyunOssConfig config;
@Autowired @Autowired
private BeanFactory beanFactory; private BeanFactory beanFactory;
private static Logger logger = Logger.getLogger(AliyunOssService.class); private static Logger logger = Logger.getLogger(AliyunOssService.class);
/**
* 上传文件
*
* @param file 上传文件
* @return
*/
public HashMap<String, Object> uploadFiles(MultipartFile file) {
HashMap<String, Object> resp = new HashMap<String, Object>();
try {
OSSClient client = beanFactory.getBean(OSSClient.class);
FilesResult result = OssConfigUtil.uploadFiles(file, client, config);
resp.put("retcode", 200);
resp.put("retvalue", result);
} catch (Exception e) {
logger.info(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "Upload Fail");
return resp;
}
return resp;
}
/**
* 下载文件
*
* @param objectName 要下载的文件(路径+文件名)
* @param fileurl 本地路径
* @return
*/
public void downloadFiles(HttpServletResponse response, String objectName) {
HashMap<String, Object> resp = new HashMap<String, Object>();
try {
OSSClient client = beanFactory.getBean(OSSClient.class);
OssConfigUtil.downloadFiles(response, client, config, objectName);
resp.put("retcode", 200);
resp.put("retvalue", "Download SUCCESS");
} catch (Exception e) {
logger.info(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "Download Fail");
}
}
/**
* 根据文件路径+文件名称，删除该文件
*
* @param filename
* @return
*/
public HashMap<String, Object> deleteFile(String filename) {
HashMap<String, Object> resp = new HashMap<String, Object>();
try {
OSSClient client = beanFactory.getBean(OSSClient.class);
OssConfigUtil.deleteFile(client, config.getBucketName(), filename);
resp.put("retcode", 200);
resp.put("retvalue", "Delete SUCCESS");
} catch (RuntimeException e) {
logger.info(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "Delete Fail");
return resp;
}
return resp;
}
/**
* 上传文件
* @param file 上传文件
* @return
*/
public HashMap<String, Object> uploadFiles(MultipartFile file) {
HashMap<String, Object> resp = new HashMap<String, Object>();
try {
OSSClient client=beanFactory.getBean(OSSClient.class);
FilesResult result=OssConfigUtil.uploadFiles(file, client, config);
resp.put("retcode", 200);
resp.put("retvalue", result);
} catch (Exception e) {
logger.info(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "Upload Fail");
return resp;
}
return resp;
}
/**
* 下载文件
* @param objectName 要下载的文件(路径+文件名)
* @param fileurl 本地路径
* @return
*/
public void downloadFiles(HttpServletResponse response,String objectName) {
HashMap<String, Object> resp = new HashMap<String, Object>();
try {
OSSClient client=beanFactory.getBean(OSSClient.class);
OssConfigUtil.downloadFiles(response,client, config, objectName);
resp.put("retcode", 200);
resp.put("retvalue","Download SUCCESS" );
} catch (Exception e) {
logger.info(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "Download Fail");
}
}
/**
* 根据文件路径+文件名称，删除该文件
* @param filename
* @return
*/
public HashMap<String, Object> deleteFile(String filename) {
HashMap<String, Object> resp = new HashMap<String, Object>();
try {
OSSClient client=beanFactory.getBean(OSSClient.class);
OssConfigUtil.deleteFile(client, config.getBucketName(), filename);
resp.put("retcode", 200);
resp.put("retvalue","Delete SUCCESS" );
} catch (RuntimeException e) {
logger.info(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "Delete Fail");
return resp;
}
return resp;
}
} }

93
src/main/java/com/yipin/liuwanr/service/AssesmentRecordService.java
Unescape View File

@ -1,13 +1,12 @@
package com.yipin.liuwanr.service; package com.yipin.liuwanr.service;
import java.util.HashMap; import com.yipin.liuwanr.mapper.AssesmentRecordMapper;
import com.yipin.liuwanr.vo.AssesmentRecordVo;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.yipin.liuwanr.mapper.AssesmentRecordMapper; import java.util.HashMap;
import com.yipin.liuwanr.vo.AssesmentRecordVo;
@Service @Service
/** /**
@ -16,50 +15,52 @@ import com.yipin.liuwanr.vo.AssesmentRecordVo;
* *
*/ */
public class AssesmentRecordService { public class AssesmentRecordService {
private static Logger logger = Logger.getLogger(AssesmentRecordService.class);
@Autowired private static Logger logger = Logger.getLogger(AssesmentRecordService.class);
private AssesmentRecordMapper mapper;
@Autowired
private AssesmentRecordMapper mapper;
/**
* 根据课程id查询学生信息
*
* @param studentId
* @param courseId
* @return
*/
public HashMap<String, Object> queryStudentAssessment(Integer studentId, Integer courseId) {
HashMap<String, Object> resp = new HashMap<String, Object>();
AssesmentRecordVo vo = null;
try {
if (studentId != null && courseId != null) {
vo = mapper.getByStudentId(studentId, courseId);//学生信息
Integer schoolHeight = mapper.getBySchool(courseId, studentId);//学校最高平均分
if (schoolHeight != null) {
vo.setSchoolheightscore(schoolHeight);
} else {
vo.setSchoolheightscore(0);
}
AssesmentRecordVo vo1 = mapper.getByCountry(courseId);//全国信息
if (vo1 != null) {
vo.setCountryavgscore(vo1.getCountryavgscore());
vo.setCountryheightscore(vo1.getCountryheightscore());
} else {
vo.setCountryavgscore(0.0);
vo.setCountryheightscore(0.0);
}
}
resp.put("retvalue", vo);
resp.put("retcode", 200);
} catch (RuntimeException e) {
logger.error(e.getMessage());
System.out.println(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "考核记录信息查询失败");
return resp;
}
return resp;
}
/**
* 根据课程id查询学生信息
* @param studentId
* @param courseId
* @return
*/
public HashMap<String, Object> queryStudentAssessment(Integer studentId,Integer courseId){
HashMap<String, Object> resp = new HashMap<String, Object>();
AssesmentRecordVo vo=null;
try {
if(studentId!=null&&courseId!=null){
vo=mapper.getByStudentId(studentId,courseId);//学生信息
Integer schoolHeight=mapper.getBySchool(courseId,studentId);//学校最高平均分
if(schoolHeight!=null) {
vo.setSchoolheightscore(schoolHeight);
}else {
vo.setSchoolheightscore(0);
}
AssesmentRecordVo vo1=mapper.getByCountry(courseId);//全国信息
if(vo1!=null) {
vo.setCountryavgscore(vo1.getCountryavgscore());
vo.setCountryheightscore(vo1.getCountryheightscore());
}else {
vo.setCountryavgscore(0.0);
vo.setCountryheightscore(0.0);
}
}
resp.put("retvalue", vo);
resp.put("retcode", 200);
} catch (RuntimeException e) {
logger.error(e.getMessage());
resp.put("retcode", 500);
resp.put("retvalue", "考核记录信息查询失败");
return resp;
}
return resp;
}
} }

1
src/main/java/com/yipin/liuwanr/service/CityService.java
Unescape View File

@ -24,6 +24,7 @@ public class CityService {
resp.put("retcode", 200); resp.put("retcode", 200);
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
System.out.println(e.getMessage());
resp.put("retcode", 500); resp.put("retcode", 500);
resp.put("retvalue", "Inquiry Failed"); resp.put("retvalue", "Inquiry Failed");
return resp; return resp;

11
src/main/java/com/yipin/liuwanr/vo/AssesmentRecordVo.java
Unescape View File

@ -63,4 +63,15 @@ public class AssesmentRecordVo {
this.countryheightscore = countryheightscore; this.countryheightscore = countryheightscore;
} }
@Override
public String toString() {
return "AssesmentRecordVo{" +
"studentName='" + studentName + '\'' +
", heightscore=" + heightscore +
", avgscore=" + avgscore +
", schoolheightscore=" + schoolheightscore +
", countryavgscore=" + countryavgscore +
", countryheightscore=" + countryheightscore +
'}';
}
} }

70
src/test/java/com/yipin/liuwanr/AliyunOssServiceTest.java
Unescape View File

@ -0,0 +1,70 @@
package com.yipin.liuwanr;
import com.yipin.liuwanr.service.AliyunOssService;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItem;
import org.apache.commons.io.IOUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.util.HashMap;
@RunWith(SpringRunner.class)
@SpringBootTest
public class AliyunOssServiceTest {
@Autowired
private AliyunOssService aliyunOssService;
/**
* 测试上传文件
*/
@Test
public void testUploadFiles() throws IOException {
File file = new File("D:\\pic\\1.jpg");
FileItem fileItem = new DiskFileItem("file",
Files.probeContentType(file.toPath()),
false,
file.getName(),
(int) file.length(),
file.getParentFile());
IOUtils.copy(new FileInputStream(file), fileItem.getOutputStream());
MultipartFile multipartFile = new CommonsMultipartFile(fileItem);
HashMap<String, Object> map = aliyunOssService.uploadFiles(multipartFile);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 测试下载文件
*/
@Test
public void testDownloadFiles() throws IOException {
HttpServletResponse response = new MockHttpServletResponse();
AliyunOssService aliyunOssService = this.aliyunOssService;
aliyunOssService.downloadFiles(response,
"http://liuwanr.oss-cn-shenzhen.aliyuncs.com/jpg/20200807/1596787474773.jpg");
}
/**
* 测试根据文件路径+文件名称，删除该文件
*/
@Test
public void testDeleteFile() throws IOException {
aliyunOssService.deleteFile("http://liuwanr.oss-cn-shenzhen.aliyuncs.com/jpg/20200807/1596787474773.jpg");
}
}

37
src/test/java/com/yipin/liuwanr/AssesmentRecordServiceTest.java
Unescape View File

@ -0,0 +1,37 @@
package com.yipin.liuwanr;
import com.yipin.liuwanr.service.AssesmentRecordService;
import com.yipin.liuwanr.vo.AssesmentRecordVo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.HashMap;
@RunWith(SpringRunner.class)
@SpringBootTest
public class AssesmentRecordServiceTest {
@Autowired
private AssesmentRecordService assesmentRecordService;
/**
* 根据课程id查询学生信息
* studentId, courseId
*/
@Test
public void testQueryCity() {
HashMap<String, Object> map = assesmentRecordService.queryStudentAssessment(68, 72);
Integer retcode = (Integer) map.get("retcode");
System.out.println(retcode);
if (retcode == 200) {
AssesmentRecordVo assesmentRecordVo = (AssesmentRecordVo) map.get("retvalue");
System.out.println(assesmentRecordVo.toString());
} else {
String msg = (String) map.get("retvalue");
System.out.println(msg);
}
}
}

54
src/test/java/com/yipin/liuwanr/CityServiceTest.java
Unescape View File

@ -1,14 +1,17 @@
package com.yipin.liuwanr; package com.yipin.liuwanr;
import com.yipin.liuwanr.entity.City; import com.yipin.liuwanr.entity.City;
import com.yipin.liuwanr.mapper.CityMapper;
import com.yipin.liuwanr.service.CityService; import com.yipin.liuwanr.service.CityService;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@ -17,13 +20,62 @@ public class CityServiceTest {
@Autowired @Autowired
private CityService cityService; private CityService cityService;
@Autowired
private CityMapper cityMapper;
/** /**
* 新增城市信息方法测试 * 新增城市信息方法测试
*/ */
@Test /*@Test
@Transactional
public void testAddCity() { public void testAddCity() {
City city = new City(); City city = new City();
city.setCityName("hhhh");
city.setProvinceId(2);
HashMap<String, Object> map = cityService.addCity(city); HashMap<String, Object> map = cityService.addCity(city);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value)); map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value));
}*/
/**
* 查询城市信息方法测试
*/
@Test
public void testQueryCity() {
HashMap<String, Object> map = cityService.queryCity(1);
Integer retcode = (Integer) map.get("retcode");
System.out.println(retcode);
if (retcode == 200) {
List<City> cities = (List<City>) map.get("retvalue");
cities.forEach(item -> {
System.out.println(item.toString());
});
} else {
String msg = (String) map.get("retvalue");
System.out.println(msg);
}
}
/**
* 删除城市信息方法测试
*/
@Test
@Transactional
public void testDeleteCity() {
HashMap<String, Object> map = cityService.deleteCity(1);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 删除城市信息方法测试
*/
@Test
@Transactional
public void testUpdateCity() {
City city = new City();
city.setCityId(1);
city.setCityName("hhhh");
city.setProvinceId(2);
HashMap<String, Object> map = cityService.updateCity(city);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
} }
} }

36
src/test/java/com/yipin/liuwanr/ClassServiceTest.java
Unescape View File

@ -0,0 +1,36 @@
package com.yipin.liuwanr;
import com.yipin.liuwanr.entity.SutdentClass;
import com.yipin.liuwanr.service.ClassService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.HashMap;
import java.util.List;
@RunWith(SpringRunner.class)
@SpringBootTest
public class ClassServiceTest {
@Autowired
private ClassService classService;
@Test
public void testQueryGetByClassName() {
HashMap<String, Object> map = classService.queryGetByClassName("");
Integer retcode = (Integer) map.get("retcode");
System.out.println(retcode);
if (retcode == 200) {
List<SutdentClass> classes = (List<SutdentClass>) map.get("retvalue");
classes.forEach(item -> {
System.out.println(item.toString());
});
} else {
String msg = (String) map.get("retvalue");
System.out.println(msg);
}
}
}

230
src/test/java/com/yipin/liuwanr/CoursePermissionsServiceTest.java
Unescape View File

@ -0,0 +1,230 @@
package com.yipin.liuwanr;
import com.yipin.liuwanr.entity.Course;
import com.yipin.liuwanr.entity.CourseLink;
import com.yipin.liuwanr.entity.CoursePermissions;
import com.yipin.liuwanr.entity.ServiceConfig;
import com.yipin.liuwanr.mapper.CoursePermissionsMapper;
import com.yipin.liuwanr.service.CoursePermissionsService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
@RunWith(SpringRunner.class)
@SpringBootTest
public class CoursePermissionsServiceTest {
@Autowired
private CoursePermissionsService coursePermissionsService;
@Autowired
private CoursePermissionsMapper coursePermissionsMapper;
/**
* 新增课程权限
*/
@Test
@Transactional
public void testAddCoursePermissions() {
CoursePermissions coursePermissions = new CoursePermissions();
coursePermissions.setUsePeriod(30);
coursePermissions.setMarketPrice(12.8);
coursePermissions.setTransactionPrice(90);
coursePermissions.setDiscount(703);
coursePermissions.setPortAddressId(1);
coursePermissions.setIsDeliverGoods(0);
coursePermissions.setCourseId(77);
coursePermissions.setOrderId(117);
HashMap<String, Object> map = coursePermissionsService.addCoursePermissions(coursePermissions);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 查询课程详情
*/
@Test
public void testQueryCourseDetails() {
HashMap<String, Object> map = coursePermissionsService.queryCourseDetails(84);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
/*Integer retcode = (Integer) map.get("retcode");
System.out.println(retcode);
if (retcode == 200) {
List<Course> classes = (List<Course>) map.get("retvalue");
classes.forEach(item -> {
System.out.println(item.toString());
});
} else {
String msg = (String) map.get("retvalue");
System.out.println(msg);
}*/
}
/**
* 删除课程
*/
@Test
@Transactional
public void testDeleteCourse() {
HashMap<String, Object> map = coursePermissionsService.deleteCourse(84);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 修改课程
*/
@Test
@Transactional
public void testUpdateCourse() {
Course course = new Course();
course.setCourseId(84);
course.setCourseName("Python程序设计实训课（测试2）");
course.setCourseType(2);
course.setDisciplineId(1);
course.setProfessionalClassId(1);
course.setProfessionalId(7);
course.setCourseHours(1);
course.setMarketPrice(12.8);
course.setCourseIntroduction("一门学习python编程的基础实训课");
course.setTeachingGoal("掌握Python编程的基础语法");
HashMap<String, Object> map = coursePermissionsService.updateCourse(course);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 查询学科
*/
@Test
public void testQueryCourseDiscipline() {
HashMap<String, Object> map = coursePermissionsService.queryCourseDiscipline();
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 查询课程专业班级
*/
@Test
public void testQueryCourseProfessionalClass() {
HashMap<String, Object> map = coursePermissionsService.queryCourseProfessionalClass(1);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 查询课程专业
*/
@Test
public void testQueryCourseProfessional() {
HashMap<String, Object> map = coursePermissionsService.queryCourseProfessional(1);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 查询APP配置
*/
@Test
public void testQueryAppConfig() {
ServiceConfig serviceConfig = new ServiceConfig();
HashMap<String, Object> map = coursePermissionsService.queryAppConfig(serviceConfig);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 查询练习配置
*/
@Test
public void queryTrainingConfig() {
Integer courseId = 77;
Integer pageNo = 1;
Integer pageSize = 10;
HashMap<String, Object> map = coursePermissionsService.queryTrainingConfig(courseId, pageNo, pageSize);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 新增练习配置
*/
@Test
@Transactional
public void addTrainingConfig() {
Course course = new Course();
course.setCourseId(77);
course.setCourseName("Python程序设计实训课（测试2）");
course.setCourseType(2);
course.setDisciplineId(1);
course.setProfessionalClassId(1);
course.setProfessionalId(7);
course.setCourseHours(1);
course.setMarketPrice(12.8);
course.setCourseIntroduction("一门学习python编程的基础实训课");
course.setTeachingGoal("掌握Python编程的基础语法");
HashMap<String, Object> map = coursePermissionsService.addTrainingConfig(course);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 查询链接详情
*/
@Test
public void queryLinkDetails() {
Integer linkId = 9;
HashMap<String, Object> map = coursePermissionsService.queryLinkDetails(linkId);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 修改链接
*/
@Test
@Transactional
public void updateLink() {
CourseLink courseLink = new CourseLink();
courseLink.setFileLink("qweqweqwe");
courseLink.setLinkName("qweqewqe");
courseLink.setProjectId(12);
courseLink.setLinkId(3);
HashMap<String, Object> map = coursePermissionsService.updateLink(courseLink);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 删除练习配置
*/
@Test
@Transactional
public void deleteTrainingConfig() {
Course course = new Course();
course.setCourseId(77);
HashMap<String, Object> map = coursePermissionsService.deleteTrainingConfig(course);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 选择是否展示
*/
@Test
@Transactional
public void isShow() {
Course course = new Course();
course.setCourseId(77);
HashMap<String, Object> map = coursePermissionsService.isShow(course);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
/**
* 选择是否上架
*/
@Test
@Transactional
public void isShelves() {
Course course = new Course();
course.setCourseId(77);
HashMap<String, Object> map = coursePermissionsService.isShelves(course);
map.forEach((key, value) -> System.out.println("key = " + key + " ===> value = " + value.toString()));
}
}
Write Preview
Loading…
Cancel
Save