diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index a45eb6b..0000000 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2007-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if (mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if (mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if (!outputFile.getParentFile().exists()) { - if (!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a..0000000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 642d572..0000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/README.md b/README.md deleted file mode 100644 index 107f8bf..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# msdw_tms - -测评管理系统 \ No newline at end of file diff --git a/src/main/java/com/msdw/tms/api/ExperimentalTeachingControllerApi.java b/src/main/java/com/msdw/tms/api/ExperimentalTeachingControllerApi.java index e5c9351..f6c28a0 100644 --- a/src/main/java/com/msdw/tms/api/ExperimentalTeachingControllerApi.java +++ b/src/main/java/com/msdw/tms/api/ExperimentalTeachingControllerApi.java @@ -2,12 +2,9 @@ package com.msdw.tms.api; import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.ExperimentalTeachingEntity; -import com.msdw.tms.entity.UserEntity; -import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.GetMapping; import java.text.ParseException; @@ -20,6 +17,7 @@ public interface ExperimentalTeachingControllerApi { @ApiParam(name = "month", value = "月份：1、近一个月内 3、近三个月内 6、近六个月内", required = false) Integer month, @ApiParam(name = "type", value = "类型：1、手动发布 2、定时发布", required = false) Integer type, @ApiParam(name = "status", value = "状态：1、待开始 2、进行中 3、已结束", required = false) Integer status, + @ApiParam(name = "systemId", value = "系统id", required = false) Integer systemId, @ApiParam(name = "startTime", value = "开始时间", required = false) String startTime, @ApiParam(name = "stopTime", value = "结束时间", required = false) String stopTime, @ApiParam(name = "searchContent", value = "搜索内容", required = false) String searchContent, diff --git a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java index 64d7282..d6fe70b 100644 --- a/src/main/java/com/msdw/tms/controller/ClassTeachingController.java +++ b/src/main/java/com/msdw/tms/controller/ClassTeachingController.java @@ -43,58 +43,61 @@ public class ClassTeachingController implements ClassTeachingApi { */ @Override @GetMapping("userRecord") - public R queryTestRecord(@RequestParam Integer page, @RequestParam Integer size, Integer month,String startTime,String endTime, - String condition, @RequestParam Integer status,@RequestParam Integer schoolId){ + public R queryTestRecord(@RequestParam Integer page, @RequestParam Integer size, Integer month, String startTime, String endTime, + String condition, @RequestParam Integer status, @RequestParam Integer schoolId) { ProjectRecordVo recordVo = new ProjectRecordVo(); - if (status==1||status==2||status==3) {//限定实验状态 - recordVo.setStatus(status); - }else{//不限定实验状态 - recordVo.setStatus(null); - } - if(!StringUtils.isEmpty(condition)){ - recordVo.setCondition(condition); + if (status == 1 || status == 2 || status == 3) {//限定实验状态 + recordVo.setStatus(status); + } else {//不限定实验状态 + recordVo.setStatus(null); + } + if (!StringUtils.isEmpty(condition)) { + recordVo.setCondition(condition); + } + if (!StringUtils.isEmpty(month)) { + recordVo.setMonth(month); + } else { + recordVo.setMonth(null); + if (!StringUtils.isEmpty(startTime)) { + recordVo.setStartTime(startTime); } - if(!StringUtils.isEmpty(month)) { - recordVo.setMonth(month); - }else { - recordVo.setMonth(null); - if(!StringUtils.isEmpty(startTime)) { - recordVo.setStartTime(startTime); - }if(!StringUtils.isEmpty(endTime)) { - recordVo.setEndTime(endTime); - } + if (!StringUtils.isEmpty(endTime)) { + recordVo.setEndTime(endTime); } - recordVo.setSchoolId(schoolId); - PageUtils page1 = classTeachingService.queryClassRecord(page,size,recordVo); - return R.ok().put("page", page1); + } + recordVo.setSchoolId(schoolId); + PageUtils page1 = classTeachingService.queryClassRecord(page, size, recordVo); + return R.ok().put("page", page1); } /** * 校验是否需要输入邀请码 + * * @param userId * @param projectId * @return */ @Override @GetMapping("/checkInvitationCode") - public R check(@RequestParam Integer userId,@RequestParam("id") Integer projectId){ - List o = experimentalStudentService.queryIsCode(userId,projectId); - if (o.size()>0){ + public R check(@RequestParam Integer userId, @RequestParam("id") Integer projectId) { + List o = experimentalStudentService.queryIsCode(userId, projectId); + if (o.size() > 0) { return R.ok(); - }else{ - return R.error(200,"false"); + } else { + return R.error(200, "false"); } } /** * 通过邀请码进入实验 + * * @param * @return */ @Override @Transactional @PostMapping("/joinPractice") - public R joinPractice(@RequestBody ExperimentalTeachingEntity entity1){ + public R joinPractice(@RequestBody ExperimentalTeachingEntity entity1) { //获取参数 Integer projectId = entity1.getProjectId(); Integer id = entity1.getId(); @@ -106,58 +109,61 @@ public class ClassTeachingController implements ClassTeachingApi { // Integer ICode = experimentalStudentService.queryIsCode(userId);//获取iscode信息, //if (isCode==0) - if (invitationCode!=null){ - entity.setId(id); + if (invitationCode != null) { + entity.setId(id); // entity.setProjectId(projectId); - ExperimentalTeachingEntity result= classTeachingService.queryInvitationcode(entity);//邀请码唯一 - Integer code = result.getInvitationCode(); - if (invitationCode.equals(code)==true){ - ExperimentalStudentEntity student = studentEntity.setUserId(userId).setProjectId(id); - experimentalStudentService.saveCode(student); - return R.ok(); - }else{ - return R.error("邀请码错误，验证失败！！！"); - } - }else{ - return R.error(400,"邀请码格式错误！！！"); + ExperimentalTeachingEntity result = classTeachingService.queryInvitationcode(entity);//邀请码唯一 + Integer code = result.getInvitationCode(); + if (invitationCode.equals(code) == true) { + ExperimentalStudentEntity student = studentEntity.setUserId(userId).setProjectId(id); + experimentalStudentService.saveCode(student); + return R.ok(); + } else { + return R.error("邀请码错误，验证失败！！！"); } + } else { + return R.error(400, "邀请码格式错误！！！"); } + } /** * 查看虚拟仿真课程列表信息 + * * @param page * @param size * @return */ @Override @GetMapping("/simulationPlayList") - public R querySimulationPlayList(@RequestParam Integer page,@RequestParam Integer size){ - PageUtils page1 = classTeachingService.querySimulationPlayList(page,size); - return R.ok().put("data",page1); + public R querySimulationPlayList(@RequestParam Integer page, @RequestParam Integer size) { + PageUtils page1 = classTeachingService.querySimulationPlayList(page, size); + return R.ok().put("data", page1); } /** - * 学生查看实验报告 + * 学生查看实验报告(教学) + * * @param * @return */ @Override @GetMapping("/queryExperimentalReport") - public R queryExperimentalReport(@RequestParam Integer studentId,@RequestParam Integer projectId,@RequestParam Integer recordId,@RequestParam Integer reportId){ + public R queryExperimentalReport(@RequestParam Integer studentId, @RequestParam Integer projectId, @RequestParam Integer recordId, @RequestParam Integer reportId) { ExperimentalReportVo entity = new ExperimentalReportVo(); - R result = experimentalReportService.queryReport(studentId,projectId,recordId,reportId); + R result = experimentalReportService.queryReport(studentId, projectId, recordId, reportId); return result; } /** - * 学生查看虚拟实验报告 + * 学生查看虚拟实验报告(虚仿) + * * @param * @return */ @Override @GetMapping("/queryVirtualReport") - public R queryVirtualReport(@RequestParam Integer recordId){ + public R queryVirtualReport(@RequestParam Integer recordId) { R result = experimentalReportService.queryVirtualReport(recordId); return result; } diff --git a/src/main/java/com/msdw/tms/controller/ExperimentalProjectController.java b/src/main/java/com/msdw/tms/controller/ExperimentalProjectController.java index 049eed6..31799c7 100644 --- a/src/main/java/com/msdw/tms/controller/ExperimentalProjectController.java +++ b/src/main/java/com/msdw/tms/controller/ExperimentalProjectController.java @@ -2,26 +2,16 @@ package com.msdw.tms.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.msdw.tms.api.ExperimentalProjectControllerApi; -import com.msdw.tms.api.ExperimentalTeachingControllerApi; -import com.msdw.tms.api.UserControllerApi; import com.msdw.tms.common.utils.Constant; import com.msdw.tms.common.utils.PageUtils; import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.ExperimentalProjectEntity; -import com.msdw.tms.entity.ExperimentalTeachingEntity; -import com.msdw.tms.entity.UserEntity; import com.msdw.tms.entity.vo.ExperimentalProjectEntityVO; -import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO; -import com.msdw.tms.entity.vo.UserEntityVo; import com.msdw.tms.service.ExperimentalProjectService; -import com.msdw.tms.service.UserService; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Arrays; -import java.util.List; -import java.util.Map; @RestController @RequestMapping("tms/project") @@ -40,7 +30,7 @@ public class ExperimentalProjectController implements ExperimentalProjectControl return R.ok().put("experimental_project_name", one); } - /** + /**nm * 根据id查询实验班级详情 */ @GetMapping("/getById/{id}") diff --git a/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java b/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java index 7dd84ce..f070234 100644 --- a/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java +++ b/src/main/java/com/msdw/tms/controller/ExperimentalTeachingController.java @@ -2,24 +2,20 @@ package com.msdw.tms.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.msdw.tms.api.ExperimentalTeachingControllerApi; -import com.msdw.tms.api.UserControllerApi; import com.msdw.tms.common.utils.Constant; import com.msdw.tms.common.utils.PageUtils; import com.msdw.tms.common.utils.R; import com.msdw.tms.entity.ExperimentalTeachingEntity; -import com.msdw.tms.entity.UserEntity; -import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO; import com.msdw.tms.entity.vo.ExperimentalTeachingVO; -import com.msdw.tms.entity.vo.UserEntityVo; import com.msdw.tms.service.ExperimentalTeachingService; -import com.msdw.tms.service.UserService; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; @RestController @RequestMapping("tms/exp") @@ -32,6 +28,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr /** * 根据id查询实验班级详情 */ + @Override @GetMapping("/getById/{id}") public R getById(@PathVariable("id") Integer id){ ExperimentalTeachingEntity et = experimentalTeachingService.getById(id); @@ -40,6 +37,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr /** * 根据邀请码查询 */ + @Override @GetMapping("/getInvitationCode") public R getInvitationCode(@RequestParam Integer invitationCode) { ExperimentalTeachingEntity one = experimentalTeachingService.getOne(new QueryWrapper().eq("invitation_code", invitationCode) @@ -49,15 +47,19 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr /** * 查询 */ + @Override @GetMapping("/list") - public R list(@RequestParam Integer page, - @RequestParam Integer size, - Integer month, Integer type, Integer status, String startTime, String stopTime, String searchContent,@RequestParam Integer schoolId){ + public R list(@RequestParam Integer page, @RequestParam Integer size, + Integer month, Integer type, Integer status,Integer systemId, String startTime, + String stopTime, String searchContent,@RequestParam Integer schoolId){ ExperimentalTeachingVO vo = new ExperimentalTeachingVO(); vo.setSchoolId(schoolId); if (month!=null){ vo.setMonth(month); } + if (systemId!=null){ + vo.setSystemId(systemId); + } if (type!=null){ vo.setType(type); } @@ -80,6 +82,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr /** * 保存 */ + @Override @PostMapping("/save") public R save(@RequestBody ExperimentalTeachingEntity experimentalTeachingEntity){ experimentalTeachingService.save(experimentalTeachingEntity); @@ -89,6 +92,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr /** * 修改 */ + @Override @PostMapping("/update") public R update(@RequestBody ExperimentalTeachingEntity experimentalTeachingEntity) throws ParseException { //添加实验结束时间 @@ -117,6 +121,7 @@ public class ExperimentalTeachingController implements ExperimentalTeachingContr /** * 删除 */ + @Override @PostMapping("/delete") public R delete(@RequestBody Integer[] ids){ experimentalTeachingService.removeByIds(Arrays.asList(ids)); diff --git a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java index 0235cb4..e69def5 100644 --- a/src/main/java/com/msdw/tms/controller/ProjectRecordController.java +++ b/src/main/java/com/msdw/tms/controller/ProjectRecordController.java @@ -64,7 +64,7 @@ public class ProjectRecordController implements ProjectRcordControllerApi { @Override @GetMapping("/user/record") public R queryUserRecord(@RequestParam Integer page,@RequestParam Integer size,@RequestParam Integer userId,@RequestParam Integer projectPermissions){ - PageUtils page1 = projectRecordService.queryPage(page,size,userId,projectPermissions); + PageUtils page1 = projectRecordService.queryPage(page,size,userId); return R.ok().put("data", page1); } diff --git a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java index e1f10c7..7b5f19f 100644 --- a/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java +++ b/src/main/java/com/msdw/tms/dao/ProjectRecordDao.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.msdw.tms.entity.ExperimentalProjectEntity; import com.msdw.tms.entity.ExperimentalReportEntity; import com.msdw.tms.entity.ProjectRecordEntity; +import com.msdw.tms.entity.resp.GetByUserRecordResp; import com.msdw.tms.entity.vo.ProjectRecordExportVo; import com.msdw.tms.entity.vo.ProjectRecordVo; import com.msdw.tms.entity.vo.RecordVo; @@ -15,26 +16,24 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * - * - * @author - * @email + * @author + * @email * @date 2020-08-19 16:07:02 */ @Mapper public interface ProjectRecordDao extends BaseMapper { - IPage getByUserRecord(Page page,@Param("pro") ProjectRecordEntity projectRecordEntity,Integer projectPermissions); + IPage getByUserRecord(Page page, @Param("userId") Integer userId); - IPage getByUserExperimentRecord(Page page,@Param("pro") ProjectRecordEntity projectRecordEntity); + IPage getByUserExperimentRecord(Page page, @Param("pro") ProjectRecordEntity projectRecordEntity); List getByUserRecordImport(ProjectRecordEntity projectRecordEntity); - ProjectRecordVo getByUserScore(@Param("userid") Integer userId,@Param("isdel") Integer isdel); + ProjectRecordVo getByUserScore(@Param("userid") Integer userId, @Param("isdel") Integer isdel); ProjectRecordVo queryScore(@Param("userId") Integer userId); - IPage getBySchoolRecord(Page page,@Param("pro") ProjectRecordVo projectRecord); + IPage getBySchoolRecord(Page page, @Param("pro") ProjectRecordVo projectRecord); boolean updateUserRecord(ProjectRecordEntity projectRecord); diff --git a/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java b/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java index c6f3795..78033be 100644 --- a/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java +++ b/src/main/java/com/msdw/tms/entity/ExperimentalTeachingEntity.java @@ -45,6 +45,8 @@ public class ExperimentalTeachingEntity { private Integer isCode; //绑定用户Id private Integer userId; + //绑定系统Id + private Integer systemId; //创建时间 private String creationTime; //实验倒计时 diff --git a/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java b/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java new file mode 100644 index 0000000..5155336 --- /dev/null +++ b/src/main/java/com/msdw/tms/entity/resp/GetByUserRecordResp.java @@ -0,0 +1,89 @@ +package com.msdw.tms.entity.resp; + +import lombok.Data; + +/** + * @ProjectName: tms + * @Package: com.msdw.tms.entity.resp + * @ClassName: GetByUserRecordResp + * @Description: java类作用描述 + * @Author: Maureen.Rong + * @CreateDate: 2021/2/25 15:26 + * @UpdateDate: 2021/2/25 15:26 + * @Version: 1.0 + */ + +public class GetByUserRecordResp { + private String projectName; + private Integer recordId; + private Integer score; + private Integer codeId; + private String startingTime; + private String submitTime; + private Integer timeSum; + private Integer userId; + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public Integer getRecordId() { + return recordId; + } + + public void setRecordId(Integer recordId) { + this.recordId = recordId; + } + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } + + public Integer getCodeId() { + return codeId; + } + + public void setCodeId(Integer codeId) { + this.codeId = codeId; + } + + public String getStartingTime() { + return startingTime; + } + + public void setStartingTime(String startingTime) { + this.startingTime = startingTime; + } + + public String getSubmitTime() { + return submitTime; + } + + public void setSubmitTime(String submitTime) { + this.submitTime = submitTime; + } + + public Integer getTimeSum() { + return timeSum; + } + + public void setTimeSum(Integer timeSum) { + this.timeSum = timeSum; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } +} diff --git a/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java b/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java index 270246f..b3370c1 100644 --- a/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java +++ b/src/main/java/com/msdw/tms/entity/vo/ExperimentalTeachingVO.java @@ -18,4 +18,6 @@ public class ExperimentalTeachingVO { private Integer status; //学校id private Integer schoolId; + //绑定系统Id + private Integer systemId; } diff --git a/src/main/java/com/msdw/tms/service/ProjectRecordService.java b/src/main/java/com/msdw/tms/service/ProjectRecordService.java index 74edc2a..6f258a3 100644 --- a/src/main/java/com/msdw/tms/service/ProjectRecordService.java +++ b/src/main/java/com/msdw/tms/service/ProjectRecordService.java @@ -11,27 +11,25 @@ import java.util.HashMap; import java.util.List; /** - * - * - * @author - * @email + * @author + * @email * @date 2020-08-19 16:07:02 */ public interface ProjectRecordService extends IService { - PageUtils queryPage(Integer page,Integer size,Integer userId,Integer projectPermissions); + PageUtils queryPage(Integer page, Integer size, Integer userId); - PageUtils queryExperimentPage(Integer page,Integer size,Integer userid); + PageUtils queryExperimentPage(Integer page, Integer size, Integer userid); ProjectRecordVo queryUserScore(Integer userId); ProjectRecordVo queryScore(Integer userId); - void exportProjectRecord(HttpServletResponse response, Integer userId)throws Exception; + void exportProjectRecord(HttpServletResponse response, Integer userId) throws Exception; - void exportExperimentProjectRecord(HttpServletResponse response, Integer userId)throws Exception; + void exportExperimentProjectRecord(HttpServletResponse response, Integer userId) throws Exception; - PageUtils querySchoolRecord(Integer page,Integer size,ProjectRecordVo projectRecord); + PageUtils querySchoolRecord(Integer page, Integer size, ProjectRecordVo projectRecord); boolean updateUserRecord(ProjectRecordEntity projectRecord); diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java index b419d62..80ced2d 100644 --- a/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalReportServiceImpl.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; @Service -public class ExperimentalReportServiceImpl extends ServiceImpl implements ExperimentalReportService { +public class ExperimentalReportServiceImpl extends ServiceImpl implements ExperimentalReportService { @Autowired private ExperimentalReportDao reportDao; @@ -23,37 +23,47 @@ public class ExperimentalReportServiceImpl extends ServiceImpl map = new HashMap<>(); - map.put("report",result); - if(systemId==1|systemId==4|systemId==5){ + map.put("report", result); + if (systemId == 1 | systemId == 4 | systemId == 5) { List data = achievementManagementDao.queryPythonTest(recordId); - map.put("data",data); - return R.ok().put("data",map); + map.put("data", data); + return R.ok().put("data", map); } - return R.ok().put("data",map); + return R.ok().put("data", map); } + //虚拟实验 @Override public R queryVirtualReport(Integer recordId) { ExperimentalReportVo result = reportDao.queryVirtualReport(recordId); - Integer systemId =reportDao.querySystemId(recordId); + Integer systemId = reportDao.querySystemId(recordId); //python实验 - if(systemId==1|systemId==4|systemId==5){ + if (systemId == 1 | systemId == 4 | systemId == 5) { List data = achievementManagementDao.queryPythonTest(recordId); HashMap map = new HashMap<>(); - map.put("data",data); - map.put("report",result); - return R.ok().put("data",map); + map.put("data", data); + map.put("report", result); + return R.ok().put("data", map); } - return R.ok().put("data",result); + return R.ok().put("data", result); } } diff --git a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java index 140fa2c..1265737 100644 --- a/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ExperimentalTeachingServiceImpl.java @@ -1,31 +1,20 @@ package com.msdw.tms.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.msdw.tms.common.utils.Constant; import com.msdw.tms.common.utils.PageUtils; -import com.msdw.tms.common.utils.Query; import com.msdw.tms.dao.ClassTeachingDao; import com.msdw.tms.dao.ExperimentalTeachingDao; -import com.msdw.tms.dao.UserDao; import com.msdw.tms.entity.ExperimentalTeachingEntity; -import com.msdw.tms.entity.UserEntity; -import com.msdw.tms.entity.vo.ExperimentalTeachingEntityVO; import com.msdw.tms.entity.vo.ExperimentalTeachingVO; import com.msdw.tms.entity.vo.ProjectRecordVo; -import com.msdw.tms.entity.vo.UserEntityVo; import com.msdw.tms.service.ExperimentalTeachingService; -import com.msdw.tms.service.UserService; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Map; - @Service("experimentalTeachingService") public class ExperimentalTeachingServiceImpl extends ServiceImpl implements ExperimentalTeachingService { diff --git a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java index 020f208..85a1c44 100644 --- a/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java +++ b/src/main/java/com/msdw/tms/service/impl/ProjectRecordServiceImpl.java @@ -12,6 +12,7 @@ import com.msdw.tms.entity.ExperimentalReportEntity; import com.msdw.tms.entity.ProjectRecordEntity; import com.msdw.tms.entity.request.ExperimentProjectRecordImportRequest; import com.msdw.tms.entity.request.ProjectRecordImportRequest; +import com.msdw.tms.entity.resp.GetByUserRecordResp; import com.msdw.tms.entity.vo.ProjectRecordExportVo; import com.msdw.tms.entity.vo.ProjectRecordVo; import com.msdw.tms.service.ProjectRecordService; @@ -37,14 +38,15 @@ public class ProjectRecordServiceImpl extends ServiceImpl page1 = new Page<>(page, size); - IPage projectRecordVos = this.baseMapper.getByUserRecord(page1,projectRecord,projectPermissions); + IPage projectRecordVos = this.baseMapper.getByUserRecord(page1, userId); PageUtils questionsPage = new PageUtils(projectRecordVos); @@ -59,7 +61,7 @@ public class ProjectRecordServiceImpl extends ServiceImpl page1 = new Page<>(page, size); - IPage projectRecordVos = this.baseMapper.getByUserExperimentRecord(page1,projectRecord); + IPage projectRecordVos = this.baseMapper.getByUserExperimentRecord(page1, projectRecord); PageUtils questionsPage = new PageUtils(projectRecordVos); @@ -70,9 +72,9 @@ public class ProjectRecordServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + SELECT her.*, pm.projectName, s.workNumber + FROM hr_experimental_report her, + hr_project_management pm, + student s + WHERE her.reportId = #{reportId} + and her.studentId = #{studentId} + and her.projectId = pm.projectId + and her.studentId = s.userId - + - - - - - INSERT INTO hr_experimental_report( projectId, content, principle, step, analysis, summarize, improvement, - commentId, studentId, period,laboratory,className,steps1,steps2,steps3,steps4,steps5,steps6,steps7,steps8,steps9,steps10,timeConsuming,startTime,creationTime,purpose,teacherName) - VALUES - (#{projectId},#{content}, #{principle}, #{step}, #{analysis}, #{summarize}, #{improvement}, #{commentId}, #{studentId}, - #{period}, #{laboratory},#{className},#{steps1},#{steps2},#{steps3},#{steps4},#{steps5},#{steps6},#{steps7},#{steps8},#{steps9},#{steps10},#{timeConsuming},#{startTime},#{creationTime},#{purpose},#{teacherName}) + + + + + INSERT INTO hr_experimental_report(projectId, content, principle, step, analysis, summarize, improvement, + commentId, studentId, period, laboratory, className, steps1, steps2, steps3, + steps4, steps5, steps6, steps7, steps8, steps9, steps10, timeConsuming, + startTime, creationTime, purpose, teacherName) + VALUES (#{projectId}, #{content}, #{principle}, #{step}, #{analysis}, #{summarize}, #{improvement}, + #{commentId}, #{studentId}, + #{period}, #{laboratory}, #{className}, #{steps1}, #{steps2}, #{steps3}, #{steps4}, #{steps5}, + #{steps6}, #{steps7}, #{steps8}, #{steps9}, #{steps10}, #{timeConsuming}, #{startTime}, #{creationTime}, + #{purpose}, #{teacherName}) - - UPDATE tms_project_record tpr,hr_experimental_report tcr SET tpr.isdel = 1 , tcr.isdel = 1 WHERE tpr.recordId = tcr.eventId AND tcr.reportId = #{reportId} + + UPDATE tms_project_record tpr,hr_experimental_report tcr + SET tpr.isdel = 1, tcr.isdel = 1 + WHERE tpr.recordId = tcr.eventId AND tcr.reportId = #{reportId} + + + UPDATE tms_experimental_report + SET `comment` = #{comment} + WHERE reportId = #{reportId} - - UPDATE tms_experimental_report SET `comment` = #{comment} WHERE reportId = #{reportId} - - -UPDATE tms_experimental_report SET isSignature = #{isSignature} , signatureId = #{signatureId}, `comment` = #{comment} WHERE reportId = #{reportId} - - + SELECT ter.reportId, + IFNULL(ter.`comment`, (SELECT `comment` FROM tms_comment WHERE id = commentId)) AS comment, + ter.projectId, + ter.principle, + ter.content, + ter.step, + ter.`data`, + ter.analysis, + ter.conclusion, + ter.summarize, + ter.improvement, + ter.commentId, + ter.studentId, + ter.teacherName, + ter.period, + ter.laboratory, + ter.eventId, + ter.isSignature, + ter.signatureId, + ter.isdel, + hpm.projectName, + hpm.systemId, + ts.signature_name AS signatureName, + ts.signature_url AS signatureUrl, + tc.`level` + FROM tms_experimental_report ter + LEFT JOIN tms_signature ts ON signatureId = ts.id + LEFT JOIN tms_comment tc ON commentId = tc.id + LEFT JOIN tms_project_record AS tpr ON tpr.recordId = ter.eventId + LEFT JOIN hr_project_management AS hpm ON hpm.projectId = tpr.projectId + WHERE reportId = #{reportId} + + + + + - + + + + + + - SELECT - u.userName, - sch.schoolName, - s.workNumber, - tpr.score, - tpr.submitTime, - tpr.recordId, - tcr.reportId - FROM - hr_project_management hpm, - hr_user_info u, - student s, - tms_project_record tpr, - tms_experimental_report tcr, - school sch - WHERE - hpm.projectId = tpr.projectId - AND tpr.userId = u.userId - AND u.userId = s.userId - AND sch.schoolId = u.schoolId - AND tcr.eventId = tpr.recordId - AND tpr.isdel = 0 - AND tcr.isdel = 0 - AND u.isdel = 0 - - AND recordId IN ( - - #{recordId} - - ) - - GROUP BY - tcr.reportId - ORDER BY tpr.submitTime DESC - - - - - - - - + AND hjp.isdel = 0 + AND hec.recordId = #{recordId} + GROUP BY hec.codeId + + SELECT hpm.creationTime,hpm.projectId,hpm.projectName,hpm.projectPermissions,hpm.systemId,(SELECT count(*) FROM + hr_experimental_report her where hpm.projectId = her.projectId ) as number + FROM hr_project_management hpm WHERE systemId = #{systemId} + AND hpm.isdel = 0 + AND hpm.projectPermissions = + #{projectPermissions} + + and hpm.projectName like concat('%',#{searchContant},'%') + + and hpm.creationTime between + #{endTime} and #{startTime} + + and DATE_SUB(CURDATE(), INTERVAL #{month} month ) <= + date(hpm.creationTime) + + ORDER BY hpm.creationTime DESC + - + - + - + - + \ No newline at end of file diff --git a/src/main/resources/mapper/tms/ClassTeachingDao.xml b/src/main/resources/mapper/tms/ClassTeachingDao.xml index 8bb0cd6..17756c1 100644 --- a/src/main/resources/mapper/tms/ClassTeachingDao.xml +++ b/src/main/resources/mapper/tms/ClassTeachingDao.xml @@ -27,7 +27,7 @@ AND (user_id in (select userId FROM staff WHERE schoolId = #{cla.schoolId} AND isdel = 0 AND FIND_IN_SET(roleId,'1,2,3') ) OR user_id IN ( SELECT userId FROM hr_user_info WHERE disableAccount = 0 AND isdel = 0 AND FIND_IN_SET( roleId, '1' ) ) ) and `status` = #{cla.status} - and ( project_name like concat('%',#{cla.condition},'%') or experimental_class_name like concat('%',#{cla.condition},'%') ) + and ( experimental_name like concat('%',#{cla.condition},'%') or experimental_class_name like concat('%',#{cla.condition},'%') ) and stop_time between #{cla.endTime} and #{cla.startTime} and DATE_SUB(CURDATE(), INTERVAL #{cla.month} month ) <= date(creation_time) ORDER BY creation_time DESC diff --git a/src/main/resources/mapper/tms/ExperimentalReportDao.xml b/src/main/resources/mapper/tms/ExperimentalReportDao.xml index 6052511..7f087d8 100644 --- a/src/main/resources/mapper/tms/ExperimentalReportDao.xml +++ b/src/main/resources/mapper/tms/ExperimentalReportDao.xml @@ -1,85 +1,75 @@ - - - - - - - + + + + + + + + + - - \ No newline at end of file diff --git a/src/main/resources/mapper/tms/ProjectRecordDao.xml b/src/main/resources/mapper/tms/ProjectRecordDao.xml index 3fa668a..d1a6113 100644 --- a/src/main/resources/mapper/tms/ProjectRecordDao.xml +++ b/src/main/resources/mapper/tms/ProjectRecordDao.xml @@ -14,16 +14,16 @@ - + -INSERT INTO tms_project_record ( userId, projectId, score, startingTime, endTime, timeSum, submitTime ) -VALUES - (#{userid}, #{projectid}, #{score}, #{startingtime}, now(), #{timeSum}, now()) + INSERT INTO tms_project_record (userId, projectId, score, startingTime, endTime, timeSum, submitTime) + VALUES (#{userid}, #{projectid}, #{score}, #{startingtime}, now(), #{timeSum}, now()) - + SELECT projectName, + c.recordId, + r.score, + c.codeId, + r.startingTime, + r.submitTime, + r.timeSum, + c.userId + FROM hr_experiment_code c + INNER JOIN hr_project_management t ON t.projectId = c.projectId + INNER JOIN tms_project_record r ON r.recordId = c.recordId + WHERE c.userId = #{userId} + and r.isdel = 0 + ORDER BY c.codeId DESC - + SELECT tet.id, + ter.reportId, + tpr.recordId, + tpr.projectId, + projectName, + score, + timeSum, + startingTime as startTime, + endTime, + recordState, + tet.experimental_class_name as experimentalClassName + FROM tms_project_record tpr + LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId + LEFT JOIN tms_experimental_teaching tet ON tet.project_id = tpr.projectId + LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id + WHERE tpr.userId = #{pro.userid} + AND tpr.isdel = #{pro.isdel} + AND tp.projectPermissions !=0 AND ter.eventId = tpr.recordId ORDER BY - tpr.submitTime DESC + tpr.recordId DESC - + SELECT tpr.projectId, + projectName, + score, + timeSum, + startingTime as startTime, + endTime, + recordState, + tet.experimental_class_name + FROM tms_project_record tpr + LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId + LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id + WHERE tpr.userId = #{userid} + AND tpr.isdel = #{isdel} + AND tpr.projectId = tet.project_id + AND tp.projectPermissions != 0 ORDER BY - tpr.submitTime DESC + tpr.submitTime DESC - + update tms_project_record set isdel = #{isdel} ,recordstate = #{recordstate} @@ -184,6 +188,8 @@ VALUES - UPDATE tms_project_record SET score = #{score} WHERE recordId = #{recordid} + UPDATE tms_project_record + SET score = #{score} + WHERE recordId = #{recordid} \ No newline at end of file