1.新增获取逆变器snCode代码

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

@@ -220,6 +220,14 @@ public class JpInverterController extends BaseController {
 
         //	jpInverterServiceImpl.
     }
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/getInverterSncodes")
+    @ApiOperation(httpMethod = "GET", value = "获取逆变器snCode", notes = "获取逆变器snCode")
+    public ResponseModel<List<Map<String,String>>> getInverterSncodes() {
+        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(null);
+        List<String> stationids = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.getInverterSncodes(stationids));
+    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/jpInverterDayReport")
@@ -261,6 +269,5 @@ public class JpInverterController extends BaseController {
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
@@ -37,6 +35,8 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
     @Autowired
     TdHYGFInverterDayGenerateMapper tdHYGFInverterDayGenerateMapper;
 
+    @Autowired
+    JpInverterMapper jpInverterMapper;
 
     /**
      * 分页查询
@@ -89,7 +89,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
 
     }
 
-    public Page<TdHYGFInverterDayGenerate> jpInverterDayReport(int current, int size, String time, List<String> sncodes,List<String> stationIds) {
+    public Page<TdHYGFInverterDayGenerate> jpInverterDayReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
         Page<TdHYGFInverterDayGenerate> tdHYGFInverterDayGeneratePage = new Page<>();
         Date date = DateUtil.parse(time, "yyyy-MM-dd");
         String startTime = DateUtil.format(date, "yyyy-MM-dd") + "00:00:00";
@@ -97,41 +97,60 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterDayGenerate>()
                 .ge("created_time", startTime)
                 .le("created_time", endTime)
-                .in("third_station_id",stationIds);;
+                .in("third_station_id", stationIds);
+        ;
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
-		queryWrapper.orderByDesc("created_time");
+        queryWrapper.orderByDesc("created_time");
         List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectList(queryWrapper);
         tdHYGFInverterDayGeneratePage.setTotal(tdHYGFInverterDayGenerates.size());
         tdHYGFInverterDayGeneratePage.setSize(size);
         tdHYGFInverterDayGeneratePage.setCurrent(current);
-        tdHYGFInverterDayGenerates=tdHYGFInverterDayGenerates.subList((current-1)*size,current*size>tdHYGFInverterDayGenerates.size()?tdHYGFInverterDayGenerates.size():current*size);
+        tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.subList((current - 1) * size, current * size > tdHYGFInverterDayGenerates.size() ? tdHYGFInverterDayGenerates.size() : current * size);
         tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
-            Date date1=new Date(tdHYGFInverterDayGenerate.getCreatedTime());
+            Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
             tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
         });
         tdHYGFInverterDayGeneratePage.setRecords(tdHYGFInverterDayGenerates);
         return tdHYGFInverterDayGeneratePage;
     }
 
-    public List<TdHYGFInverterDayGenerate> jpInverterDayReportExport(String time, List<String> sncodes,List<String> stationIds) {
+    public List<TdHYGFInverterDayGenerate> jpInverterDayReportExport(String time, List<String> sncodes, List<String> stationIds) {
         Date date = DateUtil.parse(time, "yyyy-MM-dd");
         String startTime = DateUtil.format(date, "yyyy-MM-dd") + "00:00:00";
         String endTime = DateUtil.format(date, "yyyy-MM-dd") + "23:59:59";
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterDayGenerate>()
                 .ge("created_time", startTime)
                 .le("created_time", endTime)
-                .in("third_station_id",stationIds);
+                .in("third_station_id", stationIds);
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
         queryWrapper.orderByDesc("created_time");
         List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectList(queryWrapper);
         tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
-            Date date1=new Date(tdHYGFInverterDayGenerate.getCreatedTime());
+            Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
             tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
         });
         return tdHYGFInverterDayGenerates;
     }
+
+    public List<Map<String, String>> getInverterSncodes(List<String> stationIds) {
+        List<Map<String, String>> result = new ArrayList<>();
+        QueryWrapper queryWrapper = new QueryWrapper<JpInverter>()
+                .in("third_station_id", stationIds);
+        queryWrapper.orderByAsc("third_station_id");
+        List<JpInverter> jpInverterList = jpInverterMapper.selectList(queryWrapper);
+        for (int i = 0; i < jpInverterList.size(); i++) {
+            JpInverter jpInverter = jpInverterList.get(i);
+            Map<String, String> item = new HashMap<>();
+            if (StringUtils.isNotEmpty(jpInverter.getSnCode())) {
+                item.put("name", jpInverter.getSnCode());
+                item.put("value", jpInverter.getSnCode());
+            }
+            result.add(item);
+        }
+        return result;
+    }
 }
\ No newline at end of file