From e6c3d950023c2ea8b179dc044237d74e5caa993a Mon Sep 17 00:00:00 2001 From: whyclxw <810412026@qq.com> Date: 星期六, 17 五月 2025 16:51:32 +0800 Subject: [PATCH] 电源添加powerType电源类型:1:直流,2:通讯,3配网 --- src/main/java/com/whyc/service/BattInfService.java | 3 +++ src/main/java/com/whyc/dto/InfoDto.java | 3 +++ src/main/java/com/whyc/pojo/db_station/PowerInf.java | 3 +++ src/main/java/com/whyc/factory/InfoFactory.java | 1 + 4 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/whyc/dto/InfoDto.java b/src/main/java/com/whyc/dto/InfoDto.java index ad24c11..fcc9547 100644 --- a/src/main/java/com/whyc/dto/InfoDto.java +++ b/src/main/java/com/whyc/dto/InfoDto.java @@ -60,6 +60,9 @@ @ApiModelProperty(value = "鐢垫簮ip") private String powerIp; + @ApiModelProperty(value = "鐢垫簮绫诲瀷:1:鐩存祦锛�2锛氶�氳锛�3閰嶇綉") + private Integer powerType; + @ApiModelProperty(value = "璁惧id") diff --git a/src/main/java/com/whyc/factory/InfoFactory.java b/src/main/java/com/whyc/factory/InfoFactory.java index 0b7d20b..ad6ea0c 100644 --- a/src/main/java/com/whyc/factory/InfoFactory.java +++ b/src/main/java/com/whyc/factory/InfoFactory.java @@ -10,6 +10,7 @@ public static PowerInf infoToPower(InfoDto info) { PowerInf pinf = new PowerInf(); pinf.setCompany(info.getCompany()) + .setPowerType(info.getPowerType()) .setPowerModel(info.getPowerModel()) .setProtocol(info.getProtocol()) .setPowerIp(info.getPowerIp()); diff --git a/src/main/java/com/whyc/pojo/db_station/PowerInf.java b/src/main/java/com/whyc/pojo/db_station/PowerInf.java index 758a270..13a7652 100644 --- a/src/main/java/com/whyc/pojo/db_station/PowerInf.java +++ b/src/main/java/com/whyc/pojo/db_station/PowerInf.java @@ -57,6 +57,9 @@ @ApiModelProperty(value = "鐢垫簮ip") private String powerIp; + @ApiModelProperty(value = "鐢垫簮绫诲瀷:1:鐩存祦锛�2锛氶�氳锛�3閰嶇綉") + private Integer powerType; + @TableField(exist = false) private StationInf sinf; diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java index 68aa123..38c56d8 100644 --- a/src/main/java/com/whyc/service/BattInfService.java +++ b/src/main/java/com/whyc/service/BattInfService.java @@ -186,6 +186,9 @@ if(pinf.getPowerIp()!=null){ wrapper2.set("power_ip",pinf.getPowerIp()); } + if(pinf.getPowerType()!=null){ + wrapper2.set("power_type",pinf.getPowerType()); + } if(pinf.getPowerName()!=null){ //妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁瀛樺湪 QueryWrapper queryWrapper1=new QueryWrapper(); -- Gitblit v1.9.1