逆变器采集器增加列表展示冗余字段

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpCollectorDto.java

@@ -3,8 +3,10 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -71,6 +73,12 @@ public class JpCollectorDto  extends BaseDto {
 
     @ApiModelProperty(value = "电站地址")
     private String addr;
-    
+
+    @ApiModelProperty(value = "采集器列表")
+    private List<JpInverter> jpInverters;
+
     private List<String> stationIds;
+
+     @ApiModelProperty(value = "采集器名称")
+     private String name;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpCollector.java

@@ -117,5 +117,10 @@ public class JpCollector extends BaseEntity {
      */
     @TableField("addr")
     private String addr;
+    /**
+     * 采集器名称
+     */
+    @TableField("name")
+    private String name;
 
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpInverterServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -42,12 +46,15 @@ public class JpCollectorController extends BaseController {
 	@Autowired
 	JpPersonStationMapper pPersonStationMapper;
 
-	/**
-	 * 新增户用光伏监盘采集器表
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@Autowired
+	JpInverterServiceImpl jpInverterServiceImpl;
+
+    /**
+     * 新增户用光伏监盘采集器表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘采集器表", notes = "新增户用光伏监盘采集器表")
 	public ResponseModel<JpCollectorDto> save(@RequestBody JpCollectorDto model) {
@@ -92,9 +99,16 @@ public class JpCollectorController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘采集器表", notes = "根据sequenceNbr查询单个户用光伏监盘采集器表")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个户用光伏监盘采集器表",  notes = "根据sequenceNbr查询单个户用光伏监盘采集器表")
 	public ResponseModel<JpCollectorDto> selectOne(@PathVariable Long sequenceNbr) {
-		return ResponseHelper.buildResponse(jpCollectorServiceImpl.queryBySeq(sequenceNbr));
+		JpCollectorDto jpCollectorDto = jpCollectorServiceImpl.queryBySeq(sequenceNbr);
+
+		LambdaQueryWrapper<JpInverter> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(JpInverter::getCollectorSnCode, jpCollectorDto.getSnCode());
+		List<JpInverter> list = jpInverterServiceImpl.list(queryWrapper);
+		jpCollectorDto.setJpInverters(list);
+
+	    return ResponseHelper.buildResponse(jpCollectorDto);
 	}
 
 	/**