diff --git a/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java b/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java index 9b9d0a28..ff79f4d5 100644 --- a/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java +++ b/kh-modules/src/main/java/com/jero/modules/service/impl/KhOilRealtimeDataServiceImpl.java @@ -1,14 +1,17 @@ package com.jero.modules.service.impl; +import cn.hutool.core.date.DateUtil; import com.jero.modules.entity.KhOilRealtimeData; import com.jero.modules.mapper.KhOilRealtimeDataMapper; import com.jero.modules.service.IKhOilRealtimeDataService; import com.jero.modules.utils.RandomNumberUtil; import io.swagger.models.auth.In; +import javafx.beans.property.SimpleListProperty; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.jero.common.exception.JeroBootException; +import java.text.SimpleDateFormat; import java.util.*; import com.github.javafaker.Faker; @@ -73,7 +76,7 @@ public class KhOilRealtimeDataServiceImpl extends ServiceImpl result = new HashMap<>(); khOilRealtimeData.mockKhOilRealtimeData(); result.put("油井实时参数", khOilRealtimeData); - Map> chartTwo = new HashMap<>(); + Map chartTwo = new HashMap<>(); Integer[] arr = {0, 25, 50, 75, 100, 125, 150, 175, 200, 225, 250}; List chartTwoX = Arrays.asList(arr); List chartTwoUp = RandomNumberUtil.generateFakeDataList(arr.length, Integer.class); @@ -81,6 +84,10 @@ public class KhOilRealtimeDataServiceImpl extends ServiceImpl> chartThree = new HashMap<>(); List chartThreeX = RandomNumberUtil.getLast30DaysFormattedDatesAscending();