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

service-backend/service-backend-api/src/main/java/com/usky/backend/client/DataQueryClient.java

@@ -5,6 +5,7 @@ import com.usky.backend.domain.request.LastQueryVo;
 import com.usky.backend.domain.response.LastResultVo;
 import com.usky.common.core.bean.ApiResult;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -13,8 +14,8 @@ import java.util.Map;
 @FeignClient(contextId = "dataQueryClient", value = "usky-backend")
 public interface DataQueryClient {
 
-    @RequestMapping(value = "status")
-    List<StatusVO> status();
+    @GetMapping(value = "status")
+    ApiResult<List<StatusVO>> status();
 
     @RequestMapping(value = "deviceDataTotal")
     List<Map<String,Object>> deviceDataTotal(@RequestBody DataTotalRequestVO requestVO);

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/DataQueryController.java

@@ -71,15 +71,5 @@ public class DataQueryController {
         return ApiResult.success(dataQueryService.last(lastQueryVo));
     }
 
-    /**
-     * 查询设备状态
-     * @return
-     */
-    @GetMapping("status")
-    @ApiOperation(value = "查询设备状态",response = List.class)
-    public ApiResult<List<StatusVO>> status(){
-        return ApiResult.success(dataQueryService.status());
-    }
-
 }
 

service-backend/service-backend-biz/src/main/java/com/usky/backend/controller/api/DataQueryApi.java

@@ -26,9 +26,8 @@ public class DataQueryApi implements DataQueryClient {
     private DataQueryService dataQueryService;
 
     @Override
-    public List<StatusVO> status(){
-        List<StatusVO> list = dataQueryService.status();
-        return list;
+    public ApiResult<List<StatusVO>> status(){
+        return ApiResult.success(dataQueryService.status());
     }
 
     @Override

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/DataQueryService.java

@@ -10,6 +10,7 @@ import com.usky.backend.domain.DataAverageExportVO;
 import com.usky.backend.domain.DataAverageRequestVO;
 import com.usky.backend.domain.DataAverageResponseVO;
 import com.usky.backend.domain.DataTotalRequestVO;
+import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.List;
 import java.util.Map;

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

@@ -22,7 +22,7 @@ public class DeviceHttpController {
     @Autowired
     private DmpDataInfoService dmpDataInfoService;
 
-    @GetMapping("/status")
+    @GetMapping(value = "/status")
     public ApiResult<Void> status(){
         baseAlarmService.status();
         return ApiResult.success();

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

@@ -42,11 +42,11 @@ public class TaskController implements ApplicationContextAware {
         System.out.println(Thread.currentThread().getName() + "定时任务执行中");
         dmpDataOverviewJob.execute();
     }
-//    @Scheduled(cron = "0 0 22 * * ? ") //每天22点执行
-//    public void task1() {
-//        System.out.println(Thread.currentThread().getName() + "定时任务执行中");
-//        baseAlarmService.status();
-//    }
+    @Scheduled(cron = "0 0 23 * * ? ") //每天23点执行
+    public void task1() {
+        System.out.println(Thread.currentThread().getName() + "定时任务执行中");
+        baseAlarmService.status();
+    }
 
     @Scheduled(cron = "0 30 * * * ? ") //每天凌晨0点30分执行
     public void task2() {

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.backend.client.DataQueryClient;
 import com.usky.backend.domain.StatusVO;
+import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.common.security.utils.SecurityUtils;
@@ -608,7 +609,8 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
 
     @Override
     public void status(){
-        List<StatusVO> list = dataQueryClient.status();
+        ApiResult<List<StatusVO>> resultList = dataQueryClient.status();
+        List<StatusVO> list = resultList.getData();
         if(CollectionUtils.isNotEmpty(list)){
             List<String> devList = new ArrayList<>();
             for(int i=0;i<list.size();i++){