Merge remote-tracking branch 'origin/developer_bw' into developer_bw

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

@@ -12,6 +12,7 @@ import java.util.List;
 @Data
 public class DataDto {
     String time;
+    String name;
     List<String> snCodes;
     String regionalCompaniesCode;
 }

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

@@ -87,6 +87,9 @@ public class JpStationDto extends BaseDto {
     @ExcelIgnore
 	@ApiModelProperty(value = "第三方厂商标识")
 	private String thirdCode;
+	@ExcelIgnore
+	@ApiModelProperty(value = "逆变器SN")
+	private String nbqSnCode;
 	/**
 	 * 实时功率
 	 */

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java

@@ -72,7 +72,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     Map<String,Object> getcount( @Param("dto") JpStationDto reviewDto);
 
-    @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
    List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto);
 
     List<DropDown>  getDealerNew(@Param("regionalCompaniesSeq") String regionalCompaniesSeq);

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

@@ -20,5 +20,5 @@ public interface TdHYGFInverterDayGenerateMapper extends BaseMapper<TdHYGFInvert
     List<Map<String,Object>> selectSnCodeList(String startTime, String endTime, List<String> sncodes);
 
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
-    List<TdHYGFInverterDayGenerate> selectListPage(List<String> snCodeList, List<String> maxCreatedTimeList, String startTime, String endTime,@Param("regionalCompaniesCode")String regionalCompaniesCode);
+    List<TdHYGFInverterDayGenerate> selectListPage(List<String> snCodeList, List<String> maxCreatedTimeList, String startTime, String endTime,@Param("regionalCompaniesCode")String regionalCompaniesCode, @Param("name") String name);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml

@@ -50,9 +50,9 @@
         hjc.collector_sn_code,
         hjc.update_time,
         hjc.current_power,
-        CAST(hjc.day_power_generation AS DECIMAL(20, 3)) as dayPowerGeneration,
-        CAST(hjc.month_power_generation AS DECIMAL(20, 3)) as monthPowerGeneration,
-        CAST(hjc.year_power_generation AS DECIMAL(20, 3)) as yearPowerGeneration,
+        CAST( (FLOOR(hjc.day_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as dayPowerGeneration,
+        CAST( (FLOOR(hjc.month_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as monthPowerGeneration,
+        CAST( (FLOOR(hjc.year_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as yearPowerGeneration,
         hjc.brand,
         hjc.model,
         hjc.national_standard,
@@ -64,7 +64,7 @@
         hjc.AFCI_version,
         hjc.ID,
         hjc.capacity,
-        CAST(hjc.total_power_generation/1000 AS DECIMAL(20, 3)) as totalPowerGeneration,
+        CAST( (FLOOR(hjc.total_power_generation/1000 * 1000) / 1000) AS DECIMAL(20, 3)) as totalPowerGeneration,
         hjc.third_station_id,
         hjc.is_delete,
         hjc.third_code,

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

@@ -83,6 +83,9 @@
             <if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
                 and regional_companies_code = #{regionalCompaniesCode}
             </if>
+            <if test="name !=null and name != ''">
+                and name LIKE #{name}
+            </if>
         </where>
         order by created_time desc
     </select>

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

@@ -275,7 +275,7 @@ public class JpInverterController extends BaseController {
 
 //        List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
 
-        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterDayReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterDayReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode(), dataDto.getName()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -309,7 +309,7 @@ public class JpInverterController extends BaseController {
         }
 //        List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
 
-        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterMonthReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterMonthReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode(), dataDto.getName()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -344,7 +344,7 @@ public class JpInverterController extends BaseController {
         }
        // List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
 
-        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterYearReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterYearReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode(), dataDto.getName()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -151,7 +151,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
     }
 
     @UserLimits
-    public Page<TdHYGFInverterDayGenerate> jpInverterDayReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode)  {
+    public Page<TdHYGFInverterDayGenerate> jpInverterDayReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode, String name)  {
         Page<TdHYGFInverterDayGenerate> tdHYGFInverterDayGeneratePage = new Page<>();
 //        Date date = DateUtil.parse(time, "yyyy-MM-dd");
 //        Date timeStart = DateUtils.dateAddHours(date, -8);
@@ -194,9 +194,16 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
                 maxCreatedTimeList.add(sdf.format(item.get("max_created_time")));
             }
         });
+
+
+        if(StringUtils.isNotEmpty(name)) {
+            name = '%' + name + "%";
+        }
+
+
         Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
         PageHelper.startPage(current, size);
-        List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectListPage(snCodeList, null, startTime, endTime,regionalCompaniesCode);
+        List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectListPage(snCodeList, null, startTime, endTime,regionalCompaniesCode, name);
 
         tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
             Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
@@ -263,19 +270,25 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         return tdHYGFInverterDayGenerates;
     }
     @UserLimits
-    public Page<TdHYGFInverterMonthGenerate> jpInverterMonthReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode ) {
+    public Page<TdHYGFInverterMonthGenerate> jpInverterMonthReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode , String name) {
         Page<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGeneratePage = new Page<>();
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>()
                 .eq("year_month", time);
 //                .in("third_station_id", stationIds);
+
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
+        if (StringUtils.isNotEmpty(name)) {
+            queryWrapper.like("name", "%" + name + "%");
+        }
         queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
 
         queryWrapper.orderByDesc("day_time");
 
 
+
+
         Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
         PageHelper.startPage(current, size);
         List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper);
@@ -329,7 +342,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         return tdHYGFInverterMonthGenerates;
     }
     @UserLimits
-    public Page<TdHYGFInverterYearGenerate> jpInverterYearReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
+    public Page<TdHYGFInverterYearGenerate> jpInverterYearReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode, String name) {
         Page<TdHYGFInverterYearGenerate> tdHYGFInverterYearGeneratePage = new Page<>();
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>()
                 .eq("year", time);
@@ -337,6 +350,9 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
+        if (StringUtils.isNotEmpty(name)) {
+            queryWrapper.like("name", "%" + name + "%");
+        }
         queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
         queryWrapper.orderByDesc("month_time");