备个份

涂亚平
Commit 0f667e75 authored Jul 15, 2022 by 涂亚平
Showing with 149 additions and 6 deletions
src/main/java/com/subsidy/controller/ActivityDetectionController.java
src/main/java/com/subsidy/controller/AdministerController.java
src/main/java/com/subsidy/controller/ImageCheckRecordController.java
src/main/java/com/subsidy/mapper/AdministerMapper.java
src/main/java/com/subsidy/model/ImageCheckRecordDO.java
src/main/java/com/subsidy/service/ActivityDetectionService.java
src/main/java/com/subsidy/service/AdministerService.java
src/main/java/com/subsidy/service/ImageCheckRecordService.java
src/main/java/com/subsidy/service/impl/ActivityDetectionServiceImpl.java
src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java
src/main/java/com/subsidy/service/impl/ImageCheckRecordServiceImpl.java
src/main/java/com/subsidy/vo/administer/ImageCheckDetailVO.java
src/main/resources/mapper/AdministerMapper.xml
--- 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));
+    }

--- 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));

--- a/src/main/java/com/subsidy/controller/ImageCheckRecordController.java
+++ b/src/main/java/com/subsidy/controller/ImageCheckRecordController.java
 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));
+    }
 }
--- 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<AdministerDO> {
     */
    IPage<MemberDetectionRecordVO> classActivityDetection(IPage iPage, Long classId, String userName);
+    /**
+     * 实名验证
+     */
+    IPage<ImageCheckDetailVO> imageCheckDetail(IPage iPage, Long classId, String userName);
 }
--- a/src/main/java/com/subsidy/model/ImageCheckRecordDO.java
+++ b/src/main/java/com/subsidy/model/ImageCheckRecordDO.java
 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;
 }
--- a/src/main/java/com/subsidy/service/ActivityDetectionService.java
+++ b/src/main/java/com/subsidy/service/ActivityDetectionService.java
 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;
 /**
 * <p>
@@ -18,4 +20,6 @@ public interface ActivityDetectionService extends IService<ActivityDetectionDO> 
    String verify(VerifyDTO verifyDTO, HttpServletRequest request);
+    IPage<ActivityDetectionDO> getCheckHistory(ActivityDetectionDO activityDetectionDO);
 }
--- 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<AdministerDO> {
    void exportMemberDetectionRecord(ClassDetailDTO classDetailDTO);
+    IPage<ImageCheckDetailVO> imageCheckDetail(ClassDetailDTO classDetailDTO);
    void export(ClassDetailDTO classDetailDTO)throws Exception;
    IPage memberStudy(MemberStudyLogDTO memberStudyLogDTO);

--- 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;
 /**
 * <p>
 * 实名验证记录表 服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface ImageCheckRecordService extends IService<ImageCheckRecordDO> {
+   List<ImageCheckRecordDO> getImageCheckHistory(ImageCheckRecordDO imageCheckRecordDO);
 }
--- a/src/main/java/com/subsidy/service/impl/ActivityDetectionServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/ActivityDetectionServiceImpl.java
 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<ActivityDetectionM
        return null;
    }
+    public IPage<ActivityDetectionDO> getCheckHistory(ActivityDetectionDO activityDetectionDO){
+        return null;
+    }
 }
--- 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<AdministerMapper, Adminis
        IPage iPage = baseMapper.classActivityDetection(pager, classDetailDTO.getId(), classDetailDTO.getUserName());
        List<MemberDetectionRecordVO> memberDetectionRecordVOS = iPage.getRecords();
        //TODO
+    }
+    public IPage<ImageCheckDetailVO> imageCheckDetail(ClassDetailDTO classDetailDTO){
+        Page pager = new Page(classDetailDTO.getPageNum(), classDetailDTO.getPageSize());
+        return this.baseMapper.imageCheckDetail(pager,classDetailDTO.getId(),classDetailDTO.getUserName());
    }
    public <T> void writeVodExcel(List<ClassDailyInfoVO> classDailyInfoVOS, HashMap<String, Integer> hashMap, List<String> title, HashMap<String, Integer> vodHashmap) {

--- a/src/main/java/com/subsidy/service/impl/ImageCheckRecordServiceImpl.java
+++ b/src/main/java/com/subsidy/service/impl/ImageCheckRecordServiceImpl.java
 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;
 /**
 * <p>
 * 实名验证记录表 服务实现类
@@ -17,4 +20,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class ImageCheckRecordServiceImpl extends ServiceImpl<ImageCheckRecordMapper, ImageCheckRecordDO> implements ImageCheckRecordService {
+    public List<ImageCheckRecordDO> getImageCheckHistory(ImageCheckRecordDO imageCheckRecordDO){
+        return this.baseMapper.selectList(new QueryWrapper<ImageCheckRecordDO>()
+        .lambda()
+        .eq(ImageCheckRecordDO::getClassId,imageCheckRecordDO.getClassId())
+        .eq(ImageCheckRecordDO::getMemberId,imageCheckRecordDO.getMemberId())
+        .orderByDesc(ImageCheckRecordDO::getCreateDate));
+    }
 }
--- a/src/main/java/com/subsidy/vo/administer/ImageCheckDetailVO.java
+++ b/src/main/java/com/subsidy/vo/administer/ImageCheckDetailVO.java
+package com.subsidy.vo.administer;
+import lombok.Data;
+@Data
+public class ImageCheckDetailVO {
+}
--- a/src/main/resources/mapper/AdministerMapper.xml
+++ b/src/main/resources/mapper/AdministerMapper.xml
@@ -144,4 +144,53 @@
        order by t2.id
    </select>
+    <select id="imageCheckDetail" resultType="com.subsidy.vo.administer.ImageCheckDetailVO">
+        SELECT
+            t1.id,
+            t1.user_name,
+            t1.account_name,
+            t1.telephone,
+            t1.id_card,
+            cnt,
+            recentDate
+        FROM
+            (
+            SELECT
+                t2.id,
+                t2.user_name,
+                t2.account_name,
+                t2.telephone,
+                t2.id_card,
+                count( t3.id ) AS cnt
+            FROM
+                class_member_mapping t
+                LEFT JOIN member t2 ON t.member_id = t2.id
+                LEFT JOIN image_check_record t3 ON t.class_id = t3.class_id
+                AND t.member_id = t3.member_id
+            WHERE
+                t.delete_date IS NULL
+                AND t2.delete_date IS NULL
+                <if  test="userName != null and userName !=''">
+                    and t2.user_name like concat('%',#{userName} ,'%')
+                </if>
+                AND t.class_id = #{classId}
+            GROUP BY
+                t.member_id
+            ) t1
+            LEFT JOIN (
+            SELECT
+                t2.member_id,
+                t2.class_id,
+                max( t2.create_date ) AS recentDate
+            FROM
+                image_check_record t2
+            WHERE
+                t2.delete_date IS NULL
+                AND t2.class_id = #{classId}
+            GROUP BY
+                t2.member_id,
+            t2.class_id
+            ) t2 ON t1.id = t2.member_id
+    </select>
 </mapper>