src/main/java/com/whyc/controller/PowerInfController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/Battinf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/PowerInf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/StationInf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/StationInfService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/controller/PowerInfController.java
@@ -53,7 +53,7 @@ station.setStationName2(powerInf.getStationName2()); station.setStationName3(powerInf.getStationName3()); station.setStationName5(powerInf.getStationName5()); station.setStationIdEx(powerInf.getStationIdEx()); station.setStationIdTogether(powerInf.getStationIdTogether()); stationInfService.insertStation(station); //powerInf.setStationId(String.valueOf(battInfService.searchMaxId_zj())); powerInf.setStationId(nextStationId); src/main/java/com/whyc/pojo/Battinf.java
@@ -328,5 +328,5 @@ @TableField(exist = false) @ApiModelProperty(value = "相同机房的id(不传标识为单一机房)") private String stationIdEx; private String stationIdTogether; } src/main/java/com/whyc/pojo/PowerInf.java
@@ -81,6 +81,6 @@ @TableField(exist = false) @ApiModelProperty(value = "相同机房的id(不传标识为单一机房)") private String stationIdEx; private String stationIdTogether; } src/main/java/com/whyc/pojo/StationInf.java
@@ -59,7 +59,7 @@ @TableField(exist = false) @ApiModelProperty(value = "相同机房的id(不传标识为单一机房)") private String stationIdEx; private String stationIdTogether; @TableField(exist = false) private PwrdevAcdcdata acdc; src/main/java/com/whyc/service/BattInfService.java
@@ -195,7 +195,7 @@ station.setStationName3(battinf.getStationName3()); station.setStationName4(battinf.getStationName4()); station.setStationName5(battinf.getStationName5()); station.setStationIdEx(battinf.getStationIdEx()); station.setStationIdTogether(battinf.getStationIdTogether()); stationInfService.insertStation(station); battinf.setStationId(stationId); src/main/java/com/whyc/service/StationInfService.java
@@ -101,7 +101,7 @@ @Transactional public Response insertStation(StationInf stationInf) { String stationId = stationInf.getStationId(); String stationIdEx = stationInf.getStationIdEx(); String stationIdEx = stationInf.getStationIdTogether(); int togetherFlag = 0; if (stationId == null || stationId.isEmpty()) { stationId = String.valueOf(Integer.valueOf(getMaxStationId()) + 1);