From 03e51f05af9f229f18924a12dbf38aedbfc6bd68 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Fri, 5 Jan 2024 15:54:55 +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=20listall=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20modev=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xydl/cac/controller/ModevController.java   |  4 ++--
 src/main/java/com/xydl/cac/entity/Modev.java       | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xydl/cac/controller/ModevController.java b/src/main/java/com/xydl/cac/controller/ModevController.java
index d5eb737..f3a64c8 100644
--- a/src/main/java/com/xydl/cac/controller/ModevController.java
+++ b/src/main/java/com/xydl/cac/controller/ModevController.java
@@ -27,9 +27,9 @@ public class ModevController extends BasicController {
 
     @GetMapping("listAll")
     @ApiOperation("查询列表")
-    public Response<List<Modev>> listAll(@NotNull(message = "主设备编号不能缺少") @Param("bdzid") Integer bdzid) {
+    public Response<List<Modev>> listAll(@NotNull(message = "主设备编号不能缺少") @Param("zsbid") Integer zsbid) {
         try {
-            List<Modev> result = service.listAll(bdzid);
+            List<Modev> result = service.listAll(zsbid);
             return Response.success(result);
         } catch (Exception ex) {
             return Response.fail(ex.getMessage());
diff --git a/src/main/java/com/xydl/cac/entity/Modev.java b/src/main/java/com/xydl/cac/entity/Modev.java
index 0abdaf2..096c394 100644
--- a/src/main/java/com/xydl/cac/entity/Modev.java
+++ b/src/main/java/com/xydl/cac/entity/Modev.java
@@ -49,8 +49,8 @@ public class Modev {
     private Integer carelevel;
 
     @Column(name = "zsbid")
-    @NotNull(message = "名称不能为空")
-    @ApiModelProperty("监测设备类型编号")
+    @NotNull(message = "主设备编号不能缺少")
+    @ApiModelProperty("主设备编号")
     private Integer zsbid;
 
     @Column(name = "iedid")
@@ -92,19 +92,19 @@ 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 = "mainEid")
+    @Column(name = "main_eid")
     private Integer mainEid;
 
-    @Column(name = "secondEid")
+    @Column(name = "second_eid")
     private Integer secondEid;