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 68d1c938..6d2daf12 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 @@ -77,7 +77,7 @@ public class KhOilRealtimeDataServiceImpl extends ServiceImpl chartTwoX = Arrays.asList(arr); List chartTwoUp = RandomNumberUtil.generateFakeDataList(arr.length, Integer.class); - List chartTwoDown = RandomNumberUtil.generateFakeDataList(arr.length, Integer.class); + List chartTwoDown = this.getRandomMinusDataList(chartTwoUp); chartTwo.put("X轴", chartTwoX); chartTwo.put("上冲程", chartTwoUp); chartTwo.put("下冲程", chartTwoDown); @@ -85,7 +85,7 @@ public class KhOilRealtimeDataServiceImpl extends ServiceImpl> chartThree = new HashMap<>(); List chartThreeX = RandomNumberUtil.getLast30DaysFormattedDatesAscending(); List charThreeMax = RandomNumberUtil.generateFakeDataList(chartThreeX.size(), Integer.class); - List chartThreeMin = RandomNumberUtil.generateFakeDataList(chartThreeX.size(), Integer.class); + List chartThreeMin = this.getRandomMinusDataList(charThreeMax); chartThree.put("X轴", chartThreeX); chartThree.put("最大载荷", charThreeMax); chartThree.put("最小载荷", chartThreeMin); @@ -93,5 +93,13 @@ public class KhOilRealtimeDataServiceImpl extends ServiceImpl getRandomMinusDataList(List originList) { + List data = new ArrayList<>(); + for (Integer originData : originList) { + data.add(originData - RandomNumberUtil.getRandomIntBetween(5, 40)); + } + return data; + } + } diff --git a/kh-modules/src/main/java/com/jero/modules/utils/RandomNumberUtil.java b/kh-modules/src/main/java/com/jero/modules/utils/RandomNumberUtil.java index 4824d147..7fe264fa 100644 --- a/kh-modules/src/main/java/com/jero/modules/utils/RandomNumberUtil.java +++ b/kh-modules/src/main/java/com/jero/modules/utils/RandomNumberUtil.java @@ -22,10 +22,13 @@ public class RandomNumberUtil { } public static int getRandomInt() { - // 生成一个在0到100之间,小数点后有2位的随机浮点数 return faker.number().randomDigit(); } + public static int getRandomIntBetween(int min, int max) { + return faker.number().numberBetween(min, max); + } + // 生成指定大小和类型的列表,填充伪随机数据 public static List generateFakeDataList(int size, Class type) { List resultList = new ArrayList<>(); @@ -33,7 +36,7 @@ public class RandomNumberUtil { for (int i = 0; i < size; i++) { if (type.equals(Double.class)) { // 对于 Double 类型,生成伪随机双精度值 - resultList.add(type.cast(faker.number().randomDouble(2, 1, 100))); + resultList.add(type.cast(faker.number().randomDouble(2, 50, 100))); } else if (type.equals(Integer.class)) { // 对于 Integer 类型,生成伪随机整数值 resultList.add(type.cast(faker.number().numberBetween(1, 100)));