Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

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

@@ -134,8 +134,11 @@ public class MeetingRoomController {
      * @return
      */
     @GetMapping("attendee")
-    public ApiResult<Map<String,Object>> attendee(Long meetingId, Long userId, String userName){
-        return ApiResult.success(meetingRoomService.attendee(meetingId,userId,userName));
+    public ApiResult<Map<String,Object>> attendee(@RequestParam(value = "meetingId") Long meetingId,
+                                                  @RequestParam(value = "userId") Long userId,
+                                                  @RequestParam(value = "userName") String userName,
+                                                  @RequestParam(value = "domain",required = false) String domain){
+        return ApiResult.success(meetingRoomService.attendee(meetingId,userId,userName,domain));
     }
 
     /**

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

@@ -24,4 +24,9 @@ public class SignOnOutRequestVO {
      */
     private Integer signType;
 
+    /**
+     * 域名
+     */
+    private String domain;
+
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingRoomService.java

@@ -36,7 +36,7 @@ public interface MeetingRoomService extends CrudService<MeetingRoom> {
 
     void remove(Long roomId);
 
-    Map<String,Object> attendee(Long meetingId, Long userId, String userName);
+    Map<String,Object> attendee(Long meetingId, Long userId, String userName, String domain);
 
     List<DmMeetingRoomDto> getMeetingRoomReservationList(MeetingRoomReservationVO reservationVO)  throws ParseException;
 

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

@@ -499,22 +499,32 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
     public void signOnOut(SignOnOutRequestVO requestVO){
         LambdaQueryWrapper<MeetingAttendee> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(MeetingAttendee::getMeetingId,requestVO.getMeetingId())
-                .eq(MeetingAttendee::getUserId,requestVO.getUserId())
-                .eq(MeetingAttendee::getTenantId,SecurityUtils.getTenantId());
-        MeetingAttendee one = meetingAttendeeService.getOne(queryWrapper);
-        //签到签退类别(0.签到 1.签退)
-        if(requestVO.getMothodType().equals(0)){
-            one.setIsSign(1);
-            one.setSignDate(LocalDateTime.now());
-            //签到签退方式(0.人工 1.人脸)
-            one.setSignType(requestVO.getSignType());
+                .eq(MeetingAttendee::getUserId,requestVO.getUserId());
 
+        String domain = requestVO.getDomain();
+        if(StringUtils.isNotBlank(domain)){
+            Integer tenantId = meetingRoomRepository.getTenantIdByDomain(domain);
+            queryWrapper.eq(MeetingAttendee::getTenantId, tenantId);
         }else{
-            one.setIsSignOut(1);
-            one.setSignOutDate(LocalDateTime.now());
-            one.setSignOutType(requestVO.getSignType());
+            queryWrapper.eq(MeetingAttendee::getTenantId, SecurityUtils.getTenantId());
+        }
+
+        MeetingAttendee one = meetingAttendeeService.getOne(queryWrapper);
+        if(one != null){
+            //签到签退类别(0.签到 1.签退)
+            if(requestVO.getMothodType().equals(0)){
+                one.setIsSign(1);
+                one.setSignDate(LocalDateTime.now());
+                //签到签退方式(0.人工 1.人脸)
+                one.setSignType(requestVO.getSignType());
+
+            }else{
+                one.setIsSignOut(1);
+                one.setSignOutDate(LocalDateTime.now());
+                one.setSignOutType(requestVO.getSignType());
+            }
+            meetingAttendeeService.updateById(one);
         }
-        meetingAttendeeService.updateById(one);
 
     }
 

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

@@ -209,9 +209,16 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     }
 
     @Override
-    public Map<String, Object> attendee(Long meetingId, Long userId, String userName) {
+    public Map<String, Object> attendee(Long meetingId, Long userId, String userName, String domain) {
         Map<String, Object> map = new HashMap<>();
-        Integer tenantId = SecurityUtils.getTenantId();
+        Integer tenantId ;
+
+        if(StringUtils.isNotBlank(domain)){
+            tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);
+        }else{
+            tenantId = SecurityUtils.getTenantId();
+        }
+
         map.put("userName", userName);
         List<MeetingAttendee> list = meetingAttendeeRepository.findMeetingAttendeeList(meetingId, userId, tenantId);
         if (org.springframework.util.CollectionUtils.isEmpty(list)) {