From 5fc143726d22062304b2c33d325edb0ddd772c6a Mon Sep 17 00:00:00 2001 From: qinjie <463333974@qq.com> Date: Wed, 11 Dec 2024 17:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E6=9D=A1=E9=A2=9C=E8=89=B2=E5=92=8C?= =?UTF-8?q?=E4=B8=8B=E5=8D=88=E7=9A=84bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/listener/DynamicRabbitListener.java | 2 +- .../service/impl/SummaryServiceImpl.java | 35 ++++++++++++++++--- .../command/etc/TubPressureOptimization.java | 6 ++-- .../vo/command/scss/CasingMode.java | 2 +- .../gaswellwatch/vo/summary/ItemStyleVO.java | 22 ++++++++++++ .../gaswellwatch/vo/summary/LineDataVO.java | 2 ++ .../gaswellwatch/vo/summary/LineStyleVO.java | 21 +++++++++++ .../vo/summary/NormalStyleVO.java | 23 ++++++++++++ src/main/resources/mapper/DeviceDao.xml | 6 ++-- 9 files changed, 107 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/isu/gaswellwatch/vo/summary/ItemStyleVO.java create mode 100644 src/main/java/com/isu/gaswellwatch/vo/summary/LineStyleVO.java create mode 100644 src/main/java/com/isu/gaswellwatch/vo/summary/NormalStyleVO.java diff --git a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java index c134ab6..c487a87 100644 --- a/src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java +++ b/src/main/java/com/isu/gaswellwatch/modbus/data/listener/DynamicRabbitListener.java @@ -41,7 +41,7 @@ public class DynamicRabbitListener implements ApplicationRunner { this.businessMessageListenerContainer = new SimpleMessageListenerContainer(); this.businessMessageListenerContainer.setConnectionFactory(connectionFactory); this.businessMessageListenerContainer.setMessageListener(this.businessMessageListener); -// this.businessMessageListenerContainer.start(); + this.businessMessageListenerContainer.start(); } @Override diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java index 2a7391d..a83f481 100644 --- a/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java +++ b/src/main/java/com/isu/gaswellwatch/service/impl/SummaryServiceImpl.java @@ -4,10 +4,7 @@ import com.isu.gaswellwatch.service.DeviceService; import com.isu.gaswellwatch.service.SummaryService; import com.isu.gaswellwatch.vo.DeviceHistoryVO; import com.isu.gaswellwatch.vo.DeviceVO; -import com.isu.gaswellwatch.vo.summary.LineDataVO; -import com.isu.gaswellwatch.vo.summary.LineSummaryVO; -import com.isu.gaswellwatch.vo.summary.PieDataVO; -import com.isu.gaswellwatch.vo.summary.PieSummaryVO; +import com.isu.gaswellwatch.vo.summary.*; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -117,15 +114,18 @@ public class SummaryServiceImpl implements SummaryService { List legendData = new ArrayList<>(); legendData.add("油压"); legendData.add("套压"); + legendData.add("输压"); lineSummaryVO.setLegendData(legendData); List oilPressureData = new ArrayList<>(); List casPressureData = new ArrayList<>(); + List prePressureData = new ArrayList<>(); for(DeviceHistoryVO deviceHistoryVO : dataList){ xAxisData.add(deviceHistoryVO.getCollectionTime()); oilPressureData.add(StringUtils.isEmpty(deviceHistoryVO.getOilPressure())?"0":deviceHistoryVO.getOilPressure()); casPressureData.add(StringUtils.isEmpty(deviceHistoryVO.getCasPressure())?"0":deviceHistoryVO.getCasPressure()); + prePressureData.add(StringUtils.isEmpty(deviceHistoryVO.getPrePressure())?"0":deviceHistoryVO.getPrePressure()); } //设置x轴数据（日期） @@ -138,13 +138,40 @@ public class SummaryServiceImpl implements SummaryService { oil.setType("line"); oil.setData(oilPressureData); + //设置线条颜色 #A50021 深红 #333399 深蓝 + ItemStyleVO itemStyleVO = new ItemStyleVO(); + NormalStyleVO normalStyleVO = new NormalStyleVO(); + normalStyleVO.setColor("#A50021"); + LineStyleVO lineStyleVO = new LineStyleVO(); + lineStyleVO.setColor("#A50021"); + normalStyleVO.setLineStyle(lineStyleVO); + itemStyleVO.setNormal(normalStyleVO); + oil.setItemStyle(itemStyleVO); + LineDataVO cas = new LineDataVO(); cas.setName("套压"); cas.setType("line"); cas.setData(casPressureData); + //设置线条颜色 + ItemStyleVO itemStyleVO1 = new ItemStyleVO(); + NormalStyleVO normalStyleVO1 = new NormalStyleVO(); + normalStyleVO1.setColor("#333399"); + LineStyleVO lineStyleVO1 = new LineStyleVO(); + lineStyleVO1.setColor("#333399"); + normalStyleVO.setLineStyle(lineStyleVO1); + itemStyleVO1.setNormal(normalStyleVO1); + cas.setItemStyle(itemStyleVO1); + + LineDataVO pre = new LineDataVO(); + pre.setName("输压"); + pre.setType("line"); + pre.setData(prePressureData); + + series.add(oil); series.add(cas); + series.add(pre); lineSummaryVO.setSeries(series); return lineSummaryVO; diff --git a/src/main/java/com/isu/gaswellwatch/vo/command/etc/TubPressureOptimization.java b/src/main/java/com/isu/gaswellwatch/vo/command/etc/TubPressureOptimization.java index 9a8ed8c..c502949 100644 --- a/src/main/java/com/isu/gaswellwatch/vo/command/etc/TubPressureOptimization.java +++ b/src/main/java/com/isu/gaswellwatch/vo/command/etc/TubPressureOptimization.java @@ -26,7 +26,7 @@ public class TubPressureOptimization extends Command implements Timing { private static final long serialVersionUID = 6405657928042198221L; /** - * 套压开关 + * 油压开关 */ private boolean tubPressureSwitch; /** @@ -34,11 +34,11 @@ public class TubPressureOptimization extends Command implements Timing { */ private BigDecimal tubPressureSensorRange; /** - * 开井套压 + * 开井油压 */ private BigDecimal openTubPressure; /** - * 复位套压 + * 复位油压 */ private BigDecimal openResetTubPressure; /** diff --git a/src/main/java/com/isu/gaswellwatch/vo/command/scss/CasingMode.java b/src/main/java/com/isu/gaswellwatch/vo/command/scss/CasingMode.java index 2ce39c8..4ce3fbe 100644 --- a/src/main/java/com/isu/gaswellwatch/vo/command/scss/CasingMode.java +++ b/src/main/java/com/isu/gaswellwatch/vo/command/scss/CasingMode.java @@ -82,7 +82,7 @@ public class CasingMode extends Command implements Timing { command.setLength(0); // 地址码 功能码 起始地址 连续长度 连续字长 // 01 10 00AA 0004 08 - command.append("011000AA000204"); + command.append("011000AA000408"); command.append(StringUtils.leftPad(Long.toHexString(this.toSeconds(this.minWellCloseTimeDuration)), 8, "0")); command.append(StringUtils.leftPad(Long.toHexString(this.toSeconds(this.maxWellCloseTimeDuration)), 8, "0")); resultList.add(ModbusCommandDto.builder().command(command.toString()).length(16).build()); diff --git a/src/main/java/com/isu/gaswellwatch/vo/summary/ItemStyleVO.java b/src/main/java/com/isu/gaswellwatch/vo/summary/ItemStyleVO.java new file mode 100644 index 0000000..5a190b3 --- /dev/null +++ b/src/main/java/com/isu/gaswellwatch/vo/summary/ItemStyleVO.java @@ -0,0 +1,22 @@ +package com.isu.gaswellwatch.vo.summary; + +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.io.Serializable; +import java.util.List; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@EqualsAndHashCode +@ToString(callSuper = true) +public class ItemStyleVO implements Serializable { + + private static final long serialVersionUID = 1L; + + private NormalStyleVO normal; + + +} diff --git a/src/main/java/com/isu/gaswellwatch/vo/summary/LineDataVO.java b/src/main/java/com/isu/gaswellwatch/vo/summary/LineDataVO.java index 187e883..5d9aa27 100644 --- a/src/main/java/com/isu/gaswellwatch/vo/summary/LineDataVO.java +++ b/src/main/java/com/isu/gaswellwatch/vo/summary/LineDataVO.java @@ -22,5 +22,7 @@ public class LineDataVO implements Serializable { private List data; + private ItemStyleVO itemStyle; + } diff --git a/src/main/java/com/isu/gaswellwatch/vo/summary/LineStyleVO.java b/src/main/java/com/isu/gaswellwatch/vo/summary/LineStyleVO.java new file mode 100644 index 0000000..996272b --- /dev/null +++ b/src/main/java/com/isu/gaswellwatch/vo/summary/LineStyleVO.java @@ -0,0 +1,21 @@ +package com.isu.gaswellwatch.vo.summary; + +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.io.Serializable; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@EqualsAndHashCode +@ToString(callSuper = true) +public class LineStyleVO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String color; + + +} diff --git a/src/main/java/com/isu/gaswellwatch/vo/summary/NormalStyleVO.java b/src/main/java/com/isu/gaswellwatch/vo/summary/NormalStyleVO.java new file mode 100644 index 0000000..96e33b9 --- /dev/null +++ b/src/main/java/com/isu/gaswellwatch/vo/summary/NormalStyleVO.java @@ -0,0 +1,23 @@ +package com.isu.gaswellwatch.vo.summary; + +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.io.Serializable; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@EqualsAndHashCode +@ToString(callSuper = true) +public class NormalStyleVO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String color; + + private LineStyleVO lineStyle; + + +} diff --git a/src/main/resources/mapper/DeviceDao.xml b/src/main/resources/mapper/DeviceDao.xml index 7e0f9fe..41922f1 100644 --- a/src/main/resources/mapper/DeviceDao.xml +++ b/src/main/resources/mapper/DeviceDao.xml @@ -70,10 +70,10 @@