Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-meeting/service-meeting-api/src/main/java/com/usky/demo/factory/RemoteUserFallbackFactory.java

@@ -1,48 +1,48 @@
-package com.usky.demo.factory;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.demo.RemoteUserService;
-import com.usky.demo.domain.SysUserVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-
-/**
- * 用户服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
-            @Override
-            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<String> upload(MultipartFile file) {
-                throw new BusinessException(throwable.getMessage());
-            }
-        };
-    }
-}
+//package com.usky.demo.factory;
+//
+//import com.usky.common.core.bean.ApiResult;
+//import com.usky.common.core.exception.BusinessException;
+//import com.usky.demo.RemoteUserService;
+//import com.usky.demo.domain.SysUserVO;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import org.springframework.cloud.openfeign.FallbackFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import java.util.List;
+//
+//
+///**
+// * 用户服务降级处理
+// *
+// * @author ruoyi
+// */
+//@Component
+//public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+//{
+//    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+//
+//    @Override
+//    public RemoteUserService create(Throwable throwable)
+//    {
+//        log.error("用户服务调用失败:{}", throwable.getMessage());
+//        return new RemoteUserService() {
+//            @Override
+//            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//
+//            @Override
+//            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//
+//            @Override
+//            public ApiResult<String> upload(MultipartFile file) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//        };
+//    }
+//}

service-meeting/service-meeting-biz/pom.xml

@@ -17,6 +17,11 @@
             <artifactId>service-meeting-api</artifactId>
             <version>0.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>data-transfer-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>common-cloud-starter</artifactId>

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

@@ -9,6 +9,7 @@ import com.usky.meeting.service.MeetingRoomService;
 import com.usky.meeting.service.dto.DmMeetingRoomDto;
 import com.usky.meeting.service.vo.MeetingRoomRequestVO;
 import com.usky.meeting.service.vo.MeetingRoomReservationVO;
+import com.usky.transfer.RemoteTransferService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +32,19 @@ import java.util.Map;
 public class MeetingRoomController {
     @Autowired
     private MeetingRoomService meetingRoomService;
+//    @Autowired
+//    private RemoteTransferService remoteTransferService;
+
+//    /**
+//     * 下发门禁开门
+//     */
+//    @GetMapping("/{productCode}/{deviceId}/control")
+//    public ApiResult<Map<String,Object>> control(@PathVariable("productCode") String productCode,
+//                                                 @PathVariable("deviceId") String deviceId,
+//                                                 @RequestParam(value = "requestBody") String requestBody){
+//        String topic = "/"+productCode+"/"+deviceId+"/control";
+//        return ApiResult.success(remoteTransferService.deviceControl(topic,requestBody));
+//    }
 
     /**
      * 首页统计

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

@@ -41,7 +41,7 @@ public interface MeetingInfoService extends CrudService<MeetingInfo> {
     Map<String,Object> meetingSummaryByYear(String year, Integer tenantId);
 
 
-    JSONObject getMeetingRoomUsageByDayV2(Long roomId, String dayTime) throws ParseException;
+    JSONObject getMeetingRoomUsageByDayV2(Long roomId, String dayTime, Integer tenantId) throws ParseException;
 
     /**
      * 获取当月会议室得使用情况
@@ -49,7 +49,7 @@ public interface MeetingInfoService extends CrudService<MeetingInfo> {
      * @param monthTime 获取会议室情况得日期
      * @return  JSONArray
      */
-    List<Integer> getMeetingRoomUsageByMonth(Long roomId, String monthTime) throws ParseException;
+    List<Integer> getMeetingRoomUsageByMonth(Long roomId, String monthTime, Integer tenantId) throws ParseException;
 
     DmMeetingDto add(DmMeetingDto resources);
 

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

@@ -103,7 +103,7 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
     }
 
     @Override
