异步调用的时候去掉返回的错误信息

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

@@ -6,7 +6,9 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yx.face.boot.restful.RestDTO;
 import com.yx.face.boot.restful.ServiceException;
-import com.yx.face.boot.uitls.*;
+import com.yx.face.boot.uitls.DateUtils;
+import com.yx.face.boot.uitls.JsonUtils;
+import com.yx.face.boot.uitls.SMSOrIdCardUtils;
 import com.yx.face.dao.*;
 import com.yx.face.model.entity.*;
 import com.yx.face.model.search.UserWhitelistSearch;
@@ -15,6 +17,7 @@ import com.yx.face.model.vo.UserVisitorListVO;
 import com.yx.face.model.vo.UserWhitelistVO;
 import com.yx.face.service.AdminService;
 import com.yx.face.service.UserVisitorListService;
+import com.yx.face.service.feign.TBDeviceFaceService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,8 +38,6 @@ import java.util.*;
 public class UserVisitorListServiceImpl implements UserVisitorListService {
     @Resource
     private UserVisitorListDao userVisitorListDao;
-    @Resource
-    private UserVisitorListFromDao userVisitorListFromDao;
 
     @Resource
     private AdminService adminService;
@@ -62,11 +63,6 @@ public class UserVisitorListServiceImpl implements UserVisitorListService {
     @Resource
     private FaceTaskDao faceTaskDao;
 
-    @Resource
-    private UserWhiteListFromDao userWhitelistFromDao;
-    @Resource
-    private UserBlackListFromDao userBlackListFromDao;
-
     @Override
     public PageInfo<UserVisitorListVO> getPageList(RestDTO<UserWhitelistSearch> dto) {
         UserWhitelistSearch data = dto.getData();
@@ -101,9 +97,7 @@ public class UserVisitorListServiceImpl implements UserVisitorListService {
         //校验是否存在
         UserWhitelist byPhoneAndId = userWhitelistDao.getByPhoneAndId(uvl.getPhone(), null, uvl.getAdminId());
         UserWhitelist addWhite = new UserWhitelist();
-
-        String avatar = uvl.getAvatar();
-        addWhite.setAvatar(avatar);
+        addWhite.setAvatar(uvl.getAvatar());
         if (byPhoneAndId != null) {
             addWhite.setUpdateTime(new Date());
             addWhite.setId(byPhoneAndId.getId());
@@ -133,9 +127,9 @@ public class UserVisitorListServiceImpl implements UserVisitorListService {
         for (String s : faceDeviceOne) {
             one.setSn(s);
             Map<String, Object> map = downFaceByTask(one, DateUtils.addMinutes(now, -10), date, 2, 105);
-            if (!StringUtils.equals("命令下发成功", (String) map.get("msg"))) {
-                msg.add(one.getName() + ":下发失败，原因：" + (String) map.get("msg"));
-            }
+//            if (!StringUtils.equals("命令下发成功", (String) map.get("msg"))) {
+//                msg.add(one.getName() + ":下发失败，原因：" + (String) map.get("msg"));
+//            }
         }
         if (msg.isEmpty()) {
             return 1;
@@ -157,7 +151,6 @@ public class UserVisitorListServiceImpl implements UserVisitorListService {
         userBlackListOne.setPhone(uvl.getPhone());
         UserBlackList userBlackOne = userBlackListDao.selectOne(userBlackListOne);
         UserBlackList userBlackList = new UserBlackList();
-        String avatar = userBlackOne.getAvatar();//照片
         if (userBlackOne != null) {
             userBlackList.setId(userBlackOne.getId());
             userBlackList.setAvatar(userBlackOne.getAvatar());
@@ -186,9 +179,9 @@ public class UserVisitorListServiceImpl implements UserVisitorListService {
         for (String s : faceDeviceOne) {
             one.setSn(s);
             Map<String, Object> map = downFaceByTask(one, DateUtils.addMinutes(now, -10), date, 1, 101);
-            if (!StringUtils.equals("命令下发成功", (String) map.get("msg"))) {
-                msg.add(one.getName() + ":下发失败，原因：" + (String) map.get("msg"));
-            }
+//            if (!StringUtils.equals("命令下发成功", (String) map.get("msg"))) {
+//                msg.add(one.getName() + ":下发失败，原因：" + (String) map.get("msg"));
+//            }
         }
         if (msg.isEmpty()) {
             return 1;

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

@@ -288,9 +288,9 @@ public class UserWhitelistServiceImpl implements UserWhitelistService {
                 userWhitelist.setSn(faceDeviceOne.getSn());
                 userWhitelist.setAdminId(faceDeviceOne.getAdminId());
                 Map<String, Object> map = downFaceByTask(userWhitelist, DateUtils.addMinutes(now, -10), date, 2);
-                if (!StringUtils.equals("命令下发成功", (String) map.get("msg"))) {
-                    msg.add(userWhitelist.getName() + "下发失败, 原因:" + (String) map.get("msg"));
-                }
+//                if (!StringUtils.equals("命令下发成功", (String) map.get("msg"))) {
+//                    msg.add(userWhitelist.getName() + "下发失败, 原因:" + (String) map.get("msg"));
+//                }
             }
         }
         if (msg.isEmpty()) {
@@ -323,9 +323,9 @@ public class UserWhitelistServiceImpl implements UserWhitelistService {
         for (String s : faceDeviceOne) {
             one.setSn(s);
             Map<String, Object> map = downFaceByTask(one, DateUtils.addMinutes(now, -10), date, 2);
-            if (!StringUtils.equals("命令下发成功", (String) map.get("msg"))) {
-                msg.add(one.getName() + "下发失败, 原因:" + (String) map.get("msg"));
-            }
+//            if (!StringUtils.equals("命令下发成功", (String) map.get("msg"))) {
+//                msg.add(one.getName() + "下发失败, 原因:" + (String) map.get("msg"));
+//            }
         }
         if (msg.isEmpty()) {
             objectRestResult.setCode(200);