合并

CODE/foreign-service/src/main/java/com/community/huiju/common/sign/DaSuSign.java

@@ -78,9 +78,11 @@ public class DaSuSign {
         System.out.println(timeMillis);
         TreeMap<String, Object> treeMap = new TreeMap<>();
         treeMap.put("appid", "dssdw2576sd997");
-        treeMap.put("datetime","1560223595398");
+        treeMap.put("datetime",timeMillis);
         treeMap.put("encrypt", "md5");
-        treeMap.put("communityId", "107");
+        //treeMap.put("communityId", "107");
+        treeMap.put("pageNo", 1);
+        treeMap.put("pageSize", 10);
         //treeMap.put("carNo","苏A90GM7");
         String sign = createSign(treeMap, "fgexhd855sf4");
     }

CODE/foreign-service/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -28,7 +28,7 @@ public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
     @ResultType(TpEquipment.class)
     @Select("select " +
             "tm.*, " +
-            "(select `key` FROM tp_configuration WHERE id = tm.url_id) as monitoringUrl, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.url_id) as monitoringUrl, " +
             "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
             "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
             "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as monitoringAddress " +

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TpEquipmentServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -35,12 +36,14 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         IPage<TpEquipment> equipmentIPage = tpEquipmentMapper.selectMonitoringByCommunityId(page,communityId);
+        List<TpEquipment> records = equipmentIPage.getRecords();
+        records = records.stream().filter(e-> e.getMonitoringUrl().contains("m3u8")).collect(Collectors.toList());
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("pageNum", equipmentIPage.getCurrent());
         map.put("pageSize", equipmentIPage.getSize());
         map.put("total", equipmentIPage.getTotal());
-        map.put("list", equipmentIPage.getRecords());
+        map.put("list", records);
         responseBean.addSuccess(map);
         return responseBean;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -315,13 +315,15 @@ public class FaceServicelimpl implements FaceServiceI {
         }
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(userElement.getCommunityId());
+        List<Map<String, Object>> unitList = getUnitList(userElement, toCommunities);
         if (null != face) {
-            List<Map<String, Object>> unitList = getUnitList(userElement, toCommunities);
             face.setText(unitList);
             responseBean.addSuccess(face);
             return responseBean;
         }
-        responseBean.addError("当前用户暂无人脸图片");
+        TaFace taFace = new TaFace();
+        taFace.setText(unitList);
+        responseBean.addError("当前用户暂无人脸图片", taFace, null);
         return responseBean;
 
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -266,8 +266,9 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 校验房产
         List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(currentUser.getId());
+        String finalToken = token;
         taUserVerifies.forEach(e->{
-            e.setVerifyUrl(loginCodePerproties.getLoginCode().get("-1") + e.getId());
+            e.setVerifyUrl(loginCodePerproties.getLoginCode().get("-1") + e.getId() + "&token=" + finalToken);
         });
         taUserVO.setUserVerifyList(taUserVerifies);
         // 无关联房产