-    public JSONObject getMeetingRoomUsageByDayV2(Long roomId, String dayTime) throws ParseException {
+    public JSONObject getMeetingRoomUsageByDayV2(Long roomId, String dayTime, Integer tenantId) throws ParseException {
         JSONObject jsonObject = new JSONObject();
         JSONArray array = new JSONArray();
         JSONArray dmMeetingList = new JSONArray();
@@ -120,9 +120,9 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
         System.out.println("month:"+month);
         //获取日期中得日
         Integer day= Integer.valueOf(String.format("%td", date));
-        List<MeetingInfo> dmMeetings = dmMeetingRepository.getDmMeetingByStartDatDay(roomId,year,month,day,SecurityUtils.getTenantId());
+        List<MeetingInfo> dmMeetings = dmMeetingRepository.getDmMeetingByStartDatDay(roomId,year,month,day,tenantId);
         LambdaQueryWrapper<SysUser> sysUserQuery = Wrappers.lambdaQuery();
-        sysUserQuery.eq(SysUser::getTenantId,SecurityUtils.getTenantId());
+        sysUserQuery.eq(SysUser::getTenantId,tenantId);
         List<SysUser> userList = sysUserService.list(sysUserQuery);
         if(userList.size() <= 0){
             throw new BusinessException("用户信息不能为空");
@@ -132,7 +132,7 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
             for(MeetingInfo dmMeeting : dmMeetings){
                 //参会人员信息
                 List<SysUser> attendeeUserList = new ArrayList<>();
-                List<MeetingAttendee> attendeeList = meetingAttendeeRepository.findMeetingAttendeeList(dmMeeting.getMeetingId(),null, SecurityUtils.getTenantId());
+                List<MeetingAttendee> attendeeList = meetingAttendeeRepository.findMeetingAttendeeList(dmMeeting.getMeetingId(),null, tenantId);
                 if(attendeeList.size() > 0){
                     for (int i = 0; i < attendeeList.size(); i++) {
                         Long uid = attendeeList.get(i).getUserId();
@@ -201,7 +201,7 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
     }
 
     @Override
-    public List<Integer> getMeetingRoomUsageByMonth(Long roomId, String monthTime) throws ParseException {
+    public List<Integer> getMeetingRoomUsageByMonth(Long roomId, String monthTime, Integer tenantId) throws ParseException {
         SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = dtf.parse(monthTime);
         System.out.println("date:" + date);
@@ -214,7 +214,7 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
         Integer month = (cal.get(Calendar.MONTH) + 1);
         System.out.println("month:" + month);
 
-        List<Map<String, Object>> dmMeetings = dmMeetingRepository.getDmMeetingByStartDateYearAndMonth(roomId, year, month, SecurityUtils.getTenantId());
+        List<Map<String, Object>> dmMeetings = dmMeetingRepository.getDmMeetingByStartDateYearAndMonth(roomId, year, month, tenantId);
         if (!ObjectUtils.isEmpty(dmMeetings)) {
             List<Integer> list = new ArrayList<>();
             Set<Integer> set = new HashSet<>();

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

@@ -288,13 +288,13 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
                 if (ObjectUtils.isEmpty(reservationVO.getDate())) {
                     reservationVO.setDate(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 }
-                JSONObject meetingRoomUsageByDayV2 = dmMeetingService.getMeetingRoomUsageByDayV2(dmMeetingRoomDto.getRoomId(), reservationVO.getDate());
+                JSONObject meetingRoomUsageByDayV2 = dmMeetingService.getMeetingRoomUsageByDayV2(dmMeetingRoomDto.getRoomId(), reservationVO.getDate(),tenantId);
 
                 JSONArray dmMeeting = meetingRoomUsageByDayV2.getJSONArray("dmMeeting");
                 dmMeetingRoomDto.setDmMeetingList(dmMeeting);
 
                 dmMeetingRoomDto.setMeetingRoomUsage(meetingRoomUsageByDayV2.getJSONArray("timeRange"));
-                List<Integer> monthList = dmMeetingService.getMeetingRoomUsageByMonth(dmMeetingRoomDto.getRoomId(), reservationVO.getDate());
+                List<Integer> monthList = dmMeetingService.getMeetingRoomUsageByMonth(dmMeetingRoomDto.getRoomId(), reservationVO.getDate(),tenantId);
                 dmMeetingRoomDto.setMeetingRoomUsageMonth(monthList);
 
                 newDmMeetingRoomDtoList.add(dmMeetingRoomDto);