fix bug

storeroom/src/main/java/com/storeroom/modules/device/service/DeviceService.java

@@ -166,4 +166,6 @@ public interface DeviceService {
      */
     void upLoadAlarmLog(AlarmDeseCaBinetLog alarmDeseCaBinetLog);
 
+
+
 }

storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java

@@ -472,6 +472,8 @@ public class DeviceImpl implements DeviceService {
     }
 
 
+
+
     /**
      * 判断第三方接口状态
      *

storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/AlarmInfoController.java

@@ -22,7 +22,7 @@ import java.util.Set;
 
 @RestController
 @RequestMapping("/api/alarm/")
-@Api(tags = "测试第三方接口")
+@Api(tags = "第三方接口")
 @RequiredArgsConstructor
 public class AlarmInfoController {
 

storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/ApiServiceController.java

@@ -53,11 +53,5 @@ public class ApiServiceController {
         return ApiResponse.success(apiService.getAllDeviceAlarm(url));
     }
 
-    @ApiOperation("获取设备监控参数实时值")
-    @AnonymousPostMapping("getrealtimedata")
-    public ApiResponse<Object> getrealtimedata(@RequestBody Set<String> deviceIds) {
 
-        //return ApiResponse.success(apiService.getRealTimeData(deviceIds));
-        return ApiResponse.success(ResponseStatus.SUCCESS);
-    }
 }

storeroom/src/main/java/com/storeroom/modules/storeroom3d/controller/ThirdApiController.java

@@ -0,0 +1,46 @@
+package com.storeroom.modules.storeroom3d.controller;
+
+
+import com.storeroom.annotaion.rest.AnonymousGetMapping;
+import com.storeroom.annotaion.rest.AnonymousPostMapping;
+import com.storeroom.modules.device.domain.DeviceInfo;
+import com.storeroom.modules.device.service.DeviceService;
+import com.storeroom.modules.device.service.dto.DeviceInfoDto;
+import com.storeroom.modules.storeroom3d.service.ThirdApiService;
+import com.storeroom.modules.storeroom3d.service.dto.RealTimeDataSmallDto;
+import com.storeroom.utils.ApiResponse;
+import com.storeroom.utils.enums.ResponseStatus;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Set;
+
+@RestController
+@RequestMapping("/api/thirdapi/")
+@Api(tags = "第三方接口")
+@RequiredArgsConstructor
+public class ThirdApiController {
+
+    private final ThirdApiService thirdApiService;
+    private final DeviceService deviceService;
+
+
+    @ApiOperation("获取第三方token")
+    @AnonymousGetMapping("token")
+    public ApiResponse<Object> getToken() {
+        String token = thirdApiService.getToken("http://jiton.eatuo.com:5000");
+        return ApiResponse.success(token);
+    }
+
+    @ApiOperation("获取设备监控参数实时值")
+    @AnonymousPostMapping("getrealtimedata")
+    public ApiResponse<Object> getrealtimedata(@RequestBody RealTimeDataSmallDto realTimeDataSmallDto) {
+
+        return ApiResponse.success(thirdApiService.getRealTimeData(realTimeDataSmallDto.getIds(), realTimeDataSmallDto.getUrl()));
+    }
+
+}

storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/dto/RealTimeDataSmallDto.java

@@ -0,0 +1,18 @@
+package com.storeroom.modules.storeroom3d.service.dto;
+
+
+import lombok.Data;
+
+
+import java.io.Serializable;
+import java.util.Set;
+
+@Data
+public class RealTimeDataSmallDto implements Serializable {
+
+    //设备id
+    private Set<String> ids;
+
+    //请求ip地址
+    private String url;
+}

storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/AlarmInfoServiceImpl.java

@@ -124,20 +124,20 @@ public class AlarmInfoServiceImpl implements AlarmInfoService {
         //创建保存数组
         List<GetCurAlarm> alarmDtos1 = new ArrayList<>();
         //过滤设备id为空的数据
-        List<GetCurAlarm> alarmDtos2 = getCurAlarms.stream().filter(getCurAlarmDto -> Objects.equals(getCurAlarmDto.getDevice_id(), "")).collect(Collectors.toList());
+        //List<GetCurAlarm> alarmDtos2 = getCurAlarms.stream().filter(getCurAlarmDto -> Objects.equals(getCurAlarmDto.getDevice_id(), "")).collect(Collectors.toList());
         for (int i = 0; i < getCurAlarms.size(); i++) {
             for (int k = 0; k < deviceInfoList.size(); k++) {
                 if (Objects.equals(getCurAlarms.get(i).getDevice_id(), deviceInfoList.get(k).getDeviceId())) {
                     //通过设备id查询报警日志
-                    AlarmLog alarmLog = alarmLogRepository.findByDeviceId(alarmDtos2.get(i).getDevice_id());
+                    AlarmLog alarmLog = alarmLogRepository.findByDeviceId(getCurAlarms.get(i).getDevice_id());
                     //如果报警日志为空
                     if (ObjectUtils.isEmpty(alarmLog)) {
                         AlarmLog alarmLogEntity = new AlarmLog();
                         //创建日志
                         alarmLogEntity.setId(NanoIdUtils.randomNanoId());
-                        alarmLogEntity.setDeviceId(alarmDtos2.get(i).getDevice_id());
-                        alarmLogEntity.setContent(alarmDtos2.get(i).getAlarm_value_descript());
-                        alarmLogEntity.setStoreroomName(alarmDtos2.get(i).getArea_name());
+                        alarmLogEntity.setDeviceId(getCurAlarms.get(i).getDevice_id());
+                        alarmLogEntity.setContent(getCurAlarms.get(i).getAlarm_value_descript());
+                        alarmLogEntity.setStoreroomName(getCurAlarms.get(i).getArea_name());
                         alarmLogEntity.setState(false);
                         alarmLogEntity.setRemark("");
                         alarmLogRepository.save(alarmLogEntity);
@@ -162,6 +162,7 @@ public class AlarmInfoServiceImpl implements AlarmInfoService {
     @Override
     public Object alarmLogList(AlarmLogCriteria criteria, Pageable pageable) {
         Page<AlarmLog> page = alarmLogRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
+        //page.stream().sorted(Comparator.comparing(AlarmLog::getState));
         return PageUtil.toPage(page);
     }
 
@@ -186,13 +187,13 @@ public class AlarmInfoServiceImpl implements AlarmInfoService {
             map.put("处理时间", alarmLog.getUpdateTime());
             list.add(map);
         }
-        FileUtil.downloadExcel(list,response);
+        FileUtil.downloadExcel(list, response);
 
     }
 
     @Override
     public List<AlarmLog> queryAll(AlarmLogCriteria criteria) {
-        return alarmLogRepository.findAll((root, query, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder));
+        return alarmLogRepository.findAll((root, query, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder));
     }
 
     /**

storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/DisplayConfigImpl.java

@@ -61,9 +61,7 @@ public class DisplayConfigImpl implements DisplayConfigService {
                     }
                     displayConfigList.add(displayConfig);
                 });
-                if (displayConfigList.get(0) == null) {
-                    return null;
-                }
+                displayConfigList.removeAll(Collections.singleton(null));
                 displayConfigList.sort(Comparator.comparing(DisplayConfig::getDivPosition));
                 return displayConfigList;
             }