扫描点代码

install/mysql/init/scan_central_db.sql

@@ -91,6 +91,7 @@ CREATE TABLE IF NOT EXISTS `sc_exam`
     `scanner_assigned_verify_password` varchar(50) DEFAULT NULL,
     `year`                             int         DEFAULT NULL,
     `year_half`                        int         DEFAULT NULL,
+    `scan_site` 					varchar(50) 	DEFAULT NULL,
     `data_sync_time`                   bigint      DEFAULT NULL,
     `card_sync_time`                   bigint      DEFAULT NULL,
     `creator_id`                       bigint      DEFAULT NULL,

src/main/java/cn/com/qmth/scancentral/controller/admin/ExamController.java

@@ -1,28 +1,34 @@
 package cn.com.qmth.scancentral.controller.admin;
 
+import javax.validation.Valid;
+
+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.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.boot.core.collection.PageResult;
+
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.controller.BaseController;
 import cn.com.qmth.scancentral.entity.ExamEntity;
 import cn.com.qmth.scancentral.exception.ParameterExceptions;
 import cn.com.qmth.scancentral.service.ExamService;
-import cn.com.qmth.scancentral.service.StudentService;
-import cn.com.qmth.scancentral.service.SubjectService;
 import cn.com.qmth.scancentral.vo.ExamConfigVo;
 import cn.com.qmth.scancentral.vo.ExamVo;
 import cn.com.qmth.scancentral.vo.ResultVo;
+import cn.com.qmth.scancentral.vo.UpdateTimeVo;
 import cn.com.qmth.scancentral.vo.examinfo.ExamEdit;
 import cn.com.qmth.scancentral.vo.examinfo.ExamOverview;
 import cn.com.qmth.scancentral.vo.examinfo.ExamQuery;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.core.collection.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
 
 @RestController
 @Api(tags = "考试接口")
