修改监盘功率bug

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/constant/ImasterConstant.java

@@ -63,6 +63,8 @@ public class ImasterConstant {
     public static String baseurl ="https://cn.fusionsolar.huawei.com";
     public static String account ="ahsjmg-API";
     public static String password ="huawei123";
+//    public static String account ="xtt163";
+//    public static String password ="a1234560";
     public static String tokenUrl ="/thirdData/login";
 
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/controller/HouseholdTestController.java

@@ -138,7 +138,7 @@ public class HouseholdTestController {
         imasterDataService.stationList();
         imasterDataService.stationDetail();
         imasterDataService.collectorList();
-        imasterDataService.inverterList();
-        imasterDataService.inverterDetail();
+        imasterDataService.inverterList(null);
+       // imasterDataService.inverterDetail(null);
     }
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/ImasterCollectorList.java

@@ -18,4 +18,9 @@ public class ImasterCollectorList {
     private String invType;
     private Double longitude;
     private Double latitude;
+
+
+    private String addr;
+    private String collectorSnCode;
+
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/ImasterDataService.java

 package com.yeejoin.amos.api.householdapi.face.service;
 
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.ImasterCollectorList;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.ImasterInverterList;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.ImasterInverterListDetails;
+
+import java.util.List;
+
 public interface ImasterDataService {
 
     /**
@@ -21,11 +27,11 @@ public interface ImasterDataService {
     /**
      * @descrption 逆变器列表数据入库
      */
-    void inverterList();
+    void inverterList(List<ImasterCollectorList> result);
     /**
      * @descrption 逆变器详情数据入库
      */
-    void inverterDetail();
+    void inverterDetail(List<ImasterInverterListDetails> result);
     /**
      * @descrption 采集器告警列表数据入库
      */

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

@@ -277,28 +277,42 @@ public class JpStationController extends BaseController {
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(needAuth = false,ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "工率曲线",   notes = "电站监控电量收益")
     @GetMapping(value = "/getPowerqx")
     public ResponseModel< Map<String, List<Object>>> getPowerqx(JpStationDto reviewDto,String date, String type) {
         //获取当前人管理场站
         List<String> data=new ArrayList();
-        if(reviewDto.getThirdStationId()==null){
-            //获取当前人管理场站
-            LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
-            qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
-            List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
-            if(pPersonStation!=null&&!pPersonStation.isEmpty()){
+        Set<String> se=new HashSet<>();
+        if(reviewDto.getName()!=null){
+            LambdaQueryWrapper<JpPersonStation> qug1=new LambdaQueryWrapper<>();
+            qug1.like(JpPersonStation::getStationName,reviewDto.getName());
+            List<JpPersonStation> pPersonStation1=pPersonStationMapper.selectList(qug1);
+            if(pPersonStation1!=null&&!pPersonStation1.isEmpty()){
+                for (JpPersonStation jpPersonStation : pPersonStation1) {
+                    se.add(jpPersonStation.getStationId());
+                }
+            }
+            data.addAll(se);
+        }else{
+            if(reviewDto.getThirdStationId()==null){
+                //获取当前人管理场站
+                LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
+                qug.eq(JpPersonStation::getPersonId,getUserInfo().getUserId());
+                List<JpPersonStation> pPersonStation=pPersonStationMapper.selectList(qug);
+                if(pPersonStation!=null&&!pPersonStation.isEmpty()){
 
-                for (JpPersonStation jpPersonStation : pPersonStation) {
-                    data.add(jpPersonStation.getStationId());
+                    for (JpPersonStation jpPersonStation : pPersonStation) {
+                        data.add(jpPersonStation.getStationId());
+                    }
+                }else{
+                    return  ResponseHelper.buildResponse(null);
                 }
             }else{
-                return  ResponseHelper.buildResponse(null);
+                data.add(reviewDto.getThirdStationId());
             }
-        }else{
-            data.add(reviewDto.getThirdStationId());
         }
+
         return ResponseHelper.buildResponse(jpStationServiceImpl.getPowerqx( date,  type,data));
     }