From dfae49f76625f8c4fa36dcb4841c525e4d3d8cda Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 3 Sep 2024 16:05:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/csdevice/service/impl/CsGroupServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index 1147372..aa4475b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -150,6 +150,9 @@ public class CsGroupServiceImpl extends ServiceImpl impl for (EnergyTemplateVO item : list) { EnergyTemplateVO vo = new EnergyTemplateVO(); BeanUtils.copyProperties(item,vo); + if (vo.getAnotherName().contains("A相") || vo.getAnotherName().contains("B相") || vo.getAnotherName().contains("C相")) { + vo.setAnotherName(vo.getAnotherName().substring(0,2)); + } EleEpdPqd eleEpdPqd = eventTypeMap.get(item.getDataId()); vo.setClassId(eleEpdPqd.getClassId()); vo.setUnit(eleEpdPqd.getUnit()); @@ -719,6 +722,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl if (energyTemplate != null && energyTemplate.getUnit() != null) { dataGroupTemplate.setName(dataGroupTemplate.getName() + "(" + energyTemplate.getUnit() + ")"); } + dataGroupTemplate.setName(dataGroupTemplate.getName().replace("序列",""));; } }