解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -238,6 +238,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 	@UserLimits
 	public ResponseModel<List<TdHygfJpInverterWarnDto>> selectWarnList(@RequestParam(required = false) String state,
 																@RequestParam(required = false) String level,
+																@RequestParam(required = false) String stationName,
 																@RequestParam(required = false) String minvalue,
 																@RequestParam(required = false) String maxValue,
 																@RequestParam(required = false) String snCode,
@@ -250,6 +251,9 @@ public class TdHygfJpInverterWarnController extends BaseController {
 
 		 JpStationDto reviewDto = new JpStationDto();
 		Map<String, String> nameMaps = new HashMap<>();
+		if (null != stationName){
+			reviewDto.setName(stationName);
+		}
 		List<JpStation> jpStation = jpStationMapper.getJpStation(reviewDto);
 		nameMaps = jpStation.stream().collect(Collectors.toMap(JpStation::getThirdStationId, JpStation::getName));