diff --git a/src/main/java/com/subsidy/controller/ActivityDetectionController.java b/src/main/java/com/subsidy/controller/ActivityDetectionController.java index 7528136..85ed646 100644 --- a/src/main/java/com/subsidy/controller/ActivityDetectionController.java +++ b/src/main/java/com/subsidy/controller/ActivityDetectionController.java @@ -3,6 +3,7 @@ package com.subsidy.controller; import com.subsidy.common.ResponseData; import com.subsidy.common.ResponseVO; +import com.subsidy.common.interceptor.TimeRequired; import com.subsidy.dto.detection.VerifyDTO; import com.subsidy.model.ActivityDetectionDO; import com.subsidy.service.ActivityDetectionService; @@ -35,10 +36,17 @@ public class ActivityDetectionController { @PostMapping("verify") @ApiOperation("验证滑块 ticket randStr memberId classId") + @TimeRequired public ResponseVO verify(@RequestBody VerifyDTO verifyDTO, HttpServletRequest request){ return ResponseData.generateCreatedResponse(0,activityDetectionService.verify(verifyDTO,request)); } + @PostMapping("getCheckHistory") + @ApiOperation("获取某个人某个课程的活跃度验证详情 memberId classId") + public ResponseVO getCheckHistory(@RequestBody ActivityDetectionDO activityDetectionDO){ + return ResponseData.generateCreatedResponse(0,activityDetectionService.getCheckHistory(activityDetectionDO)); + } + diff --git a/src/main/java/com/subsidy/controller/AdministerController.java b/src/main/java/com/subsidy/controller/AdministerController.java index 2f1f19a..bad6784 100644 --- a/src/main/java/com/subsidy/controller/AdministerController.java +++ b/src/main/java/com/subsidy/controller/AdministerController.java @@ -97,7 +97,7 @@ public class AdministerController { } @PostMapping("classDetail") - @ApiOperation("班级管理--班级成员 id 班级id userName") + @ApiOperation("班级管理--班级成员 id 班级id userName pageSize pageNum") @LoginRequired public ResponseVO classDetail(@RequestBody ClassDetailDTO classDetailDTO){ return ResponseData.generateCreatedResponse(0,administerService.classDetail(classDetailDTO)); @@ -112,7 +112,7 @@ public class AdministerController { } @PostMapping("signDetail") - @ApiOperation("班级管理--注册签到 id 班级id userName") + @ApiOperation("班级管理--注册签到 id 班级id userName pageSize pageNum") @LoginRequired public ResponseVO signDetail(@RequestBody ClassDetailDTO classDetailDTO){ return ResponseData.generateCreatedResponse(0,administerService.signDetail(classDetailDTO)); @@ -127,7 +127,7 @@ public class AdministerController { } @PostMapping("exerciseTest") - @ApiOperation("班级管理--测评成绩 id 班级id userName paperId") + @ApiOperation("班级管理--测评成绩 id 班级id userName paperId pageSize pageNum") @LoginRequired public ResponseVO exerciseTest(@RequestBody ClassDetailDTO classDetailDTO){ return ResponseData.generateCreatedResponse(0,administerService.exerciseTest(classDetailDTO)); @@ -226,6 +226,14 @@ public class AdministerController { administerService.exportMemberDetectionRecord(classDetailDTO); } + @PostMapping("imageCheckDetail") + @ApiOperation("实名制验证详情 id 班级id userName pageSize pageNum") + @LoginRequired + public ResponseVO imageCheckDetail(@RequestBody ClassDetailDTO classDetailDTO){ + return ResponseData.generateCreatedResponse(0,administerService.imageCheckDetail(classDetailDTO)); + } + + @PostMapping("exportZip") @ApiOperation("下载压缩包 id 班级id") @CrossOrigin @@ -249,7 +257,7 @@ public class AdministerController { } @PostMapping("manageMember") - @ApiOperation("用户管理 {pageSize pageNum userName：名字}") + @ApiOperation("用户管理 {pageSize pageNum userName：名字 【废弃】}") @LoginRequired public ResponseVO manageMember(@RequestBody ManageMemberDTO manageMemberDTO){ return ResponseData.generateCreatedResponse(0,administerService.manageMember(manageMemberDTO)); diff --git a/src/main/java/com/subsidy/controller/ImageCheckRecordController.java b/src/main/java/com/subsidy/controller/ImageCheckRecordController.java index 40686bc..b3db474 100644 --- a/src/main/java/com/subsidy/controller/ImageCheckRecordController.java +++ b/src/main/java/com/subsidy/controller/ImageCheckRecordController.java @@ -1,6 +1,15 @@ package com.subsidy.controller; +import com.subsidy.common.ResponseData; +import com.subsidy.common.ResponseVO; +import com.subsidy.common.interceptor.LoginRequired; +import com.subsidy.model.ImageCheckRecordDO; +import com.subsidy.service.ImageCheckRecordService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -16,7 +25,21 @@ import io.swagger.annotations.Api; */ @RestController @Api(tags = "实名验证记录表") -@RequestMapping("/image-check-record-do") +@RequestMapping("/imageCheckRecord") public class ImageCheckRecordController { + + @Autowired + private ImageCheckRecordService imageCheckRecordService; + + + @PostMapping("getImageCheckHistory") + @ApiOperation("获取某人某个班级的验证历史 memberId classId ") + @LoginRequired + public ResponseVO getImageCheckHistory(@RequestBody ImageCheckRecordDO imageCheckRecordDO){ + return ResponseData.generateCreatedResponse(0,imageCheckRecordService.getImageCheckHistory(imageCheckRecordDO)); + } + + + } diff --git a/src/main/java/com/subsidy/mapper/AdministerMapper.java b/src/main/java/com/subsidy/mapper/AdministerMapper.java index 5ea5099..0d07293 100644 --- a/src/main/java/com/subsidy/mapper/AdministerMapper.java +++ b/src/main/java/com/subsidy/mapper/AdministerMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.subsidy.model.AdministerDO; import com.subsidy.vo.administer.ExerciseTestVO; +import com.subsidy.vo.administer.ImageCheckDetailVO; import com.subsidy.vo.administer.MemberDetectionRecordVO; import com.subsidy.vo.administer.PermissionsVO; import com.subsidy.vo.classdict.ClassDetailVO; @@ -51,5 +52,9 @@ public interface AdministerMapper extends BaseMapper { */ IPage classActivityDetection(IPage iPage, Long classId, String userName); + /** + * 实名验证 + */ + IPage imageCheckDetail(IPage iPage, Long classId, String userName); } diff --git a/src/main/java/com/subsidy/model/ImageCheckRecordDO.java b/src/main/java/com/subsidy/model/ImageCheckRecordDO.java index 33d915f..d47b9df 100644 --- a/src/main/java/com/subsidy/model/ImageCheckRecordDO.java +++ b/src/main/java/com/subsidy/model/ImageCheckRecordDO.java @@ -1,5 +1,7 @@ package com.subsidy.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.subsidy.util.BaseModel; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -20,6 +22,7 @@ public class ImageCheckRecordDO extends BaseModel { private static final long serialVersionUID = 1L; + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -32,7 +35,15 @@ public class ImageCheckRecordDO extends BaseModel { */ private Long paperId; - private String requestId; + /** + * 成员id + */ + private Long memberId; + private String requestId; + /** + * 图片地址 + */ + private String imageUrl; } diff --git a/src/main/java/com/subsidy/service/ActivityDetectionService.java b/src/main/java/com/subsidy/service/ActivityDetectionService.java index e5a0484..3a0ab1e 100644 --- a/src/main/java/com/subsidy/service/ActivityDetectionService.java +++ b/src/main/java/com/subsidy/service/ActivityDetectionService.java @@ -1,10 +1,12 @@ package com.subsidy.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.subsidy.dto.detection.VerifyDTO; import com.subsidy.model.ActivityDetectionDO; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** *

@@ -18,4 +20,6 @@ public interface ActivityDetectionService extends IService String verify(VerifyDTO verifyDTO, HttpServletRequest request); + IPage getCheckHistory(ActivityDetectionDO activityDetectionDO); + } diff --git a/src/main/java/com/subsidy/service/AdministerService.java b/src/main/java/com/subsidy/service/AdministerService.java index 3acd2ed..beb7745 100644 --- a/src/main/java/com/subsidy/service/AdministerService.java +++ b/src/main/java/com/subsidy/service/AdministerService.java @@ -72,6 +72,8 @@ public interface AdministerService extends IService { void exportMemberDetectionRecord(ClassDetailDTO classDetailDTO); + IPage imageCheckDetail(ClassDetailDTO classDetailDTO); + void export(ClassDetailDTO classDetailDTO)throws Exception; IPage memberStudy(MemberStudyLogDTO memberStudyLogDTO); diff --git a/src/main/java/com/subsidy/service/ImageCheckRecordService.java b/src/main/java/com/subsidy/service/ImageCheckRecordService.java index de11672..d66abc4 100644 --- a/src/main/java/com/subsidy/service/ImageCheckRecordService.java +++ b/src/main/java/com/subsidy/service/ImageCheckRecordService.java @@ -3,6 +3,8 @@ package com.subsidy.service; import com.subsidy.model.ImageCheckRecordDO; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 实名验证记录表 服务类 @@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ImageCheckRecordService extends IService { + List getImageCheckHistory(ImageCheckRecordDO imageCheckRecordDO); + } diff --git a/src/main/java/com/subsidy/service/impl/ActivityDetectionServiceImpl.java b/src/main/java/com/subsidy/service/impl/ActivityDetectionServiceImpl.java index 4bf94ad..48cd2d9 100644 --- a/src/main/java/com/subsidy/service/impl/ActivityDetectionServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/ActivityDetectionServiceImpl.java @@ -1,5 +1,6 @@ package com.subsidy.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.subsidy.common.configure.ActivityDetectionConfig; import com.subsidy.common.configure.VODConfig; import com.subsidy.common.configure.WechatConfig; @@ -95,4 +96,10 @@ public class ActivityDetectionServiceImpl extends ServiceImpl getCheckHistory(ActivityDetectionDO activityDetectionDO){ + + + return null; + } + } diff --git a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java index 297d536..7a16a08 100644 --- a/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java @@ -1033,7 +1033,11 @@ public class AdministerServiceImpl extends ServiceImpl memberDetectionRecordVOS = iPage.getRecords(); //TODO + } + public IPage imageCheckDetail(ClassDetailDTO classDetailDTO){ + Page pager = new Page(classDetailDTO.getPageNum(), classDetailDTO.getPageSize()); + return this.baseMapper.imageCheckDetail(pager,classDetailDTO.getId(),classDetailDTO.getUserName()); } public void writeVodExcel(List classDailyInfoVOS, HashMap hashMap, List title, HashMap vodHashmap) { diff --git a/src/main/java/com/subsidy/service/impl/ImageCheckRecordServiceImpl.java b/src/main/java/com/subsidy/service/impl/ImageCheckRecordServiceImpl.java index 881c8e2..d5a85c3 100644 --- a/src/main/java/com/subsidy/service/impl/ImageCheckRecordServiceImpl.java +++ b/src/main/java/com/subsidy/service/impl/ImageCheckRecordServiceImpl.java @@ -1,11 +1,14 @@ package com.subsidy.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.subsidy.model.ImageCheckRecordDO; import com.subsidy.mapper.ImageCheckRecordMapper; import com.subsidy.service.ImageCheckRecordService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 实名验证记录表 服务实现类 @@ -17,4 +20,12 @@ import org.springframework.stereotype.Service; @Service public class ImageCheckRecordServiceImpl extends ServiceImpl implements ImageCheckRecordService { + public List getImageCheckHistory(ImageCheckRecordDO imageCheckRecordDO){ + return this.baseMapper.selectList(new QueryWrapper() + .lambda() + .eq(ImageCheckRecordDO::getClassId,imageCheckRecordDO.getClassId()) + .eq(ImageCheckRecordDO::getMemberId,imageCheckRecordDO.getMemberId()) + .orderByDesc(ImageCheckRecordDO::getCreateDate)); + } + } diff --git a/src/main/java/com/subsidy/vo/administer/ImageCheckDetailVO.java b/src/main/java/com/subsidy/vo/administer/ImageCheckDetailVO.java new file mode 100644 index 0000000..1f8e658 --- /dev/null +++ b/src/main/java/com/subsidy/vo/administer/ImageCheckDetailVO.java @@ -0,0 +1,7 @@ +package com.subsidy.vo.administer; + +import lombok.Data; + +@Data +public class ImageCheckDetailVO { +} diff --git a/src/main/resources/mapper/AdministerMapper.xml b/src/main/resources/mapper/AdministerMapper.xml index 5a42698..ab76a16 100644 --- a/src/main/resources/mapper/AdministerMapper.xml +++ b/src/main/resources/mapper/AdministerMapper.xml @@ -144,4 +144,53 @@ order by t2.id + +