diff --git a/kh-modules/src/main/java/com/jero/modules/entity/KhOilRealtimeData.java b/kh-modules/src/main/java/com/jero/modules/entity/KhOilRealtimeData.java index 74ef56ef..da0fe573 100644 --- a/kh-modules/src/main/java/com/jero/modules/entity/KhOilRealtimeData.java +++ b/kh-modules/src/main/java/com/jero/modules/entity/KhOilRealtimeData.java @@ -199,14 +199,17 @@ public class KhOilRealtimeData implements Serializable { this.id = "default"; } + private static int dbIndex = 0; - public void mockKhOilRealtimeRedisData(boolean db1) { + private static boolean db1Select = true; + + public void mockKhOilRealtimeRedisData() { Map> map = new HashMap<>(); JSONArray data = new JSONArray(); // 连接到Redis服务器 try (Jedis jedis = new Jedis("1.15.107.30", 6379)) { jedis.auth("kld4...."); - if (db1) { + if (db1Select) { // 去db1取数据 jedis.select(1); } else { @@ -224,23 +227,29 @@ public class KhOilRealtimeData implements Serializable { List values = jsonObject.getJSONArray("Values").toJavaList(Double.class); map.put(name, values); } - this.oilPressure = map.get("YouYa").get(0); - this.currentA = map.get("DianLiu_A").get(0); - this.currentB = map.get("DianLiu_B").get(0); - this.currentC = map.get("DianLiu_C").get(0); - this.activePower = map.get("YouGongGongLv").get(0); - this.powerFactor = map.get("GongLvYinShu").get(0); - this.casingPressure = map.get("TaoYa").get(0); - this.voltageA = map.get("DianYa_A").get(0); - this.voltageB = map.get("DianYa_B").get(0); - this.voltageC = map.get("DianYa_C").get(0); - this.reactivePower = map.get("WuGongGongLv").get(0); - this.outputFrequency = (int) Double.parseDouble(String.valueOf(map.get("ShuChuPinLv").get(0))); - this.strokeCount = (int) Double.parseDouble(String.valueOf(map.get("ChongCi").get(0))); - this.stroke = map.get("ChongCheng").get(0); + int size = map.get("YouYa").size(); + this.oilPressure = map.get("YouYa").get(dbIndex); + this.currentA = map.get("DianLiu_A").get(dbIndex); + this.currentB = map.get("DianLiu_B").get(dbIndex); + this.currentC = map.get("DianLiu_C").get(dbIndex); + this.activePower = map.get("YouGongGongLv").get(dbIndex); + this.powerFactor = map.get("GongLvYinShu").get(dbIndex); + this.casingPressure = map.get("TaoYa").get(dbIndex); + this.voltageA = map.get("DianYa_A").get(dbIndex); + this.voltageB = map.get("DianYa_B").get(dbIndex); + this.voltageC = map.get("DianYa_C").get(dbIndex); + this.reactivePower = map.get("WuGongGongLv").get(dbIndex); + this.outputFrequency = (int) Double.parseDouble(String.valueOf(map.get("ShuChuPinLv").get(dbIndex))); + this.strokeCount = (int) Double.parseDouble(String.valueOf(map.get("ChongCi").get(dbIndex))); + this.stroke = map.get("ChongCheng").get(dbIndex); this.minLoad = 0; this.maxLoad = 0; this.deviceId = "default"; this.id = "default"; + dbIndex += 1; + if (dbIndex >= size) { + dbIndex = 0; + db1Select = !db1Select; + } } } 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 a07e80b0..9930c441 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 @@ -28,8 +28,6 @@ import javax.servlet.http.HttpServletRequest; @Transactional(rollbackFor = JeroBootException.class) public class KhOilRealtimeDataServiceImpl extends ServiceImpl implements IKhOilRealtimeDataService { - private static boolean dbSelect = true; - /** * 列表查询 * @@ -71,8 +69,7 @@ public class KhOilRealtimeDataServiceImpl extends ServiceImpl realtimeDataResults(String id) { KhOilRealtimeData khOilRealtimeData = new KhOilRealtimeData(); Map result = new HashMap<>(); - dbSelect = !dbSelect; - khOilRealtimeData.mockKhOilRealtimeRedisData(dbSelect); + khOilRealtimeData.mockKhOilRealtimeRedisData(); result.put("油井实时参数", khOilRealtimeData); Map chartTwo = new HashMap<>(); Integer[] arr = {0, 25, 50, 75, 100, 125, 150, 175, 200, 225, 250};