图片审核、实施审核新增deviceName

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

@@ -1,9 +1,10 @@
 package cn.com.qmth.scancentral.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+
 import cn.com.qmth.scancentral.bean.ScannerLoginInfo;
 import cn.com.qmth.scancentral.entity.ScannerEntity;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfoVo;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * 鉴权
@@ -14,4 +15,6 @@ public interface ScannerService extends IService<ScannerEntity> {
 
     ScannerInfoVo scannerInfo(Long examId);
 
+    ScannerEntity findByDevice(String device);
+
 }

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

@@ -85,6 +85,8 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
 
     @Autowired
     private AssignedCheckHistoryService assignedCheckHistoryService;
+    @Autowired
+    private ScannerService scannerService;
 
     @Override
     public BatchEntity checkBatchStatus(BatchEntity b) {
@@ -577,6 +579,8 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
         vo.setBatchId(batch.getId());
         vo.setCreateTime(batch.getCreateTime());
         vo.setDevice(batch.getDevice());
+        ScannerEntity scanner = scannerService.findByDevice(batch.getDevice());
+        vo.setDeviceName(scanner.getDeviceName());
         vo.setPackageCode(batch.getPackageCode());
 
         Map<Long, VerifyStudentVo> studentMap = new LinkedHashMap<>();
@@ -695,6 +699,8 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
         vo.setBatchId(batch.getId());
         vo.setCreateTime(batch.getCreateTime());
         vo.setDevice(batch.getDevice());
+        ScannerEntity scanner = scannerService.findByDevice(batch.getDevice());
+        vo.setDeviceName(scanner.getDeviceName());
         vo.setPackageCode(batch.getPackageCode());
 
         Map<Long, VerifyStudentVo> studentMap = new LinkedHashMap<>();

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

@@ -1,5 +1,19 @@
 package cn.com.qmth.scancentral.service.impl;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+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.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.exception.ParameterException;
+
 import cn.com.qmth.scancentral.bean.ScannerLoginInfo;
 import cn.com.qmth.scancentral.dao.ScannerDao;
 import cn.com.qmth.scancentral.entity.AnswerCardEntity;
@@ -13,16 +27,6 @@ import cn.com.qmth.scancentral.vo.scannerinfo.Control;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfo;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfoCard;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfoVo;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.exception.ParameterException;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 @Service
 public class ScannerServiceImpl extends ServiceImpl<ScannerDao, ScannerEntity> implements ScannerService {
@@ -85,4 +89,12 @@ public class ScannerServiceImpl extends ServiceImpl<ScannerDao, ScannerEntity> i
         return vo;
     }
 
+    @Override
+    public ScannerEntity findByDevice(String device) {
+        QueryWrapper<ScannerEntity> wrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<ScannerEntity> lw = wrapper.lambda();
+        lw.eq(ScannerEntity::getDevice, device);
+        return this.getOne(wrapper);
+    }
+
 }

src/main/java/cn/com/qmth/scancentral/vo/verify/VerifyTaskVo.java

@@ -8,6 +8,8 @@ public class VerifyTaskVo {
 
     private String device;
 
+    private String deviceName;
+
     private Long createTime;
 
     private String packageCode;
@@ -54,4 +56,11 @@ public class VerifyTaskVo {
         this.students = students;
     }
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
 }