Skip to content

A
amos-boot-zx-biz
Commit eebd96e6 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

修改电站监控优化项

parent 804964ea
Show whitespace changes
Inline Side-by-side
Showing with 265 additions and 106 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DataDto.java
View file @ eebd96e6
......@@ -13,4 +13,5 @@ import java.util.List;
public class DataDto {
String time;
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/DayGenerateEX.java
View file @ eebd96e6
......@@ -17,12 +17,15 @@ public class DayGenerateEX {
@ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称")
private String name;
@ExcelProperty(value = "时间", index = 2)
@ExcelProperty(value = "项目公司名称", index = 2)
@ApiModelProperty(value = "项目公司名称")
private String regionalCompaniesName;
@ExcelProperty(value = "时间", index = 3)
String timeDate;
@ExcelProperty(value = "业主姓名", index = 3)
@ExcelProperty(value = "业主姓名", index = 4)
@ApiModelProperty(value = "业主姓名")
private String userName;
@ExcelProperty(value = "电站联系人", index = 4)
@ExcelProperty(value = "电站联系人", index = 5)
@ApiModelProperty(value = "电站联系人")
private String stationContact;
......@@ -32,28 +35,28 @@ public class DayGenerateEX {
* 满发小时数
*
* */
@ExcelProperty(value = "满发小时数(h)", index = 5)
@ExcelProperty(value = "满发小时数(h)", index = 6)
private Double fullhour;
@ExcelProperty(value = "日发电量(kWh)", index = 6)
@ExcelProperty(value = "日发电量(kWh)", index = 7)
// 日发电量
private Double dayGenerate;
@ExcelProperty(value = "日收益(元)", index = 7)
@ExcelProperty(value = "日收益(元)", index = 8)
// 日收益
private Double dayIncome;
/**
* 累计发电量
*/
@ExcelProperty(value = "累计发电量（MWh）", index = 8)
@ExcelProperty(value = "累计发电量（MWh）", index = 9)
private Double accumulatedPower;
/**
* 状态
*/
@ExcelProperty(value = "状态", index = 9)
@ExcelProperty(value = "状态", index = 10)
private String state;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java
View file @ eebd96e6
......@@ -167,7 +167,7 @@ public class JpStationDto extends BaseDto {
private Double ratedPower;
@ExcelIgnore
private String regionalCompaniesCode;
@ExcelIgnore
@ExcelProperty(value = "项目公司名称", index = 7)
private String regionalCompaniesName;
@ExcelIgnore
......@@ -185,7 +185,6 @@ public class JpStationDto extends BaseDto {
@ExcelProperty(value = "满发小时数（h）", index = 5)
private Double fullhour;
/**
*
* 实时功率比/
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MonthGenerateEX.java
View file @ eebd96e6
......@@ -20,12 +20,15 @@ public class MonthGenerateEX {
@ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称")
private String name;
@ExcelProperty(value = "时间", index = 2)
@ExcelProperty(value = "项目公司名称", index = 2)
@ApiModelProperty(value = "项目公司名称")
private String regionalCompaniesName;
@ExcelProperty(value = "时间", index = 3)
String timeDate;
@ExcelProperty(value = "业主姓名", index = 3)
@ExcelProperty(value = "业主姓名", index = 4)
@ApiModelProperty(value = "业主姓名")
private String userName;
@ExcelProperty(value = "电站联系人", index = 4)
@ExcelProperty(value = "电站联系人", index = 5)
@ApiModelProperty(value = "电站联系人")
private String stationContact;
......@@ -35,7 +38,7 @@ public class MonthGenerateEX {
* 满发小时数
*
* */
@ExcelProperty(value = "满发小时数(h)", index = 5)
@ExcelProperty(value = "满发小时数(h)", index = 6)
private Double fullhour;
......@@ -43,15 +46,15 @@ public class MonthGenerateEX {
// 月发电量
@ExcelProperty(value = "月发电量(kWh)", index = 6)
@ExcelProperty(value = "月发电量(kWh)", index = 7)
private Double monthGenerate;
// 月收益
@ExcelProperty(value = "月收益(元)", index = 7)
@ExcelProperty(value = "月收益(元)", index = 8)
private Double monthIncome;
/**
* 累计发电量
*/
@ExcelProperty(value = "累计发电量（MWh）", index = 8)
@ExcelProperty(value = "累计发电量（MWh）", index = 9)
private Double accumulatedPower;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/YearGenerateEX.java
View file @ eebd96e6
......@@ -17,12 +17,15 @@ public class YearGenerateEX {
@ExcelProperty(value = "电站名称", index = 1)
@ApiModelProperty(value = "电站名称")
private String name;
@ExcelProperty(value = "时间", index = 2)
@ExcelProperty(value = "项目公司名称", index = 2)
@ApiModelProperty(value = "项目公司名称")
private String regionalCompaniesName;
@ExcelProperty(value = "时间", index = 3)
String timeDate;
@ExcelProperty(value = "业主姓名", index = 3)
@ExcelProperty(value = "业主姓名", index = 4)
@ApiModelProperty(value = "业主姓名")
private String userName;
@ExcelProperty(value = "电站联系人", index = 4)
@ExcelProperty(value = "电站联系人", index = 5)
@ApiModelProperty(value = "电站联系人")
private String stationContact;
......@@ -30,22 +33,22 @@ public class YearGenerateEX {
* 满发小时数
*
* */
@ExcelProperty(value = "满发小时数(h)", index = 5)
@ExcelProperty(value = "满发小时数(h)", index = 6)
private Double fullhour;
// 年发电量
@ExcelProperty(value = "年发电量(kWh)", index = 6)
@ExcelProperty(value = "年发电量(kWh)", index = 7)
private Double yearGenerate;
// 年收益
@ExcelProperty(value = "年收益（元）", index = 7)
@ExcelProperty(value = "年收益（元）", index = 8)
private Double yearIncome;
/**
* 累计发电量
*/
@ExcelProperty(value = "累计发电量（MWh）", index = 8)
@ExcelProperty(value = "累计发电量（MWh）", index = 9)
private Double accumulatedPower;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterDayGenerate.java
View file @ eebd96e6
......@@ -185,5 +185,10 @@ public class TdHYGFInverterDayGenerate implements Serializable {
private Double fullhour;
@ExcelIgnore
private String name;
@ExcelProperty("项目公司名称")
String regionalCompaniesName;
@ExcelIgnore
String regionalCompaniesCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterMonthGenerate.java
View file @ eebd96e6
......@@ -53,5 +53,10 @@ public class TdHYGFInverterMonthGenerate implements Serializable {
private Double fullhour;
@ExcelIgnore
private Double income;
@ExcelProperty("项目公司名称")
String regionalCompaniesName;
@ExcelIgnore
String regionalCompaniesCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/TdHYGFInverterYearGenerate.java
View file @ eebd96e6
......@@ -53,5 +53,9 @@ public class TdHYGFInverterYearGenerate implements Serializable {
private Double fullhour;
@ExcelIgnore
private Double income;
@ExcelProperty("项目公司名称")
String regionalCompaniesName;
@ExcelIgnore
String regionalCompaniesCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/DayGenerateMapper.java
View file @ eebd96e6
......@@ -43,7 +43,8 @@ public interface DayGenerateMapper extends BaseMapper<DayGenerate> {
@Param("size") int size,@Param("dto")
List<String> statioId,
@Param("dateTime")String dateTime,
@Param("stationState")String stationState);
@Param("stationState")String stationState,
@Param("regionalCompaniesCode")String regionalCompaniesCode);
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
Integer selectCount(@Param(Constants.WRAPPER) Wrapper<DayGenerate> queryWrapper);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/MonthGenerateMapper.java
View file @ eebd96e6
......@@ -15,7 +15,8 @@ public interface MonthGenerateMapper extends BaseMapper<MonthGenerate> {
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<MonthGenerate> selectPagenewMonthGenerate(@Param("current") int current,@Param("size") int size,@Param("dto") List<String> statioId,
@Param("dateTime")String dateTime,
@Param("stationState")String stationState );
@Param("stationState")String stationState,
@Param("regionalCompaniesCode")String regionalCompaniesCode);
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<MonthGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<MonthGenerate> queryWrapper);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHYGFInverterDayGenerateMapper.java
View file @ eebd96e6
......@@ -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);
List<TdHYGFInverterDayGenerate> selectListPage(List<String> snCodeList, List<String> maxCreatedTimeList, String startTime, String endTime,@Param("regionalCompaniesCode")String regionalCompaniesCode);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/YearGenerateMapper.java
View file @ eebd96e6
......@@ -20,7 +20,8 @@ public interface YearGenerateMapper extends BaseMapper<YearGenerate> {
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<YearGenerate> selectPagenewYearGenerate(@Param("current") int current,@Param("size") int size,@Param("dto") List<String> statioId,
@Param("dateTime")String dateTime,
@Param("stationState")String stationState );
@Param("stationState")String stationState,
@Param("regionalCompaniesCode")String regionalCompaniesCode);
@UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<YearGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<YearGenerate> queryWrapper);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpCollectorMapper.xml
View file @ eebd96e6
......@@ -67,7 +67,16 @@
<if test="dto.state != null and dto.state !=''">
hjc.state = #{dto.state}
</if>
<if test="dto.stationName != null and dto.stationName !=''">
AND hjc.station_name like concat('%',#{dto.stationName},'%')
</if>
</where>
ORDER BY CASE
WHEN hjc.state = '报警' THEN 1
WHEN hjc.state = '离线' THEN 2
WHEN hjc.state = '在线' THEN 3
ELSE 4
END
limit #{current},#{size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml
View file @ eebd96e6
......@@ -50,9 +50,9 @@
hjc.collector_sn_code,
hjc.update_time,
hjc.current_power,
ROUND(hjc.day_power_generation,3) as dayPowerGeneration,
ROUND(hjc.month_power_generation,3) as monthPowerGeneration,
ROUND(hjc.year_power_generation,3) as yearPowerGeneration,
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,
hjc.brand,
hjc.model,
hjc.national_standard,
......@@ -64,7 +64,7 @@
hjc.AFCI_version,
hjc.ID,
hjc.capacity,
ROUND(hjc.total_power_generation/1000,3) as totalPowerGeneration,
CAST(hjc.total_power_generation/1000 AS DECIMAL(20, 3)) as totalPowerGeneration,
hjc.third_station_id,
hjc.is_delete,
hjc.third_code,
......@@ -89,7 +89,16 @@
<if test="dto.maxValue != null and dto.maxValue !=''">
AND hjc.capacity <![CDATA[<=]]> #{dto.maxValue}
</if>
<if test="dto.stationName != null and dto.stationName !=''">
AND hjc.station_name like concat('%',#{dto.stationName},'%')
</if>
</where>
ORDER BY CASE
WHEN hjc.state = '报警' THEN 1
WHEN hjc.state = '离线' THEN 2
WHEN hjc.state = '在线' THEN 3
ELSE 4
END
limit #{current},#{size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ eebd96e6
......@@ -33,13 +33,13 @@
`day_power_use` dayPowerUse,
`month_power_use` monthPowerUse,
`year_power_use` yearPowerUse,
ROUND(`real_time_power`,3) realTimePower,
ROUND(`accumulated_power`/1000,3) accumulatedPower,
CAST(`real_time_power` AS DECIMAL(20, 3)) realTimePower,
CAST(`accumulated_power`/1000 AS DECIMAL(20, 3)) accumulatedPower,
`state` ,
`type`,
`organizational_code` organizationalCode,
`is_delete` isDelete,
ROUND(`day_generate`,3) dayGenerate,
CAST(`day_generate` AS DECIMAL(20, 3)) dayGenerate,
`month_generate` monthGenerate,
`year_generate` yearGenerate,
`day_income` dayIncome,
......@@ -48,7 +48,8 @@
`area` ,
`cumulative_income` cumulativeIncome,
`email`,
rated_power ratedPower
rated_power ratedPower,
regional_companies_code
from hygf_jp_station
......@@ -80,6 +81,9 @@
<if test="dto.thirdStationId!=null">
and hygf_jp_station.third_station_id =#{dto.thirdStationId}
</if>
<if test="dto.regionalCompaniesCode!=null and dto.regionalCompaniesCode != ''">
and hygf_jp_station.regional_companies_code = #{dto.regionalCompaniesCode}
</if>
</where>
</select>
......@@ -89,20 +93,20 @@
select
ROUND(sum(real_time_power),3) realTimePower,
ROUND(sum(capacity)/1000,3) capacity,
ROUND(sum(day_generate)/1000,3) dayGenerate,
ROUND(sum(month_generate)/1000,3) monthGenerate,
ROUND(sum(year_generate)/1000,3) yearGenerate,
ROUND(sum(accumulated_power)/1000,3) accumulatedPower,
ROUND( sum(day_income),3) dayIncome,
ROUND(sum(month_income)/10000,3) monthIncome,
ROUND(sum(year_income)/10000,3) yearIncome,
ROUND(sum(cumulative_income)/10000,3) cumulativeIncome,
ROUND(sum(day_power_use)/1000,3) dayPowerUse,
ROUND(sum(month_power_use)/1000,3) monthPowerUse,
ROUND(sum(year_power_use)/1000,3) yearPowerUse,
ROUND(sum(rated_power),3) ratedPower,
CAST(sum(real_time_power) AS DECIMAL(20, 3)) realTimePower,
CAST(sum(capacity)/1000 AS DECIMAL(20, 3)) capacity,
CAST(sum(day_generate)/1000 AS DECIMAL(20, 3)) dayGenerate,
CAST(sum(month_generate)/1000 AS DECIMAL(20, 3)) monthGenerate,
CAST(sum(year_generate)/1000 AS DECIMAL(20, 3)) yearGenerate,
CAST(sum(accumulated_power)/1000 AS DECIMAL(20, 3)) accumulatedPower,
CAST( sum(day_income) AS DECIMAL(20, 3)) dayIncome,
CAST(sum(month_income)/10000 AS DECIMAL(20, 3)) monthIncome,
CAST(sum(year_income)/10000 AS DECIMAL(20, 3)) yearIncome,
CAST(sum(cumulative_income)/10000 AS DECIMAL(20, 3)) cumulativeIncome,
CAST(sum(day_power_use)/1000 AS DECIMAL(20, 3)) dayPowerUse,
CAST(sum(month_power_use)/1000 AS DECIMAL(20, 3)) monthPowerUse,
CAST(sum(year_power_use)/1000 AS DECIMAL(20, 3)) yearPowerUse,
CAST(sum(rated_power) AS DECIMAL(20, 3)) ratedPower,
count(*) countBuiltNum
from hygf_jp_station
<where>
......@@ -362,20 +366,20 @@
<select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
select
ROUND(sum(real_time_power),3) realTimePower,
ROUND(sum(capacity)/1000,3) capacity,
ROUND(sum(day_generate)/1000,3) dayGenerate,
ROUND(sum(month_generate)/1000,3) monthGenerate,
ROUND(sum(year_generate)/1000,3) yearGenerate,
ROUND(sum(accumulated_power)/1000,3) accumulatedPower,
ROUND( sum(day_income),3) dayIncome,
ROUND(sum(month_income)/10000,3) monthIncome,
ROUND(sum(year_income)/10000,3) yearIncome,
ROUND(sum(cumulative_income)/10000,3) cumulativeIncome,
ROUND(sum(day_power_use)/1000,3) dayPowerUse,
ROUND(sum(month_power_use)/1000,3) monthPowerUse,
ROUND(sum(year_power_use)/1000,3) yearPowerUse,
ROUND(sum(rated_power),3) ratedPower,
CAST(sum(real_time_power) AS DECIMAL(20, 3)) realTimePower,
CAST(sum(capacity)/1000 AS DECIMAL(20, 3)) capacity,
CAST(sum(day_generate)/1000 AS DECIMAL(20, 3)) dayGenerate,
CAST(sum(month_generate)/1000 AS DECIMAL(20, 3)) monthGenerate,
CAST(sum(year_generate)/1000 AS DECIMAL(20, 3)) yearGenerate,
CAST(sum(accumulated_power)/1000 AS DECIMAL(20, 3)) accumulatedPower,
CAST( sum(day_income) AS DECIMAL(20, 3)) dayIncome,
CAST(sum(month_income)/10000 AS DECIMAL(20, 3)) monthIncome,
CAST(sum(year_income)/10000 AS DECIMAL(20, 3)) yearIncome,
CAST(sum(cumulative_income)/10000 AS DECIMAL(20, 3)) cumulativeIncome,
CAST(sum(day_power_use)/1000 AS DECIMAL(20, 3)) dayPowerUse,
CAST(sum(month_power_use)/1000 AS DECIMAL(20, 3)) monthPowerUse,
CAST(sum(year_power_use)/1000 AS DECIMAL(20, 3)) yearPowerUse,
CAST(sum(rated_power) AS DECIMAL(20, 3)) ratedPower,
count(*) countBuiltNum
from hygf_jp_station
<where>
......@@ -626,7 +630,7 @@
`rec_user_id` recUserId,
`rec_user_name` recUserName,
`sn_code` snCode,
ROUND(`capacity`,3) capacity,
CAST(`capacity` AS DECIMAL(20, 3)) capacity,
`name` ,
`code` ,
`system_code` systemCode,
......@@ -648,15 +652,15 @@
`day_power_use` dayPowerUse,
`month_power_use` monthPowerUse,
`year_power_use` yearPowerUse,
ROUND(`real_time_power`,3) realTimePower,
ROUND(`accumulated_power`/1000,3) accumulatedPower,
CAST(`real_time_power` AS DECIMAL(20, 3)) realTimePower,
CAST(`accumulated_power`/1000 AS DECIMAL(20, 3)) accumulatedPower,
`state` ,
`type`,
`organizational_code` organizationalCode,
`is_delete` isDelete,
ROUND(`day_generate`,3) dayGenerate,
ROUND(`month_generate`,3) monthGenerate,
ROUND(`year_generate`,3) yearGenerate,
CAST(`day_generate` AS DECIMAL(20, 3)) dayGenerate,
CAST(`month_generate` AS DECIMAL(20, 3)) monthGenerate,
CAST(`year_generate` AS DECIMAL(20, 3)) yearGenerate,
`day_income` dayIncome,
`month_income` monthIncome,
`year_income` yearIncome,
......@@ -664,7 +668,7 @@
`cumulative_income` cumulativeIncome,
`email`,
rated_power ratedPower,
ROUND(`day_generate`/capacity,3) fullhour,
CAST(`day_generate`/capacity AS DECIMAL(20, 3)) fullhour,
(select privilege_company.COMPANY_NAME from privilege_company where
privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code) regionalCompaniesName
from hygf_jp_station
......@@ -703,7 +707,12 @@
and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
</if>
</where>
ORDER BY CASE
WHEN state = '报警' THEN 1
WHEN state = '离线' THEN 2
WHEN state = '在线' THEN 3
ELSE 4
END
</select>
......@@ -724,11 +733,11 @@
<!-- code参数为区域公司orgCode或经销商orgCode-->
<!-- <select id="getRegionStatistics" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">-->
<!-- SELECT COUNT(*) AS powerStationNumber,-->
<!-- ROUND(SUM(capacity)/1000, 3) AS totalCapacity,-->
<!-- ROUND(SUM(day_generate)/1000, 3) AS totalDayGenerate,-->
<!-- ROUND(SUM(rated_power), 3) AS totalRatedPower,-->
<!-- ROUND(SUM(real_time_power), 3) AS totalRealTimePower,-->
<!-- ROUND(SUM(day_income), 3) AS totalDayIncome-->
<!-- CAST(SUM(capacity)/1000, 3) AS totalCapacity,-->
<!-- CAST(SUM(day_generate)/1000, 3) AS totalDayGenerate,-->
<!-- CAST(SUM(rated_power), 3) AS totalRatedPower,-->
<!-- CAST(SUM(real_time_power), 3) AS totalRealTimePower,-->
<!-- CAST(SUM(day_income), 3) AS totalDayIncome-->
<!-- FROM hygf_jp_station hjs-->
<!-- <where>-->
<!-- <if test="regionCode != null and regionCode !=''">-->
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/DayGenerateMapper.xml
View file @ eebd96e6
......@@ -148,10 +148,19 @@
<if test="dateTime!=null and dateTime != ''">
and day_time = #{dateTime}
</if>
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode}
</if>
<if test="stationState!=null and stationState != ''">
and station_state = #{stationState}
</if>
</where>
ORDER BY CASE
WHEN station_state = '报警' THEN 1
WHEN station_state = '离线' THEN 2
WHEN station_state = '在线' THEN 3
ELSE 4
END
LIMIT #{current} ,#{size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/MonthGenerateMapper.xml
View file @ eebd96e6
......@@ -15,6 +15,9 @@
<if test="dateTime!=null and dateTime != ''">
and month_time = #{dateTime}
</if>
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode}
</if>
<if test="stationState!=null and stationState != ''">
and station_state = #{stationState}
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHYGFInverterDayGenerateMapper.xml
View file @ eebd96e6
......@@ -80,6 +80,9 @@
<if test="endTime != null">
and created_time &lt;= #{endTime}
</if>
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode}
</if>
</where>
order by created_time desc
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
View file @ eebd96e6
......@@ -132,7 +132,13 @@
AND station_name like #{stationName}
</if>
</where>
ORDER BY start_time desc
ORDER BY CASE
WHEN `state` = '未处理' THEN 1
WHEN `state` = '未恢复' THEN 2
WHEN `state` = '已处理' THEN 3
WHEN `state` = '已恢复' THEN 4
ELSE 5
END,start_time desc
limit #{current},#{size}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/YearGenerateMapper.xml
View file @ eebd96e6
......@@ -15,6 +15,9 @@
<if test="dateTime!=null and dateTime != ''">
and year = #{dateTime}
</if>
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode}
</if>
<if test="stationState!=null and stationState != ''">
and station_state = #{stationState}
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java
View file @ eebd96e6
......@@ -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));
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterDayReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -288,7 +288,7 @@ public class JpInverterController extends BaseController {
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
}
//List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates =jpInverterServiceImpl.jpInverterDayReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates =jpInverterServiceImpl.jpInverterDayReportExport(dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode());
try {
setResponseHeadForDowload(response,"逆变器日报表.xls");
EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterDayGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器日报表").doWrite(tdHYGFInverterDayGenerates);
......@@ -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));
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterMonthReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -322,7 +322,7 @@ public class JpInverterController extends BaseController {
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM"));
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates =jpInverterServiceImpl.jpInverterMonthReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates =jpInverterServiceImpl.jpInverterMonthReportExport(dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode());
try {
setResponseHeadForDowload(response,"逆变器月报表.xls");
EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterMonthGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器月报表").doWrite(tdHYGFInverterMonthGenerates);
......@@ -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));
return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterYearReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode()));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -357,7 +357,7 @@ public class JpInverterController extends BaseController {
dataDto.setTime(DateUtil.format(new Date(),"yyyy"));
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates =jpInverterServiceImpl.jpInverterYearReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates =jpInverterServiceImpl.jpInverterYearReportExport(dataDto.getTime(),dataDto.getSnCodes(),null,dataDto.getRegionalCompaniesCode());
try {
setResponseHeadForDowload(response,"逆变器年报表.xls");
EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterYearGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器年报表").doWrite(tdHYGFInverterYearGenerates);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java
View file @ eebd96e6
......@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDtoNew;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpInverterMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IJpInverterService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHYGFInverterDayGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHYGFInverterMonthGenerateMapper;
......@@ -50,6 +51,8 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
@Autowired
JpInverterMapper jpInverterMapper;
@Autowired
RegionalCompaniesMapper regionalCompaniesMapper;
/**
* 分页查询
......@@ -132,9 +135,23 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
map.put("zData",zData);
return map;
}
/**
* 获取区域公司Map
* @return
*/
private Map<String, String> getRegionalCompaniesNameMap() {
Map<String, String> map = new HashMap<>();
List<RegionalCompanies> regionalCompanies = regionalCompaniesMapper.selectList(null);
if(CollectionUtil.isNotEmpty(regionalCompanies)){
for (RegionalCompanies regionalCompany : regionalCompanies) {
map.put(regionalCompany.getRegionalCompaniesCode(),regionalCompany.getRegionalCompaniesName());
}
}
return map;
}
@UserLimits
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,String regionalCompaniesCode) {
Page<TdHYGFInverterDayGenerate> tdHYGFInverterDayGeneratePage = new Page<>();
// Date date = DateUtil.parse(time, "yyyy-MM-dd");
// Date timeStart = DateUtils.dateAddHours(date, -8);
......@@ -177,14 +194,15 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
maxCreatedTimeList.add(sdf.format(item.get("max_created_time")));
}
});
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
PageHelper.startPage(current, size);
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectListPage(snCodeList, null, startTime, endTime);
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectListPage(snCodeList, null, startTime, endTime,regionalCompaniesCode);
tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
tdHYGFInverterDayGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterDayGenerate.getRegionalCompaniesCode()));
});
PageInfo<TdHYGFInverterDayGenerate> page = new PageInfo(tdHYGFInverterDayGenerates);
......@@ -221,7 +239,8 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
// return tdHYGFInverterDayGeneratePage;
}
@UserLimits
public List<TdHYGFInverterDayGenerate> jpInverterDayReportExport(String time, List<String> sncodes, List<String> stationIds) {
public List<TdHYGFInverterDayGenerate> jpInverterDayReportExport(String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
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";
......@@ -232,18 +251,19 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("created_time");
List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectList(queryWrapper);
tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
tdHYGFInverterDayGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterDayGenerate.getRegionalCompaniesCode()));
});
return tdHYGFInverterDayGenerates;
}
@UserLimits
public Page<TdHYGFInverterMonthGenerate> jpInverterMonthReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
public Page<TdHYGFInverterMonthGenerate> jpInverterMonthReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode ) {
Page<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGeneratePage = new Page<>();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>()
.eq("year_month", time);
......@@ -251,13 +271,18 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.orderByDesc("day_time");
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);
tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour())):null));
tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> {
tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour() != null ? Double.valueOf(String.format("%.2f", tdHYGFInverterMonthGenerate.getFullhour())) : null);
tdHYGFInverterMonthGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterMonthGenerate.getRegionalCompaniesCode()));
});
PageInfo<TdHYGFInverterMonthGenerate> page = new PageInfo(tdHYGFInverterMonthGenerates);
Page<TdHYGFInverterMonthGenerate> pagenew = new Page<TdHYGFInverterMonthGenerate>();
......@@ -286,20 +311,25 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
//// return tdHYGFInverterMonthGeneratePage;
}
@UserLimits
public List<TdHYGFInverterMonthGenerate> jpInverterMonthReportExport( String time, List<String> sncodes, List<String> stationIds) {
public List<TdHYGFInverterMonthGenerate> jpInverterMonthReportExport( String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>()
.eq("year_month", time);
// .in("third_station_id", stationIds);
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("day_time");
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper);
tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour())):null));
tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> {
tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour())):null);
tdHYGFInverterMonthGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterMonthGenerate.getRegionalCompaniesCode()));
});
return tdHYGFInverterMonthGenerates;
}
@UserLimits
public Page<TdHYGFInverterYearGenerate> jpInverterYearReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
public Page<TdHYGFInverterYearGenerate> jpInverterYearReport(int current, int size, String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Page<TdHYGFInverterYearGenerate> tdHYGFInverterYearGeneratePage = new Page<>();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>()
.eq("year", time);
......@@ -307,14 +337,18 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("month_time");
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
PageHelper.startPage(current, size);
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerateMapper.selectList(queryWrapper);
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null));
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setGenerate(tdHYGFInverterYearGenerate.getGenerate()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getGenerate())):null));
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> {
tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null);
tdHYGFInverterYearGenerate.setGenerate(tdHYGFInverterYearGenerate.getGenerate()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getGenerate())):null);
tdHYGFInverterYearGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterYearGenerate.getRegionalCompaniesCode()));
});
PageInfo<TdHYGFInverterYearGenerate> page = new PageInfo(tdHYGFInverterYearGenerates);
Page<TdHYGFInverterYearGenerate> pagenew = new Page<TdHYGFInverterYearGenerate>();
......@@ -340,16 +374,21 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
// return tdHYGFInverterYearGeneratePage;
}
@UserLimits
public List<TdHYGFInverterYearGenerate> jpInverterYearReportExport(String time, List<String> sncodes, List<String> stationIds) {
public List<TdHYGFInverterYearGenerate> jpInverterYearReportExport(String time, List<String> sncodes, List<String> stationIds,String regionalCompaniesCode) {
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>()
.eq("year", time);
// .in("third_station_id", stationIds);
if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes);
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("month_time");
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerateMapper.selectList(queryWrapper);
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null));
tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> {
tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null);
tdHYGFInverterYearGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterYearGenerate.getRegionalCompaniesCode()));
});
return tdHYGFInverterYearGenerates;
}
public List<Map<String, String>> getInverterSncodes(List<String> stationIds) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @ eebd96e6
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapBuilder;
import com.alibaba.excel.EasyExcel;
......@@ -15,6 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpCollectorMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpInverterMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IJpStationService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper;
......@@ -64,6 +66,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
MonthGenerateMapper monthGenerateMapper;
@Autowired
YearGenerateMapper yearGenerateMapper;
@Autowired
RegionalCompaniesMapper regionalCompaniesMapper;
private static double FDL = 0.001;
private static int FD = 1000;
......@@ -427,10 +431,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
wapper.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),DayGenerate::getDayTime,reviewDto.getTimeDate());
wapper.eq(!StringUtils.isEmpty(reviewDto.getState()),DayGenerate::getStationState,reviewDto.getState());
wapper.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),DayGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
//拦截拼接权限
count= dayGenerateMapper.selectCount(wapper);
//拦截拼接权限
List<DayGenerate> listday= dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
List<DayGenerate> listday= dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState(),reviewDto.getRegionalCompaniesCode());
list = getJpStationDtoday( dataJpStation, listday);
break;
case"month":
......@@ -440,10 +446,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
wapper1.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),MonthGenerate::getMonthTime,reviewDto.getTimeDate());
wapper1.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),MonthGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
//拦截拼接权限
count= monthGenerateMapper.selectCount(wapper1);
//拦截拼接权限
List<MonthGenerate> listmonth= monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
List<MonthGenerate> listmonth= monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState(),reviewDto.getRegionalCompaniesCode());
list = getJpStationDtomonth( dataJpStation, listmonth);
break;
......@@ -454,10 +461,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
wapper2.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),YearGenerate::getYear,reviewDto.getTimeDate());
wapper2.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),YearGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
//拦截拼接权限
count= yearGenerateMapper.selectCount(wapper2);
//拦截拼接权限
List<YearGenerate> listyear= yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
List<YearGenerate> listyear= yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState(),reviewDto.getRegionalCompaniesCode());
list = getJpStationDtoyear(dataJpStation, listyear);
break;
......@@ -579,6 +587,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoAlldto( List<JpStationDto> da){
List<JpStationDto> ld=new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (JpStationDto jpStation : da) {
JpStationDto hd=new JpStationDto();
hd.setSequenceNbr(jpStation.getSequenceNbr());
......@@ -591,6 +600,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setAccumulatedPower(jpStation.getAccumulatedPower()!=null?Double.valueOf(String.format("%.3f",jpStation.getAccumulatedPower())):null);
hd.setFullhour(Double.valueOf(String.format("%.3f", jpStation.getAccumulatedPower()*FD/jpStation.getCapacity())));
hd.setCumulativeIncome(jpStation.getCumulativeIncome()!=null?Double.valueOf(String.format("%.3f",jpStation.getCumulativeIncome())):null);
hd.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(jpStation.getRegionalCompaniesCode()));
ld.add(hd);
}
......@@ -600,7 +611,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoAll(List<JpStation> da) {
List<JpStationDto> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (JpStation jpStation : da) {
JpStationDto hd = new JpStationDto();
hd.setSequenceNbr(jpStation.getSequenceNbr());
......@@ -613,6 +624,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setFullhour(Double.valueOf(String.format("%.3f", jpStation.getAccumulatedPower() / jpStation.getCapacity())));
hd.setCumulativeIncome(jpStation.getCumulativeIncome() != null ? Double.valueOf(String.format("%.3f", jpStation.getCumulativeIncome())) : null);
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(jpStation.getRegionalCompaniesCode()));
ld.add(hd);
}
......@@ -621,6 +633,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoday(List<JpStation> da, List<DayGenerate> listday) {
List<JpStationDto> ld = new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (DayGenerate dayGenerate : listday) {
JpStationDto hd = new JpStationDto();
for (JpStation jpStation : da) {
......@@ -637,6 +650,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setDayGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setTimeDate(dayGenerate.getDayTime());
hd.setDayIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setRegionalCompaniesCode(dayGenerate.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -645,8 +660,24 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
return ld;
}
/**
* 获取区域公司Map
* @return
*/
private Map<String, String> getRegionalCompaniesNameMap() {
Map<String, String> map = new HashMap<>();
List<RegionalCompanies> regionalCompanies = regionalCompaniesMapper.selectList(null);
if(CollectionUtil.isNotEmpty(regionalCompanies)){
for (RegionalCompanies regionalCompany : regionalCompanies) {
map.put(regionalCompany.getRegionalCompaniesCode(),regionalCompany.getRegionalCompaniesName());
}
}
return map;
}
public List<JpStationDto> getJpStationDtomonth(List<JpStation> da, List<MonthGenerate> listmonth) {
List<JpStationDto> ld = new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (MonthGenerate dayGenerate : listmonth) {
JpStationDto hd = new JpStationDto();
for (JpStation jpStation : da) {
......@@ -663,6 +694,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setMonthIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setTimeDate(dayGenerate.getMonthTime());
hd.setFullhour(dayGenerate.getFullhour() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getFullhour())) : null);
hd.setRegionalCompaniesCode(dayGenerate.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -673,6 +706,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<JpStationDto> getJpStationDtoyear(List<JpStation> da, List<YearGenerate> listyear) {
List<JpStationDto> ld = new ArrayList<>();
Map<String,String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (YearGenerate dayGenerate : listyear) {
JpStationDto hd = new JpStationDto();
for (JpStation jpStation : da) {
......@@ -690,6 +724,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setYearGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setYearIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setTimeDate(dayGenerate.getYearTime());
hd.setRegionalCompaniesCode(dayGenerate.getRegionalCompaniesCode());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -719,6 +755,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
wapper.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),DayGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), DayGenerate::getDayTime, reviewDto.getTimeDate());
wapper.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), DayGenerate::getStationState, reviewDto.getState());
wapper.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),DayGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
List<DayGenerate> listday = dayGenerateMapper.selectList(wapper);
List<DayGenerateEX> listne = getJpStationDtodaynew(dataJpStation, listday);
......@@ -732,7 +769,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
wapper1.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), MonthGenerate::getMonthTime, reviewDto.getTimeDate());
wapper1.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), MonthGenerate::getStationState, reviewDto.getState());
wapper1.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),MonthGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
List<MonthGenerate> listmonth = monthGenerateMapper.selectList(wapper1);
List<MonthGenerateEX> lo = getJpStationDtomonthnew(dataJpStation, listmonth);
setResponseHeadForDowload(response, "电站月报表.xls");
......@@ -745,7 +782,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
wapper2.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),YearGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), YearGenerate::getYear, reviewDto.getTimeDate());
wapper2.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), YearGenerate::getStationState, reviewDto.getState());
wapper2.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),YearGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
List<YearGenerate> listyear = yearGenerateMapper.selectList(wapper2);
List<YearGenerateEX> listy = getJpStationDtoyearnew(dataJpStation, listyear);
setResponseHeadForDowload(response, "电站年报表.xls");
......@@ -841,6 +878,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<DayGenerateEX> getJpStationDtodaynew( List<JpStation> da, List<DayGenerate> listday){
List<DayGenerateEX> ld=new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (DayGenerate dayGenerate : listday) {
DayGenerateEX hd = new DayGenerateEX();
for (JpStation jpStation : da) {
......@@ -856,6 +894,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setDayGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setTimeDate(dayGenerate.getDayTime());
hd.setDayIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -866,6 +905,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<MonthGenerateEX> getJpStationDtomonthnew(List<JpStation> da, List<MonthGenerate> listmonth) {
List<MonthGenerateEX> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (MonthGenerate dayGenerate : listmonth) {
MonthGenerateEX hd = new MonthGenerateEX();
for (JpStation jpStation : da) {
......@@ -879,6 +919,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setMonthIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setTimeDate(dayGenerate.getMonthTime());
hd.setFullhour(dayGenerate.getFullhour() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getFullhour())) : null);
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......@@ -889,6 +930,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
public List<YearGenerateEX> getJpStationDtoyearnew(List<JpStation> da, List<YearGenerate> listyear) {
List<YearGenerateEX> ld = new ArrayList<>();
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
for (YearGenerate dayGenerate : listyear) {
YearGenerateEX hd = new YearGenerateEX();
for (JpStation jpStation : da) {
......@@ -903,6 +945,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
hd.setYearGenerate(dayGenerate.getGenerate() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getGenerate())) : null);
hd.setYearIncome(dayGenerate.getIncome() != null ? Double.valueOf(String.format("%.3f", dayGenerate.getIncome())) : null);
hd.setTimeDate(dayGenerate.getYearTime());
hd.setRegionalCompaniesName(regionalCompaniesNameMap.get(dayGenerate.getRegionalCompaniesCode()));
break;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment