Merge remote-tracking branch 'origin/V1' into V1

common/src/main/resources/mapper/base/DeviceInfo.xml

@@ -158,7 +158,7 @@ id_, header_,device_no,alias_name,address_,is_online,company_id,unlock_password,
 	 	</foreach>
 	</select>
 	<select id="findByDeviceNo" parameterType="string" resultMap="DeviceInfoMap">
-			select * from base_device_info where device_no = #{0}
+			select * from base_device_info where device_no = #{0} and del_flag=false
 	</select>
 
 </mapper>

lapi/src/main/java/com/jpsoft/smart/lapi/handler/PersonVerificationHandler.java

@@ -80,18 +80,5 @@ public class PersonVerificationHandler extends SimpleChannelInboundHandler<Perso
         personDeviceLogService.deviceInsertLog(deviceNo,temperature,faceImageJson,libMatInfoListJson,matchPersonInfo,date);
 
 
-
-
-        /*log.warn("faceJson"+faceJson);
-        log.warn("FaceImage"+faceImageJson);
-        log.warn("LibMatInfoList"+libMatInfoListJson);
-        log.warn("MatchPersonInfo"+matchPersonInfo);
-        long timestamp = jsonObject.getLong("Timestamp");
-
-        Date date = new Date(timestamp);
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-        log.warn("考勤时间：" + sdf.format(date));*/
     }
 }