Merge remote-tracking branch 'origin/master'

src/main/java/com/yx/face/dao/SystemLongTermDocumentsDao.java

@@ -16,5 +16,8 @@ public interface SystemLongTermDocumentsDao extends TKMapper<SystemLongTermDocum
 
     SystemLongTermDocuments getByIdNumber(@Param("idNumber") String idNumber);
 
+    Long getIdByIdNumber(String idNumber);
+
+    Long getIdByPhone(String phone);
 }
 

src/main/java/com/yx/face/service/SystemLongTermDocumentsService.java

@@ -23,4 +23,5 @@ public interface SystemLongTermDocumentsService {
 
     Boolean getByIdNumber(String idNumber);
 
+    Boolean getByIdNumberAndPhone(String idNumber, String phone);
 }

src/main/java/com/yx/face/service/impl/AsyncTriggerRetryImpl.java

@@ -34,13 +34,13 @@ public class AsyncTriggerRetryImpl {
             if (result.get("msg") != null) {
                 String msg = result.get("msg").toString();
                 if (msg.contains("不在线")) {
-                    //设备不在线 重试 3次
-                    Boolean retry = triggerRetry(params);
-                    if (!retry) {
+//                    //设备不在线 重试 3次
+//                    Boolean retry = triggerRetry(params);
+//                    if (!retry) {
                         facePass.setStatus(3);
                         facePassDao.updateByPrimaryKeySelective(facePass);
-                    }
-
+//                    }
+//
                 }
             }
         } catch (Exception e) {

src/main/java/com/yx/face/service/impl/SystemLongTermDocumentsServiceImpl.java

@@ -116,6 +116,21 @@ public class SystemLongTermDocumentsServiceImpl implements SystemLongTermDocumen
         return systemLongTermDocuments!=null;
     }
 
+    @Override
+    public Boolean getByIdNumberAndPhone(String idNumber, String phone) {
+        Long id = null;
+        if (org.springframework.util.StringUtils.hasText(idNumber)) {
+            id = systemLongTermDocumentsDao.getIdByIdNumber(idNumber);
+            if(id == null){
+                id = systemLongTermDocumentsDao.getIdByPhone(phone);
+            }
+        } else {
+            id = systemLongTermDocumentsDao.getIdByPhone(phone);
+        }
+        if(id == null)return false;
+        else return true;
+    }
+
 
     public void faceDeviceList(FaceDevice faceDevice, SystemLongTermDocuments systemLongTermDocuments) {
         //天波人脸服务请求日志表

src/main/java/com/yx/face/service/impl/UserInfoServiceImpl.java

@@ -19,6 +19,7 @@ import com.yx.face.model.vo.AdminVO;
 import com.yx.face.model.vo.UserInfoVO;
 import com.yx.face.netty_client.NettyClient;
 import com.yx.face.service.AdminService;
+import com.yx.face.service.SystemLongTermDocumentsService;
 import com.yx.face.service.UserInfoService;
 import com.yx.face.service.feign.TBDeviceFaceService;
 import lombok.extern.slf4j.Slf4j;
@@ -74,6 +75,8 @@ public class UserInfoServiceImpl implements UserInfoService {
     private RedisUtil redisUtil;
     @Autowired
     private AdminService adminService;
+    @Autowired
+    private SystemLongTermDocumentsService systemLongTermDocumentsService;
 
     //    @Value("${wx.phone.url}")
     private static final String wxUrl = "http://192.168.99.11:9810/winxin-fyzd/weiXin/getPhone";
@@ -233,6 +236,10 @@ public class UserInfoServiceImpl implements UserInfoService {
         if (!select.isEmpty()) {
             throw new ServiceException("禁止下发哦~");
         }
+        /*查询是否是员工*/
+        Boolean b = systemLongTermDocumentsService.getByIdNumberAndPhone(userInfo.getIdNumber(),userInfo.getPhone());
+        if(b){throw new ServiceException("你是员工请走员工通道");}
+
         //常客
         UserWhitelist byPhoneAndId = userWhitelistdao.getByPhoneAndId(userInfo.getPhone(), null, Integer.valueOf(admin));
         //访客
@@ -277,7 +284,7 @@ public class UserInfoServiceImpl implements UserInfoService {
         //List<FaceDevice> snList = faceDeviceDao.getSnList(Integer.parseInt(admin));
         //查询员工通道设备(type=2)
         AdminVO adminVO = adminService.getInfo(Integer.valueOf(admin));
-        List<FaceDevice> snList = faceDeviceDao.getByAdminAndType(adminVO);
+        List<FaceDevice> snList = faceDeviceDao.getSnList(Integer.valueOf(admin));
         Map<String, Object> result;
         //天波人脸服务请求日志表
         FaceRequestLog requestLog;

src/main/resources/mapper/SystemLongTermDocumentsDao.xml

@@ -34,5 +34,15 @@
         FROM system_long_term_documents
         where id_number=#{idNumber}
     </select>
+    <select id="getIdByPhone" resultType="com.yx.face.model.entity.SystemLongTermDocuments">
+        SELECT id
+        FROM system_long_term_documents
+        where photo=#{photo}
+    </select>
+    <select id="getIdByIdNumber" resultType="java.lang.Long">
+        SELECT id
+        FROM system_long_term_documents
+        where id_number=#{idNumber}
+    </select>
 </mapper>