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

service-job/pom.xml

@@ -63,6 +63,12 @@
             <version>0.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-meeting-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -1,6 +1,7 @@
 package com.ruoyi.job.task;
 
 import com.usky.common.core.utils.StringUtils;
+import com.usky.demo.RemoteMeetingService;
 import com.usky.fire.RemoteFireService;
 import com.usky.iot.RemoteIotTaskService;
 import com.usky.iot.RemotePmService;
@@ -23,6 +24,9 @@ public class RyTask {
     @Autowired
     private RemoteIotTaskService remoteIotTaskService;
 
+    @Autowired
+    private RemoteMeetingService remoteMeetingService;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
     }
@@ -60,4 +64,9 @@ public class RyTask {
         remoteIotTaskService.customInfoStatus();
     }
 
+    public void meetingInfoStatus(){
+        System.out.println("meetingInfoStatus start......");
+        remoteMeetingService.meetingInfoStatus();
+    }
+
 }

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

@@ -0,0 +1,22 @@
+package com.usky.demo;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.demo.domain.SysUserVO;
+import com.usky.demo.factory.RemoteMeetingFallbackFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+@FeignClient(contextId = "RemoteMeetingService", value = "service-meeting", fallbackFactory = RemoteMeetingFallbackFactory.class)
+public interface RemoteMeetingService {
+
+    @GetMapping("/meetingInfoStatus")
+    void meetingInfoStatus();
+
+}

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

@@ -10,7 +10,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-@FeignClient(contextId = "remoteUserService", value = "usky-demo")
+@FeignClient(contextId = "RemoteUserService", value = "usky-demo")
 public interface RemoteUserService {
 
 

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

@@ -0,0 +1,39 @@
+package com.usky.demo.factory;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.core.exception.FeignBadRequestException;
+import com.usky.demo.RemoteMeetingService;
+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 RemoteMeetingFallbackFactory implements FallbackFactory<RemoteMeetingService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteMeetingFallbackFactory.class);
+
+    @Override
+    public RemoteMeetingService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteMeetingService() {
+            @Override
+            public void meetingInfoStatus() {
+                throw new FeignBadRequestException(500,"同步会议室预约状态异常"+throwable.getMessage());
+            }
+        };
+    }
+}

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

@@ -11,6 +11,12 @@
 
     <artifactId>service-meeting-biz</artifactId>
     <dependencies>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-meeting-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/api/ServiceMeetingTaskApi.java

@@ -0,0 +1,18 @@
+package com.usky.meeting.controller.api;
+
+import com.usky.demo.RemoteMeetingService;
+import com.usky.meeting.service.MeetingInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ServiceMeetingTaskApi implements RemoteMeetingService {
+    @Autowired
+    private MeetingInfoService meetingInfoService;
+
+    @Override
+    public void meetingInfoStatus(){
+        meetingInfoService.updateMeetingInfoStatus();
+    }
+
+}

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

@@ -9,12 +9,12 @@ import org.springframework.stereotype.Component;
 @EnableScheduling
 @Component
 public class TaskController {
-    @Autowired
-    private MeetingInfoService meetingInfoService;
-
-    @Scheduled(cron = "0 1,31 * * * ? ") //每小时第1分钟和第31分钟各执行一次
-    public void task(){
-        System.out.println(Thread.currentThread().getName()+"定时任务执行中");
-        meetingInfoService.updateMeetingInfoStatus();
-    }
+//    @Autowired
+//    private MeetingInfoService meetingInfoService;
+//
+//    @Scheduled(cron = "0 1,31 * * * ? ") //每小时第1分钟和第31分钟各执行一次
+//    public void task(){
+//        System.out.println(Thread.currentThread().getName()+"定时任务执行中");
+//        meetingInfoService.updateMeetingInfoStatus();
+//    }
 }