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> listAll(@NotNull(message = "主设备编号不能缺少") @Param("bdzid") Integer bdzid) { + public Response> listAll(@NotNull(message = "主设备编号不能缺少") @Param("zsbid") Integer zsbid) { try { - List result = service.listAll(bdzid); + List 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;