增加电站告警统计接口

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -132,4 +135,10 @@ public class JpStationDto  extends BaseDto {
     private int countBuiltNum;//已建设场站数量
     private int countNBuiltNum;//未建设场站数量
 
+
+    List<JpInverter> jpInverter;
+
+    List<JpCollector> JpCollector;
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHygfJpInverterWarnMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml

@@ -6,12 +6,12 @@
 
 
     SELECT `state`,count(`state`) num
-    FROM house_pv_data.td_hygf_jp_inverter_warn
+    FROM td_hygf_jp_inverter_warn
        <where>
            <if test="dto!=null">
                third_station_id in
                <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
-                   #{item.stationId}
+                   #{item.thirdStationId}
                </foreach>
            </if>
        </where>

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

@@ -2,6 +2,8 @@ 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.ReviewDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpCollector;
+import com.yeejoin.amos.boot.module.hygf.api.entity.JpInverter;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpPersonStation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PersonnelBusiness;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.JpCollectorMapper;
@@ -100,7 +102,16 @@ public class JpStationController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个第三方场站",  notes = "根据sequenceNbr查询单个第三方场站")
 	public ResponseModel<JpStationDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jpStationServiceImpl.queryBySeq(sequenceNbr));
+        JpStationDto jpStationDto=  jpStationServiceImpl.queryBySeq(sequenceNbr);
+        LambdaQueryWrapper<JpInverter> qug=new LambdaQueryWrapper<>();
+        qug.eq(JpInverter::getThirdStationId,jpStationDto.getThirdStationId());
+        List<JpInverter> jpInverter=jpInverterMapper.selectList(qug);
+        LambdaQueryWrapper<JpCollector> qug1=new LambdaQueryWrapper<>();
+        qug1.eq(JpCollector::getThirdStationId,jpStationDto.getThirdStationId());
+        List<JpCollector> JpCollector=jpCollectorMapper.selectList(qug1);
+        jpStationDto.setJpCollector(JpCollector);
+        jpStationDto.setJpInverter(jpInverter);
+	    return ResponseHelper.buildResponse(jpStationDto);
 	}
 
 	/**

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

@@ -164,7 +164,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
         qugda.like(reviewDto.getUserName()!=null,JpStation::getUserName,reviewDto.getUserName());
         qugda.like(reviewDto.getArea()!=null,JpStation::getArea,reviewDto.getArea());
         List<JpStation> pPersonStation=jpStationMapper.selectList(qugda);
-        List<Map<String,Object>>   datalist=    tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation);
+        List<Map<String,Object>>   datalist=    tdHygfJpInverterWarnMapper.getCountTdHygfJpInverterWarn(pPersonStation!=null&&!pPersonStation.isEmpty()?pPersonStation:null);
         return ResponseHelper.buildResponse(datalist);
     }