1、新增设备信息表-分页-白名单接口，创建请求类，编写接口文档，测试接口；

2、优化人脸信息表-列表、人脸信息表-添加和人脸信息表-修改三个接口，修改人脸卡号关联设备的存储和展示逻辑，修改接口文档，测试接口；

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpDeviceInfoController.java

@@ -72,6 +72,18 @@ public class DmpDeviceInfoController {
         return ApiResult.success(dmpDeviceInfoService.page(dmpDeviceInfoRequest));
     }
 
+
+    /**
+     * 分页-白名单
+     * @param dmpDeviceInfoRequest
+     * @return
+     */
+    @PostMapping("/pageWhite")
+    public ApiResult<CommonPage<DmpDeviceInfo>> pageWhite(@RequestBody DmpDeviceInfoRequest dmpDeviceInfoRequest)
+    {
+        return ApiResult.success(dmpDeviceInfoService.pageWhite(dmpDeviceInfoRequest));
+    }
+
     /**
      * 删除记录
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceInfoService.java

@@ -35,6 +35,8 @@ public interface DmpDeviceInfoService extends CrudService<DmpDeviceInfo> {
 
     CommonPage<DmpDeviceInfo> page(DmpDeviceInfoRequest dmpDeviceInfoRequest);
 
+    CommonPage<DmpDeviceInfo> pageWhite(DmpDeviceInfoRequest dmpDeviceInfoRequest);
+
     boolean remove(Integer id);
 
     /**

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -364,6 +364,177 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
         return new CommonPage<>(page.getRecords(),page.getTotal(),pageSize,pageCurrent);
     }
 
+    @Override
+    public CommonPage<DmpDeviceInfo> pageWhite(DmpDeviceInfoRequest diRequest) {
+        List<DmpDeviceInfo> list = new ArrayList<>();
+        Integer total = 0;
+        Integer pageCurrent = diRequest.getCurrent();
+        Integer pageSize = diRequest.getSize();
+        IPage<DmpDeviceInfo> page = new Page<>(pageCurrent,pageSize);
+        Integer tenantId = 0;
+        String domain = diRequest.getDomain();
+        if(StringUtils.isNotBlank(domain)){
+            tenantId = baseMapper.sysTenantId(domain);
+        }
+
+        if(diRequest.getDeviceStatus() != null){
+            if(StringUtils.isNotBlank(diRequest.getDeviceId()) || StringUtils.isNotBlank(diRequest.getDeviceName()) || diRequest.getProductId() != null || StringUtils.isNotBlank(diRequest.getProductCode()) || diRequest.getServiceStatus() != null){
+                LambdaQueryWrapper<DmpDeviceInfo> queryWrapper = Wrappers.lambdaQuery();
+                queryWrapper.eq(StringUtils.isNotBlank(diRequest.getDeviceId()),DmpDeviceInfo::getDeviceId,diRequest.getDeviceId())
+                        .like(StringUtils.isNotBlank(diRequest.getDeviceName()),DmpDeviceInfo::getDeviceName,diRequest.getDeviceName())
+                        .eq(diRequest.getProductId() != null,DmpDeviceInfo::getProductId,diRequest.getProductId())
+                        .like(StringUtils.isNotBlank(diRequest.getProductCode()),DmpDeviceInfo::getProductCode,diRequest.getProductCode())
+                        .eq(diRequest.getServiceStatus() != null,DmpDeviceInfo::getServiceStatus,diRequest.getServiceStatus())
+                        .eq(DmpDeviceInfo::getDeleteFlag,0)
+                        .eq(DmpDeviceInfo::getTenantId,tenantId)
+                        .orderByDesc(DmpDeviceInfo::getId);
+                List<DmpDeviceInfo> list1 = this.list(queryWrapper);
+
+                if(CollectionUtils.isNotEmpty(list1)){
+                    List<String> devList = new ArrayList<>();
+                    List<Integer> productIdList = new ArrayList<>();
+                    for(int i=0;i<list1.size();i++){
+                        if(!devList.contains(list1.get(i).getDeviceId())){
+                            devList.add(list1.get(i).getDeviceId());
+                        }
+                        if(!productIdList.contains(list1.get(i).getProductId())){
+                            productIdList.add(list1.get(i).getProductId());
+                        }
+                    }
+
+                    if(devList.size() > 0){
+                        LambdaQueryWrapper<DmpDeviceStatus> queryWrapper1 = Wrappers.lambdaQuery();
+                        queryWrapper1.in(DmpDeviceStatus::getDeviceId,devList)
+                                .in(DmpDeviceStatus::getProductId,productIdList)
+                                .eq(DmpDeviceStatus::getDeviceStatus,diRequest.getDeviceStatus());
+                        List<DmpDeviceStatus> statusList = dmpDeviceStatusService.list(queryWrapper1);
+                        if(statusList.size() > 0){
+                            for(int i=0;i<list1.size();i++){
+                                for(int j=0;j<statusList.size();j++){
+                                    if(list1.get(i).getProductId().equals(statusList.get(j).getProductId()) && list1.get(i).getDeviceId().equals(statusList.get(j).getDeviceId())){
+                                        list1.get(i).setDeviceStatus(statusList.get(j).getDeviceStatus());
+                                        list1.get(i).setLastOnlineTime(statusList.get(j).getLastOnlineTime());
+                                        list1.get(i).setLastOfflineTime(statusList.get(j).getLastOfflineTime());
+                                        list.add(list1.get(i));
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                }
+
+                if(list.size() > 0){
+                    total = list.size();
+                    page.setTotal(total);
+                }
+
+                Integer current = 0;
+                if(pageCurrent != null && pageSize > 0){
+                    current = (pageCurrent-1)*pageSize;
+                }
+
+                page.setRecords(list.stream().skip(current).limit(pageSize).collect(Collectors.toList()));
+            }else{
+                LambdaQueryWrapper<DmpDeviceStatus> queryWrapper = Wrappers.lambdaQuery();
+                queryWrapper.eq(DmpDeviceStatus::getDeviceStatus,diRequest.getDeviceStatus());
+                List<DmpDeviceStatus> statusList = dmpDeviceStatusService.list(queryWrapper);
+                if(statusList.size() > 0){
+                    List<String> devList = new ArrayList<>();
+                    List<Integer> productIdList = new ArrayList<>();
+                    for(int i=0;i<statusList.size();i++){
+                        if(!devList.contains(statusList.get(i).getDeviceId())){
+                            devList.add(statusList.get(i).getDeviceId());
+                        }
+                        if(!productIdList.contains(statusList.get(i).getProductId())){
+                            productIdList.add(statusList.get(i).getProductId());
+                        }
+                    }
+
+                    if(devList.size() > 0){
+                        LambdaQueryWrapper<DmpDeviceInfo> queryWrapper1 = Wrappers.lambdaQuery();
+                        queryWrapper1.in(DmpDeviceInfo::getDeviceId,devList)
+                                .in(DmpDeviceInfo::getProductId,productIdList)
+                                .eq(DmpDeviceInfo::getDeleteFlag,0)
+                                .eq(DmpDeviceInfo::getTenantId,tenantId)
+                                .orderByDesc(DmpDeviceInfo::getId);
+                        List<DmpDeviceInfo> list1 = this.list(queryWrapper1);
+                        if(list1.size() > 0){
+                            for(int i=0;i<list1.size();i++){
+                                for(int j=0;j<statusList.size();j++){
+                                    if(list1.get(i).getProductId().equals(statusList.get(j).getProductId()) && list1.get(i).getDeviceId().equals(statusList.get(j).getDeviceId())){
+                                        list1.get(i).setDeviceStatus(statusList.get(j).getDeviceStatus());
+                                        list1.get(i).setLastOnlineTime(statusList.get(j).getLastOnlineTime());
+                                        list1.get(i).setLastOfflineTime(statusList.get(j).getLastOfflineTime());
+                                        list.add(list1.get(i));
+                                        break;
+                                    }
+                                }
+                            }
+                            if(list.size() > 0){
+                                total = list.size();
+                                page.setTotal(total);
+                            }
+
+                            Integer current = 0;
+                            if(pageCurrent != null && pageSize > 0){
+                                current = (pageCurrent-1)*pageSize;
+                            }
+
+                            page.setRecords(list.stream().skip(current).limit(pageSize).collect(Collectors.toList()));
+                        }
+                    }
+                }
+            }
+        }else{
+            LambdaQueryWrapper<DmpDeviceInfo> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.eq(StringUtils.isNotBlank(diRequest.getDeviceId()),DmpDeviceInfo::getDeviceId,diRequest.getDeviceId())
+                    .like(StringUtils.isNotBlank(diRequest.getDeviceName()),DmpDeviceInfo::getDeviceName,diRequest.getDeviceName())
+                    .eq(diRequest.getProductId() != null,DmpDeviceInfo::getProductId,diRequest.getProductId())
+                    .like(StringUtils.isNotBlank(diRequest.getProductCode()),DmpDeviceInfo::getProductCode,diRequest.getProductCode())
+                    .eq(diRequest.getServiceStatus() != null,DmpDeviceInfo::getServiceStatus,diRequest.getServiceStatus())
+                    .eq(DmpDeviceInfo::getDeleteFlag,0)
+                    .eq(DmpDeviceInfo::getTenantId,tenantId)
+                    .orderByDesc(DmpDeviceInfo::getId);
+            page = this.page(page,queryWrapper);
+            if(page.getTotal() > 0){
+                List<String> devList = new ArrayList<>();
+                List<Integer> productIdList = new ArrayList<>();
+                for(int i=0;i<page.getRecords().size();i++){
+                    if(!devList.contains(page.getRecords().get(i).getDeviceId())){
+                        devList.add(page.getRecords().get(i).getDeviceId());
+                    }
+                    if(!productIdList.contains(page.getRecords().get(i).getProductId())){
+                        productIdList.add(page.getRecords().get(i).getProductId());
+                    }
+                }
+
+                if(devList.size() > 0){
+                    LambdaQueryWrapper<DmpDeviceStatus> queryWrapper1 = Wrappers.lambdaQuery();
+                    queryWrapper1.in(DmpDeviceStatus::getDeviceId,devList)
+                            .in(DmpDeviceStatus::getProductId,productIdList);
+                    List<DmpDeviceStatus> statusList = dmpDeviceStatusService.list(queryWrapper1);
+                    if(statusList.size() > 0){
+                        for(int i=0;i<page.getRecords().size();i++){
+                            for(int j=0;j<statusList.size();j++){
+                                if(page.getRecords().get(i).getProductId().equals(statusList.get(j).getProductId()) && page.getRecords().get(i).getDeviceId().equals(statusList.get(j).getDeviceId())){
+                                    page.getRecords().get(i).setDeviceStatus(statusList.get(j).getDeviceStatus());
+                                    page.getRecords().get(i).setLastOnlineTime(statusList.get(j).getLastOnlineTime());
+                                    page.getRecords().get(i).setLastOfflineTime(statusList.get(j).getLastOfflineTime());
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+
+        return new CommonPage<>(page.getRecords(),page.getTotal(),pageSize,pageCurrent);
+    }
+
     @Override
     public boolean remove(Integer id) {
         DmpDeviceInfo dmpDeviceInfo = this.getById(id);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/DmpDeviceInfoRequest.java

@@ -46,5 +46,9 @@ public class DmpDeviceInfoRequest {
      */
     private Integer deviceStatus;
 