@@ -33,11 +39,18 @@ public class ExamController extends BaseController {
     @Autowired
     private ExamService examService;
 
-    @Autowired
-    private StudentService studentService;
+    @ApiOperation(value = "扫描点代码获取")
+    @PostMapping(value = "scan-site")
+    public String getScanSite(@RequestParam Long examId) {
+        return examService.getScanSite(examId);
+    }
 
-    @Autowired
-    private SubjectService subjectService;
+    @ApiOperation(value = "扫描点代码设置")
+    @PostMapping(value = "scan-site/save")
+    public UpdateTimeVo scanSiteSave(@RequestParam Long examId, @RequestParam String scanStie) {
+        examService.scanSiteSave(examId, scanStie);
+        return UpdateTimeVo.create();
+    }
 
     @ApiOperation(value = "考试概览数据")
     @RequestMapping(value = "/overview", method = RequestMethod.POST)
@@ -96,35 +109,39 @@ public class ExamController extends BaseController {
 
     // @ApiOperation(value = "修改考试上传状态")
     // @RequestMapping(value = "/upload", method = RequestMethod.POST)
-    // public ExamUploadVo upload(@RequestParam Long id, @RequestParam Boolean enable) {
-    //     User user = getAccessUser();
-    //     ExamUploadVo vo = new ExamUploadVo();
-    //     ExamEntity exam = examService.getById(id);
-    //     if (exam == null) {
-    //         throw ParameterExceptions.EXAM_NOT_FOUND;
-    //     }
+    // public ExamUploadVo upload(@RequestParam Long id, @RequestParam Boolean
+    // enable) {
+    // User user = getAccessUser();
+    // ExamUploadVo vo = new ExamUploadVo();
+    // ExamEntity exam = examService.getById(id);
+    // if (exam == null) {
+    // throw ParameterExceptions.EXAM_NOT_FOUND;
+    // }
     //
-    //     exam.setEnableUpload(enable);
-    //     examService.saveOrUpdate(exam);
-    //     vo.setEnable(exam.getEnableUpload());
-    //     vo.setUpdateTime(exam.getUpdateTime());
-    //     vo.setProgress(studentService.getUploadProgress(id));
-    //     return vo;
+    // exam.setEnableUpload(enable);
+    // examService.saveOrUpdate(exam);
+    // vo.setEnable(exam.getEnableUpload());
+    // vo.setUpdateTime(exam.getUpdateTime());
+    // vo.setProgress(studentService.getUploadProgress(id));
+    // return vo;
     // }
     //
     // @ApiOperation(value = "修改考试科目参数")
     // @RequestMapping(value = "/subject/config", method = RequestMethod.POST)
-    // public SubjectConfigVo subjectConfig(@Validated SubjectConfigDomain domain) {
-    //     User user = getAccessUser();
-    //     return subjectService.config(user, domain);
+    // public SubjectConfigVo subjectConfig(@Validated SubjectConfigDomain
+    // domain) {
+    // User user = getAccessUser();
+    // return subjectService.config(user, domain);
     // }
     //
     // @ApiOperation(value = "修改考试实时审核状态")
     // @RequestMapping(value = "/syncVerify", method = RequestMethod.POST)
-    // public ResultVo syncVerify(@RequestParam Long examId, @RequestParam Boolean enable) {
-    //     User user = getAccessUser();
-    //     ExamEntity exam = examService.updateEnableSyncVerify(user, examId, enable);
-    //     return new ResultVo(System.currentTimeMillis());
+    // public ResultVo syncVerify(@RequestParam Long examId, @RequestParam
+    // Boolean enable) {
+    // User user = getAccessUser();
+    // ExamEntity exam = examService.updateEnableSyncVerify(user, examId,
+    // enable);
+    // return new ResultVo(System.currentTimeMillis());
     // }
 
 }

src/main/java/cn/com/qmth/scancentral/entity/ExamEntity.java

@@ -71,6 +71,9 @@ public class ExamEntity extends AuditingWithoutIdEntity {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer examNumberFillCount;
 
+    // 扫描点代码
+    private String scanSite;
+
     public Long getId() {
         return id;
     }
@@ -247,4 +250,12 @@ public class ExamEntity extends AuditingWithoutIdEntity {
         this.yearHalf = yearHalf;
     }
 
+    public String getScanSite() {
+        return scanSite;
+    }
+
+    public void setScanSite(String scanSite) {
+        this.scanSite = scanSite;
+    }
+
 }

src/main/java/cn/com/qmth/scancentral/service/ExamService.java

@@ -54,4 +54,8 @@ public interface ExamService extends IService<ExamEntity> {
 
     AuditorOverview getAuditorOverview(Long examId, User user);
 
+    void scanSiteSave(Long examId, String scanStie);
+
+    String getScanSite(Long examId);
+
 }

src/main/java/cn/com/qmth/scancentral/service/impl/ExamServiceImpl.java

@@ -1,13 +1,48 @@
 package cn.com.qmth.scancentral.service.impl;
 
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.collection.PageResult;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.security.exception.AuthorizationException;
+
 import cn.com.qmth.scancentral.bean.ImportExamDomain;
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.dao.ExamDao;
 import cn.com.qmth.scancentral.entity.ExamEntity;
 import cn.com.qmth.scancentral.entity.ExamSummaryEntity;
-import cn.com.qmth.scancentral.enums.*;
+import cn.com.qmth.scancentral.enums.CheckStatus;
+import cn.com.qmth.scancentral.enums.ExamMode;
+import cn.com.qmth.scancentral.enums.ExamStatus;
+import cn.com.qmth.scancentral.enums.ImageTransferMode;
+import cn.com.qmth.scancentral.enums.OP;
+import cn.com.qmth.scancentral.enums.Role;
+import cn.com.qmth.scancentral.enums.SystemMode;
+import cn.com.qmth.scancentral.enums.TaskStatus;
 import cn.com.qmth.scancentral.exception.ParameterExceptions;
-import cn.com.qmth.scancentral.service.*;
+import cn.com.qmth.scancentral.service.AnswerCardService;
+import cn.com.qmth.scancentral.service.BatchService;
+import cn.com.qmth.scancentral.service.ExamService;
+import cn.com.qmth.scancentral.service.ExamSummaryService;
+import cn.com.qmth.scancentral.service.OmrGroupService;
+import cn.com.qmth.scancentral.service.OmrTaskService;
+import cn.com.qmth.scancentral.service.PackageCardService;
+import cn.com.qmth.scancentral.service.PackageTaskService;
+import cn.com.qmth.scancentral.service.StudentService;
+import cn.com.qmth.scancentral.service.SubjectService;
 import cn.com.qmth.scancentral.util.JsonMapper;
 import cn.com.qmth.scancentral.util.MathUtil;
 import cn.com.qmth.scancentral.util.PageUtil;
@@ -23,33 +58,12 @@ import cn.com.qmth.scancentral.vo.scanexaminfo.ScanExamInfoVo;
 import cn.com.qmth.scancentral.vo.scanexamlist.ScanExamListQuery;
 import cn.com.qmth.scancentral.vo.scanexamlist.ScanExamListVo;
 import cn.com.qmth.scancentral.vo.studentimport.StudentImportConfigVo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.collection.PageResult;
-import com.qmth.boot.core.concurrent.service.ConcurrentService;
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.security.exception.AuthorizationException;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 @Service
 public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements ExamService {
 
     private static final Logger log = LoggerFactory.getLogger(ExamServiceImpl.class);
 
-    @Autowired
-    private SessionService sessionService;
-
     @Autowired
     private AnswerCardService answerCardService;
 
@@ -68,21 +82,12 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
     @Autowired
     private SubjectService subjectService;
 
-    @Autowired
-    private SystemConfigService systemConfigService;
-
     @Autowired
     private BatchService batchService;
 
-    @Autowired
-    private ConcurrentService concurrentService;
-
     @Autowired
     private OmrGroupService omrGroupService;
 
-    @Autowired
-    private UserService userService;
-
     @Autowired
     private ExamSummaryService examSummaryService;
 
@@ -305,7 +310,8 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
 
         LambdaUpdateWrapper<ExamEntity> updateWrapper = Wrappers.lambdaUpdate(ExamEntity.class);
         if (config.getPaperTypeBarcodeContent() != null) {
-            updateWrapper.setSql("paper_type_barcode_content = '" + new JsonMapper().toJson(config.getPaperTypeBarcodeContent()) + "'");
+            updateWrapper.setSql("paper_type_barcode_content = '"
+                    + new JsonMapper().toJson(config.getPaperTypeBarcodeContent()) + "'");
         }
         if (config.getImageCheckRatio() != null) {
             updateWrapper.set(ExamEntity::getImageCheckRatio, config.getImageCheckRatio());
@@ -520,4 +526,18 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         return vo;
     }
 
+    @Transactional
+    @Override
+    public void scanSiteSave(Long examId, String scanStie) {
+        LambdaUpdateWrapper<ExamEntity> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.set(ExamEntity::getScanSite, scanStie);
+        updateWrapper.eq(ExamEntity::getId, examId);
+        this.update(updateWrapper);
+    }
+
+    @Override
+    public String getScanSite(Long examId) {
+        return this.getById(examId).getScanSite();
+    }
+
 }