From 5a2799d4d024db38bd03ee9a086aa8455e532adf Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Mon, 8 Jan 2024 09:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E8=A3=85=E7=BD=AE=E8=A1=A8?=
 =?UTF-8?q?=20=20=E9=87=8D=E5=A4=8D=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20modev=E8=A1=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/Modev.java  | 17 ++++++++-----
 .../cac/service/impl/ModevServiceImpl.java    | 25 +++++++++++++++++--
 .../service/impl/ModevTypeServiceImpl.java    |  2 +-
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xydl/cac/entity/Modev.java b/src/main/java/com/xydl/cac/entity/Modev.java
index 096c394..d3e0e98 100644
--- a/src/main/java/com/xydl/cac/entity/Modev.java
+++ b/src/main/java/com/xydl/cac/entity/Modev.java
@@ -92,21 +92,26 @@ public class Modev {
     @Column(name = "port")
     private String port;
 
-    @Column(name = "nPresetId")
+    @Column(name = "npresetid")
     private Integer npresetid;
 
-    @Column(name = "nRuleId")
+    @Column(name = "nruleid")
     private Integer nruleid;
 
-    @Column(name = "nMeterType")
+    @Column(name = "nmetertype")
     private Integer nmetertype;
 
-    @Column(name = "main_eid")
+    @Column(name = "mainEid")
     private Integer mainEid;
 
-    @Column(name = "second_eid")
+    @Column(name = "secondEid")
     private Integer secondEid;
 
+    @ApiModelProperty("主设备名称")
+    @Transient
+    private String zsbname;
 
-
+    @ApiModelProperty("监测设备类型名称")
+    @Transient
+    private String modevtname;
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java
index da5636e..8d77d98 100644
--- a/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java
@@ -2,7 +2,10 @@ package com.xydl.cac.service.impl;
 
 import com.xydl.cac.entity.Modev;
 import com.xydl.cac.entity.ModevType;
+import com.xydl.cac.entity.Zsb;
 import com.xydl.cac.repository.ModevRepository;
+import com.xydl.cac.repository.ModevTypeRepository;
+import com.xydl.cac.repository.ZsbRepository;
 import com.xydl.cac.service.ModevService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -10,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
@@ -21,9 +25,26 @@ public class ModevServiceImpl implements ModevService {
     @Resource
     ModevRepository repository;
 
+    @Resource
+    ModevTypeRepository modevTypeRepository;
+
+    @Resource
+    ZsbRepository zsbRepository;
+
     @Override
     public List<Modev> listAll(Integer zsbid) {
-        return repository.findByZsbid(zsbid);
+        List<Modev> byZsbid = repository.findByZsbid(zsbid);
+        Optional<Zsb> byId = zsbRepository.findById(zsbid);
+        List<ModevType> all = modevTypeRepository.findAll();
+        HashMap<Integer,String> map = new HashMap();
+        for (ModevType tit:all) {
+            map.put(tit.getId(), tit.getMc());
+        }
+        for (Modev it : byZsbid) {
+            it.setModevtname(map.get(it.getModevtid()));
+            it.setZsbname(byId.get().getMc());
+        }
+        return byZsbid;
     }
 
     @Override
@@ -41,7 +62,7 @@ public class ModevServiceImpl implements ModevService {
         List<Modev> byMc = repository.findByZsbidAndName(item.getZsbid(), item.getName());
         if (!CollectionUtils.isEmpty(byMc)) {
             for (Modev it : byMc) {
-                if (it.getId() != item.getId()) {
+                if (it.getId().intValue() != item.getId().intValue()) {
                     throw new Exception("该监测装置类型已存在");
                 }
             }
diff --git a/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java
index 1048404..8bf4cb2 100644
--- a/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java
@@ -40,7 +40,7 @@ public class ModevTypeServiceImpl implements ModevTypeService {
         List<ModevType> byMc = repository.findByMc(item.getMc());
         if (!CollectionUtils.isEmpty(byMc)) {
             for (ModevType it : byMc) {
-                if (it.getId() != item.getId()) {
+                if (it.getId().intValue() != item.getId().intValue()) {
                     throw new Exception("该监测装置类型已存在");
                 }
             }