+    /**
+     * 域名
+     */
+    private String domain;
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFaceController.java

@@ -3,6 +3,7 @@ package com.usky.meeting.controller.web;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.ApiResult;
@@ -10,20 +11,28 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.meeting.annotation.FaceLog;
 import com.usky.meeting.domain.MeetingFace;
+import com.usky.meeting.mapper.MeetingFaceMapper;
 import com.usky.meeting.repository.MeetingInfoRepository;
 import com.usky.meeting.service.MeetingFaceService;
+import com.usky.meeting.service.vo.DmpDeviceInfoVO;
 import com.usky.meeting.service.vo.FaceResultVO;
 import com.usky.meeting.service.vo.MeetingFaceRequestVO;
 import com.usky.meeting.service.vo.MeetingFaceVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -42,6 +51,8 @@ public class MeetingFaceController {
     MeetingFaceService faceService;
     @Autowired
     MeetingInfoRepository meetingInfoRepository;
+    @Autowired
+    private MeetingFaceMapper meetingFaceMapper;
 
     @PostMapping("/vef")
     @ApiOperation(value="人脸验证", notes="根据传入的base64编码和数据的base64编码进行对比")
@@ -56,12 +67,26 @@ public class MeetingFaceController {
             @RequestParam Integer current,
             @RequestParam Integer size,
             @RequestParam(required = false) String faceName,
-            @RequestParam(required = false) String faceStatus
-    ){
+            @RequestParam(required = false) String faceStatus,
+            @RequestParam(required = false) Integer fid
+            ){
         IPage<MeetingFace> page = faceService.page(new Page(current, size), new QueryWrapper<MeetingFace>()
                 .like(StrUtil.isNotBlank(faceName),"face_name",faceName)
                 .like(StrUtil.isNotBlank(faceStatus),"face_status",faceStatus)
+                .eq(fid != null,"fid",fid)
                 .eq("tenant_id", SecurityUtils.getTenantId()));
+        if(page.getRecords().size() > 0){
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                if(Objects.nonNull(page.getRecords().get(i).getBindDevice())){
+                    String[] deviceIdStr = page.getRecords().get(i).getBindDevice().split(",");
+                    Integer[] deviceIds = Arrays.stream(deviceIdStr).map(Integer::parseInt).toArray(Integer[]::new);
+                    List<DmpDeviceInfoVO> list = meetingFaceMapper.getDeviceInfo(Arrays.asList(deviceIds));
+                    page.getRecords().get(i).setDeviceInfos(list);
+
+                }
+            }
+
+        }
         return ApiResult.success(new CommonPage<>(page.getRecords(),page.getTotal(),size,current));
     }
 
