diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/mapper/HardwareScreenMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/mapper/HardwareScreenMapper.java index c8ceb9d..b4648f0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/mapper/HardwareScreenMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/mapper/HardwareScreenMapper.java @@ -1,6 +1,7 @@ package com.bonus.canteen.core.screening.mapper; import com.bonus.canteen.core.screening.vo.HydroPowerVo; +import com.bonus.canteen.core.screening.vo.MorningCheckVo; import java.util.List; @@ -9,4 +10,7 @@ import java.util.List; */ public interface HardwareScreenMapper { public List selectHydroPowerByType(Long type); + public MorningCheckVo getMorningCheckInfo(); + public MorningCheckVo getHealthCheckNum(); + public List getCookCertificateInfo(); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/HardwareScreenServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/HardwareScreenServiceImpl.java index aa5b055..13924c3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/HardwareScreenServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/service/HardwareScreenServiceImpl.java @@ -82,8 +82,20 @@ public class HardwareScreenServiceImpl implements HardwareScreenService { public MorningCheckVo getMorningCheckInfo(MorningCheckVo morningCheckVo) { MorningCheckVo vo=new MorningCheckVo(); try{ - vo.setMorningCheckNum(10); - vo.setMorningCheckAbno(2); + MorningCheckVo morningCheck=mapper.getMorningCheckInfo(); + MorningCheckVo healthCheck=mapper.getHealthCheckNum(); + if(morningCheck!=null){ + vo.setMorningCheckNum(morningCheck.getMorningCheckNum()); + vo.setMorningCheckAbno(morningCheck.getMorningCheckAbno()); + vo.setFaceCheckNum(morningCheck.getFaceCheckNum()); + vo.setFaceCheckAbno(morningCheck.getFaceCheckAbno()); + vo.setHandCheckNum(morningCheck.getHandCheckNum()); + vo.setHandCheckAbno(morningCheck.getHandCheckAbno()); + } + if(healthCheck!=null){ + vo.setHealthNum(healthCheck.getHealthNum()); + vo.setHealthAbno(healthCheck.getHealthAbno()); + } }catch (Exception e){ e.printStackTrace(); } @@ -109,11 +121,12 @@ public class HardwareScreenServiceImpl implements HardwareScreenService { public List getCookCertificateInfo(MorningCheckVo morningCheckVo) { List morningCheckVos=new ArrayList<>(); try{ - for(int i=0;i<7;i++){ - MorningCheckVo vo=new MorningCheckVo(); - vo.setPicUrl("http://sgwpdm.ah.sgcc.com.cn/canteen/lnyst/378915229716713472/backStaff/45001ac9a65e4692b2c7499381203c65.jpg"); - morningCheckVos.add(vo); - } + morningCheckVos=mapper.getCookCertificateInfo(); +// for(int i=0;i<7;i++){ +// MorningCheckVo vo=new MorningCheckVo(); +// vo.setPicUrl("http://sgwpdm.ah.sgcc.com.cn/canteen/lnyst/378915229716713472/backStaff/45001ac9a65e4692b2c7499381203c65.jpg"); +// morningCheckVos.add(vo); +// } }catch (Exception e){ e.printStackTrace(); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/MorningCheckVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/MorningCheckVo.java index 5ea66d2..15a4b63 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/MorningCheckVo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/screening/vo/MorningCheckVo.java @@ -38,4 +38,11 @@ public class MorningCheckVo { private long healthAbno; private String picUrl; + private String staffId; + private String temperatureStatus; + private String checkStatus; + private String faceCheckStatus; + private String handCheckStatus; + private String recordTime; + private String staffname; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/screening/HardwareScreenMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/screening/HardwareScreenMapper.xml index f867ce9..6295d64 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/screening/HardwareScreenMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/screening/HardwareScreenMapper.xml @@ -6,4 +6,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + \ No newline at end of file