会议签到、列表接口代码优化调整

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

@@ -20,7 +20,7 @@ public class SignOnOutRequestVO {
     private Integer mothodType;
 
     /**
-     * 签到签退方式(0.人工 1.人脸)
+     * 签到签退方式(0.人工 1.人脸 3.二维码)
      */
     private Integer signType;
 

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

@@ -2,6 +2,7 @@ package com.usky.meeting.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -65,7 +66,7 @@ public class MeetingAttendee implements Serializable {
     private LocalDateTime signOutDate;
 
     /**
-     * 签到方式(0.人工签到 1.人脸签到)
+     * 签到方式(0.人工签到 1.人脸签到 3.二维码)
      */
     private Integer signType;
 
@@ -80,7 +81,7 @@ public class MeetingAttendee implements Serializable {
     private Integer tenantId;
 
     /**
-     * 签退方式(0.人工签退 1.人脸签退)
+     * 签退方式(0.人工签退 1.人脸签退 3.二维码)
      */
     private Integer signOutType;
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/repository/MeetingInfoRepository.java

@@ -369,11 +369,11 @@ public interface MeetingInfoRepository extends JpaRepository<MeetingInfo, Long>,
 //    void autoCloseMeetingAndRoom(@Param("updateDate") String updateDate);
 
     @Query(value = "select u.`user_id` as userId,u.`nick_name` as userName,u.sex AS sex,u.phonenumber AS phone,u.dept_id as dept," +
-            " (CASE a.is_sign WHEN 0 THEN '否' WHEN 1 THEN '是' END) as isSign,(CASE a.sign_type WHEN 0 THEN '人工签到' WHEN 1 THEN '人脸签到' END) as signType," +
+            " (CASE a.is_sign WHEN 0 THEN '否' WHEN 1 THEN '是' END) as isSign,(CASE a.sign_type WHEN 0 THEN '人工签到' WHEN 1 THEN '人脸签到' WHEN 2 THEN '二维码签到' END) as signType," +
             " a.sign_date as `date`,a.meeting_id as meetingId,m.approve_status as approveStatus,m.meeting_status as meetingStatus" +
             " from meeting_attendee as a " +
             " left join sys_user as u on a.user_id = u.user_id " +
-            " left join meeting_info as m on m.meeting_id = a.meeting_id "+
+            " left join meeting_info as m on m.meeting_id = a.meeting_id " +
             " where a.meeting_id = :meetingId and a.tenant_id = :tenantId",nativeQuery = true,countQuery = "select COUNT(DISTINCT a.id ) as subcount from meeting_attendee as a left join sys_user as u on a.user_id = u.user_id left join meeting_info as m on m.meeting_id = a.meeting_id where a.meeting_id = :meetingId")
     List<Map<String,Object>> meetingSignList(@Param("meetingId") Long meetingId,@Param("tenantId") Integer tenantId);
 //

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingDeviceServiceImpl.java

@@ -135,7 +135,7 @@ public class MeetingDeviceServiceImpl extends AbstractCrudService<MeetingDeviceM
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
 
-            // 2. 批量查询心跳信息并构建Map（Java 8 兼容版）
+            // 2. 批量查询心跳信息并构建Map
             Map<String, LocalDateTime> deviceHeartbeatMap;
             if (CollectionUtils.isEmpty(validDeviceCodes)) {
                 deviceHeartbeatMap = Collections.emptyMap();
@@ -146,11 +146,11 @@ public class MeetingDeviceServiceImpl extends AbstractCrudService<MeetingDeviceM
                         .collect(Collectors.toMap(
                                 MeetingDeviceHeartbeat::getDeviceCode,
                                 MeetingDeviceHeartbeat::getCreateTime,
-                                (existing, replacement) -> existing  // 解决重复key问题
+                                (existing, replacement) -> existing
                         ));
             }
 
-            // 3. 设备状态赋值（逻辑不变）
+            // 3. 设备状态赋值
             page.getRecords().forEach(meetingDevice -> {
                 String deviceCode1 = meetingDevice.getDeviceCode();
                 boolean isHeartbeatValid = Objects.nonNull(deviceCode1)
@@ -159,7 +159,7 @@ public class MeetingDeviceServiceImpl extends AbstractCrudService<MeetingDeviceM
                 meetingDevice.setDeviceStatus(isHeartbeatValid ? 1 : 0);
             });
 
-            // 4. 通用映射关联数据（逻辑不变）
+            // 4. 通用映射关联数据
             mapAssociatedData(page.getRecords(),
                     MeetingDevice::getRoomId,
                     buildIdMap(meetingRoomsList, MeetingRoom::getRoomId),

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingFaceServiceImpl.java

@@ -1,10 +1,8 @@
 package com.usky.meeting.service.impl;
 
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
-import com.usky.meet.utils.JwtUtils;
 import com.usky.meet.utils.TimeUtils;
 import com.usky.meeting.domain.MeetingDevice;
 import com.usky.meeting.domain.MeetingFace;
@@ -12,7 +10,6 @@ import com.usky.meeting.mapper.MeetingDeviceMapper;
 import com.usky.meeting.mapper.MeetingFaceMapper;
 import com.usky.meeting.repository.MeetingRoomRepository;
 import com.usky.meeting.server.FaceContrastServer;
-import com.usky.meeting.service.MeetingDeviceService;
 import com.usky.meeting.service.MeetingFaceService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.meeting.service.vo.FaceResultVO;
@@ -21,10 +18,7 @@ import com.usky.meeting.service.vo.MeetingFaceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingInfoServiceImpl.java

@@ -521,15 +521,17 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
             if (requestVO.getMothodType().equals(0)) {
                 one.setIsSign(1);
                 one.setSignDate(LocalDateTime.now());
-                // 签到签退方式(0.人工 1.人脸)
+                // 签到签退方式(0.人工 1.人脸 3.二维码)
                 one.setSignType(requestVO.getSignType());
 
-            } else {
+            } else if (requestVO.getMothodType().equals(1)) {
                 one.setIsSignOut(1);
                 one.setSignOutDate(LocalDateTime.now());
                 one.setSignOutType(requestVO.getSignType());
             }
             meetingAttendeeService.updateById(one);
+        } else {
+            throw new BusinessException("您无需参加此会议！");
         }
 
     }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/utils/JwtUtils.java

@@ -1,4 +1,4 @@
-package com.usky.meet.utils;
+package com.usky.meeting.utils;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTCreator;