diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java
index 6a170bd..a09d86c 100644
--- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java
+++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java
@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.bonus.common.core.urk.CommonUtils;
import com.bonus.common.core.urk.Constant;
+import com.bonus.common.core.utils.StringUtils;
import com.bonus.urk.service.UserFaceHandleService;
import com.bonus.urk.vo.BmWorkerEinUserVo;
import com.bonus.urk.vo.DeviceVo;
@@ -43,6 +44,7 @@ public class UserFaceHandle {
@Async
public void addUserAttendance(DeviceVo deviceVo, HttpServletRequest req, HttpServletResponse resp) {
try{
+ //判断设备是否绑定工程
// 解析request输入流
String jsonStr = getRequestBody(req);
log.info("出入记录:{}", jsonStr);
@@ -64,7 +66,8 @@ public class UserFaceHandle {
}
//验证用户是否入场
BmWorkerEinUserVo vo=service.getOnUserInfo(userId);
- if(vo==null){
+ String proId=service.getDevPorId(devCode);
+ if(vo==null && StringUtils.isNotEmpty(proId)){
vo=new BmWorkerEinUserVo();
vo.setAttPhoto(bast64);
vo.setAttTime(time);
@@ -72,18 +75,17 @@ public class UserFaceHandle {
vo.setDevName(deviceVo.getDeviceName());
vo.setUserId(userId);
service.addWrcUser(vo);
- resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.OK);
- resp.getWriter().write("");
}else {
+ assert vo != null;
vo.setAttPhoto(bast64);
vo.setAttTime(time);
vo.setDevCode(devCode);
vo.setDevName(deviceVo.getDeviceName());
service.addAttendInfo(vo);
//数据返回
- resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.OK);
- resp.getWriter().write("");
}
+ resp.addHeader(Constant.DEVICE_HEADER_RESPONSE_CODE, Constant.OK);
+ resp.getWriter().write("");
}catch (Exception e){
log.error(e.toString(),e);
}
diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/UserFaceHandleMapper.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/UserFaceHandleMapper.java
index f83304d..d498775 100644
--- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/UserFaceHandleMapper.java
+++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/mapper/UserFaceHandleMapper.java
@@ -49,4 +49,11 @@ public interface UserFaceHandleMapper {
* @param vo
*/
void addWrcUser(BmWorkerEinUserVo vo);
+
+ /**
+ * 查询考情机绑定的工程
+ * @param devCode
+ * @return
+ */
+ String getDevPorId(@Param("devCode") String devCode);
}
diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/UserFaceHandleService.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/UserFaceHandleService.java
index 27f1a89..158aa10 100644
--- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/UserFaceHandleService.java
+++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/UserFaceHandleService.java
@@ -105,4 +105,18 @@ public class UserFaceHandleService {
}
}
+
+ /**
+ * 查询考情机绑定的工程
+ * @param devCode
+ * @return
+ */
+ public String getDevPorId(String devCode) {
+ try{
+ return mapper.getDevPorId(devCode);
+ }catch (Exception e){
+ log.error(e.toString(),e);
+ }
+ return null;
+ }
}
diff --git a/bonus-modules/bonus-urk/src/main/resources/mapper/urk/UserFaceHandleMapper.xml b/bonus-modules/bonus-urk/src/main/resources/mapper/urk/UserFaceHandleMapper.xml
index 838b3b6..d425598 100644
--- a/bonus-modules/bonus-urk/src/main/resources/mapper/urk/UserFaceHandleMapper.xml
+++ b/bonus-modules/bonus-urk/src/main/resources/mapper/urk/UserFaceHandleMapper.xml
@@ -42,6 +42,11 @@
from bm_att_record_no_ru
where worker_id=#{userId} and is_active=1 and att_day=#{attDay}
+
insert into bm_att_record_no_ru(