修改代码

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -97,6 +98,8 @@ public class JpInverterDto  extends BaseDto {
 
     private List<String> stationIds;
 
+    private List<JpCollector> jpCollectors;
+
     @ApiModelProperty(value = "所属电站名称")
     private String name;
 

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

@@ -7,10 +7,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpCollectorServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.JpStationServiceImpl;
 import org.apache.commons.io.IOUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -60,6 +63,8 @@ public class JpInverterController extends BaseController {
     JpInverterServiceImpl jpInverterServiceImpl;
     @Autowired
     JpStationServiceImpl jpStationServiceImpl;
+    @Autowired
+    JpCollectorServiceImpl jpCollectorService;
 
     @Autowired
     JpPersonStationMapper pPersonStationMapper;
@@ -375,10 +380,7 @@ public class JpInverterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/snCode/{snCode}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器表")
-    public ResponseModel<JpInverter> selectOneBySnCode(@PathVariable String snCode) {
-       // JpInverterDto jpInverter=  jpInverterServiceImpl.queryBySeq(sequenceNbr);
-
-
+    public ResponseModel<JpInverterDto> selectOneBySnCode(@PathVariable String snCode) {
         LambdaQueryWrapper<JpInverter> query = new LambdaQueryWrapper<>();
         query.eq(JpInverter::getSnCode,snCode);
         JpInverter jpInverter = jpInverterServiceImpl.getBaseMapper().selectOne(query);
@@ -387,7 +389,18 @@ public class JpInverterController extends BaseController {
         jpInverter.setMonthPowerGeneration(jpInverter.getMonthPowerGeneration()!=null?jpInverter.getMonthPowerGeneration()/1000:0);
         jpInverter.setYearPowerGeneration(jpInverter.getYearPowerGeneration()!=null?jpInverter.getYearPowerGeneration()/1000:0);
         jpInverter.setTotalPowerGeneration(jpInverter.getTotalPowerGeneration()!=null?jpInverter.getTotalPowerGeneration()/1000:0);
-        return ResponseHelper.buildResponse(jpInverter);
+
+        JpInverterDto jpInverterDto = new JpInverterDto();
+
+        LambdaQueryWrapper<JpCollector> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JpCollector::getSnCode,jpInverter.getCollectorSnCode());
+        wrapper.eq(BaseEntity::getIsDelete, false);
+        List<JpCollector> jpCollector = jpCollectorService.getBaseMapper().selectList(wrapper);
+
+        BeanUtils.copyProperties(jpInverter,jpInverterDto);
+        jpInverterDto.setJpCollectors(jpCollector);
+
+        return ResponseHelper.buildResponse(jpInverterDto);
     }
 
 }