@@ -86,11 +111,11 @@ public class MeetingFaceController {
         face.setVefNum(0);
         face.setCreateTime(LocalDateTime.now());
         face.setTenantId(SecurityUtils.getTenantId());
-        Integer[] devicefids = face.getDeviceIds();
+        String[] devicefids = face.getBindDevice().split(",");
         faceService.save(face);
         if(devicefids.length > 0){
             for (int i = 0; i < devicefids.length; i++) {
-                meetingInfoRepository.insertMeetingFaceDevice(face.getFid(),devicefids[i]);
+                meetingInfoRepository.insertMeetingFaceDevice(face.getFid(),Integer.parseInt(devicefids[i]));
             }
         }
         return FaceResultVO.success("添加成功");
@@ -101,10 +126,10 @@ public class MeetingFaceController {
     public FaceResultVO update(@RequestBody MeetingFace face){
         faceService.updateById(face);
         meetingInfoRepository.delMeetingFaceDevice(face.getFid());
-        Integer[] devicefids = face.getDeviceIds();
+        String[] devicefids = face.getBindDevice().split(",");
         if(devicefids.length > 0){
             for (int i = 0; i < devicefids.length; i++) {
-                meetingInfoRepository.insertMeetingFaceDevice(face.getFid(),devicefids[i]);
+                meetingInfoRepository.insertMeetingFaceDevice(face.getFid(),Integer.parseInt(devicefids[i]));
             }
         }
         return FaceResultVO.success("修改成功");

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingFace.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.usky.meeting.service.vo.DmpDeviceInfoVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -86,9 +88,9 @@ public class MeetingFace implements Serializable {
     private Long userId;
 
     /**
-     * 绑定设备主键id
+     * 设备对象
      */
     @TableField(exist = false)
-    private Integer[] deviceIds;
+    private List<DmpDeviceInfoVO> deviceInfos;
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/mapper/MeetingFaceMapper.java

@@ -2,6 +2,11 @@ package com.usky.meeting.mapper;
 
 import com.usky.meeting.domain.MeetingFace;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.meeting.service.vo.DmpDeviceInfoVO;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +17,5 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @since 2024-03-08
  */
 public interface MeetingFaceMapper extends CrudMapper<MeetingFace> {
-
+    List<DmpDeviceInfoVO> getDeviceInfo(@Param("deviceIdList") List<Integer> deviceIdList);
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/vo/DmpDeviceInfoVO.java

@@ -0,0 +1,65 @@
+package com.usky.meeting.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("dmp_device")
+public class DmpDeviceInfoVO implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 安装位置
+     */
+    private String installAddress;
+
+    /**
+     * 业务状态;1：未激活，2：已激活，3：禁用
+     */
+    private Integer serviceStatus;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 设备uuid
+     */
+    private String deviceUuid;
+}

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingFaceMapper.xml

@@ -11,11 +11,26 @@
         <result column="face_name" property="faceName" />
         <result column="remark" property="remark" />
         <result column="face_status" property="faceStatus" />
-        <result column="update_extend2" property="updateExtend2" />
-        <result column="update_extend3" property="updateExtend3" />
+        <result column="card_num" property="cardNum" />
+        <result column="bind_device" property="bindDevice" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
         <result column="user_id" property="userId" />
     </resultMap>
+    <select id="getDeviceInfo" resultType="com.usky.meeting.service.vo.DmpDeviceInfoVO">
+        SELECT dd.id,dd.device_id,dd.device_name,dd.product_id,dd.tenant_id,dd.company_code,dd.install_address,dd.service_status,dd.product_code,dd.device_uuid
+            FROM dmp_device dd
+        <where>
+            <if test="deviceIdList != null and deviceIdList.size() > 0">
+                AND dd.id in
+                <foreach item="item" collection="deviceIdList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="1 == 1">
+                and dd.delete_flag = 0
+            </if>
+        </where>
+    </select>
 
 </mapper>