Skip to content

A
amos-boot-zx-biz
Commit 33365b60 authored by chenzhao's avatar chenzhao
Browse files
Options

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

parents 60d67a40 cfea1d1f
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 108 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 @ 33365b60
...@@ -12,6 +12,7 @@ import java.util.List; ...@@ -12,6 +12,7 @@ import java.util.List;
@Data @Data
public class DataDto { public class DataDto {
String time; String time;
String name;
List<String> snCodes; List<String> snCodes;
String regionalCompaniesCode; String regionalCompaniesCode;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java
View file @ 33365b60
...@@ -87,6 +87,9 @@ public class JpStationDto extends BaseDto { ...@@ -87,6 +87,9 @@ public class JpStationDto extends BaseDto {
@ExcelIgnore @ExcelIgnore
@ApiModelProperty(value = "第三方厂商标识") @ApiModelProperty(value = "第三方厂商标识")
private String thirdCode; 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
View file @ 33365b60
...@@ -72,7 +72,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> { ...@@ -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") @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); 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<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto);
List<DropDown> getDealerNew(@Param("regionalCompaniesSeq") String regionalCompaniesSeq); 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
View file @ 33365b60
...@@ -20,5 +20,5 @@ public interface TdHYGFInverterDayGenerateMapper extends BaseMapper<TdHYGFInvert ...@@ -20,5 +20,5 @@ public interface TdHYGFInverterDayGenerateMapper extends BaseMapper<TdHYGFInvert
List<Map<String,Object>> selectSnCodeList(String startTime, String endTime, List<String> sncodes); 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") @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
View file @ 33365b60
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
hjc.collector_sn_code, hjc.collector_sn_code,
hjc.update_time, hjc.update_time,
hjc.current_power, hjc.current_power,
CAST(hjc.day_power_generation AS DECIMAL(20, 3)) as dayPowerGeneration, CAST( (FLOOR(hjc.day_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as dayPowerGeneration,
CAST(hjc.month_power_generation AS DECIMAL(20, 3)) as monthPowerGeneration, CAST( (FLOOR(hjc.month_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as monthPowerGeneration,
CAST(hjc.year_power_generation AS DECIMAL(20, 3)) as yearPowerGeneration, CAST( (FLOOR(hjc.year_power_generation * 1000) / 1000) AS DECIMAL(20, 3)) as yearPowerGeneration,
hjc.brand, hjc.brand,
hjc.model, hjc.model,
hjc.national_standard, hjc.national_standard,
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
hjc.AFCI_version, hjc.AFCI_version,
hjc.ID, hjc.ID,
hjc.capacity, 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.third_station_id,
hjc.is_delete, hjc.is_delete,
hjc.third_code, hjc.third_code,
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ 33365b60
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
`day_power_use` dayPowerUse, `day_power_use` dayPowerUse,
`month_power_use` monthPowerUse, `month_power_use` monthPowerUse,
`year_power_use` yearPowerUse, `year_power_use` yearPowerUse,
CAST(`real_time_power` AS DECIMAL(20, 3)) realTimePower, CAST( (FLOOR(`real_time_power` * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
CAST(`accumulated_power`/1000 AS DECIMAL(20, 3)) accumulatedPower, CAST( (FLOOR(`accumulated_power`/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
`state` , `state` ,
`type`, `type`,
`organizational_code` organizationalCode, `organizational_code` organizationalCode,
`is_delete` isDelete, `is_delete` isDelete,
CAST(`day_generate` AS DECIMAL(20, 3)) dayGenerate, CAST( (FLOOR(`day_generate` * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
`month_generate` monthGenerate, `month_generate` monthGenerate,
`year_generate` yearGenerate, `year_generate` yearGenerate,
`day_income` dayIncome, `day_income` dayIncome,
...@@ -93,20 +93,20 @@ ...@@ -93,20 +93,20 @@
select select
CAST(sum(real_time_power) AS DECIMAL(20, 3)) realTimePower, CAST( (FLOOR(sum(real_time_power) * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
CAST(sum(capacity)/1000 AS DECIMAL(20, 3)) capacity, CAST( (FLOOR(sum(capacity)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
CAST(sum(day_generate)/1000 AS DECIMAL(20, 3)) dayGenerate, CAST( (FLOOR(sum(day_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
CAST(sum(month_generate)/1000 AS DECIMAL(20, 3)) monthGenerate, CAST( (FLOOR(sum(month_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
CAST(sum(year_generate)/1000 AS DECIMAL(20, 3)) yearGenerate, CAST( (FLOOR(sum(year_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
CAST(sum(accumulated_power)/1000 AS DECIMAL(20, 3)) accumulatedPower, CAST( (FLOOR(sum(accumulated_power)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
CAST( sum(day_income) AS DECIMAL(20, 3)) dayIncome, CAST( (FLOOR( sum(day_income) * 1000) / 1000) AS DECIMAL(20, 3)) dayIncome,
CAST(sum(month_income)/10000 AS DECIMAL(20, 3)) monthIncome, CAST( (FLOOR(sum(month_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) monthIncome,
CAST(sum(year_income)/10000 AS DECIMAL(20, 3)) yearIncome, CAST( (FLOOR(sum(year_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) yearIncome,
CAST(sum(cumulative_income)/10000 AS DECIMAL(20, 3)) cumulativeIncome, CAST( (FLOOR(sum(cumulative_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) cumulativeIncome,
CAST(sum(day_power_use)/1000 AS DECIMAL(20, 3)) dayPowerUse, CAST( (FLOOR(sum(day_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayPowerUse,
CAST(sum(month_power_use)/1000 AS DECIMAL(20, 3)) monthPowerUse, CAST( (FLOOR(sum(month_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthPowerUse,
CAST(sum(year_power_use)/1000 AS DECIMAL(20, 3)) yearPowerUse, CAST( (FLOOR(sum(year_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearPowerUse,
CAST(sum(rated_power) AS DECIMAL(20, 3)) ratedPower, CAST( (FLOOR(sum(rated_power) * 1000) / 1000) AS DECIMAL(20, 3)) ratedPower,
count(*) countBuiltNum count(*) countBuiltNum
from hygf_jp_station from hygf_jp_station
<where> <where>
...@@ -366,20 +366,20 @@ ...@@ -366,20 +366,20 @@
<select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto"> <select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
select select
CAST(sum(real_time_power) AS DECIMAL(20, 3)) realTimePower, CAST( (FLOOR(sum(real_time_power) * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
CAST(sum(capacity)/1000 AS DECIMAL(20, 3)) capacity, CAST( (FLOOR(sum(capacity)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
CAST(sum(day_generate)/1000 AS DECIMAL(20, 3)) dayGenerate, CAST( (FLOOR(sum(day_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
CAST(sum(month_generate)/1000 AS DECIMAL(20, 3)) monthGenerate, CAST( (FLOOR(sum(month_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
CAST(sum(year_generate)/1000 AS DECIMAL(20, 3)) yearGenerate, CAST( (FLOOR(sum(year_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
CAST(sum(accumulated_power)/1000 AS DECIMAL(20, 3)) accumulatedPower, CAST( (FLOOR(sum(accumulated_power)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
CAST( sum(day_income) AS DECIMAL(20, 3)) dayIncome, CAST( (FLOOR( sum(day_income) * 1000) / 1000) AS DECIMAL(20, 3)) dayIncome,
CAST(sum(month_income)/10000 AS DECIMAL(20, 3)) monthIncome, CAST( (FLOOR(sum(month_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) monthIncome,
CAST(sum(year_income)/10000 AS DECIMAL(20, 3)) yearIncome, CAST( (FLOOR(sum(year_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) yearIncome,
CAST(sum(cumulative_income)/10000 AS DECIMAL(20, 3)) cumulativeIncome, CAST( (FLOOR(sum(cumulative_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) cumulativeIncome,
CAST(sum(day_power_use)/1000 AS DECIMAL(20, 3)) dayPowerUse, CAST( (FLOOR(sum(day_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayPowerUse,
CAST(sum(month_power_use)/1000 AS DECIMAL(20, 3)) monthPowerUse, CAST( (FLOOR(sum(month_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthPowerUse,
CAST(sum(year_power_use)/1000 AS DECIMAL(20, 3)) yearPowerUse, CAST( (FLOOR(sum(year_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearPowerUse,
CAST(sum(rated_power) AS DECIMAL(20, 3)) ratedPower, CAST( (FLOOR(sum(rated_power) * 1000) / 1000) AS DECIMAL(20, 3)) ratedPower,
count(*) countBuiltNum count(*) countBuiltNum
from hygf_jp_station from hygf_jp_station
<where> <where>
...@@ -625,97 +625,110 @@ ...@@ -625,97 +625,110 @@
select select
`sequence_nbr` sequenceNbr, hjs.sequence_nbr sequenceNbr,
`rec_date` recDate, hjs.rec_date recDate,
`rec_user_id` recUserId, hjs.rec_user_id recUserId,
`rec_user_name` recUserName, hjs.rec_user_name recUserName,
`sn_code` snCode, hjs.regional_companies_code,
CAST(`capacity` AS DECIMAL(20, 3)) capacity, hjs.amos_company_code,
`name` , hjs.sn_code snCode,
`code` , CAST( (FLOOR(hjs.capacity * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
`system_code` systemCode, hjs.name ,
`access_time` accessTime, hjs.code ,
`create_time` createTime, hjs.system_code systemCode,
`address` , hjs.access_time accessTime,
`longitude` , hjs.create_time createTime,
`latitude` , hjs.address ,
`price` , hjs.longitude ,
`user_name` userName, hjs.latitude ,
`user_phone` userPhone, hjs.price ,
`station_contact` stationContact, hjs.user_name userName,
`module_count` moduleCount, hjs.user_phone userPhone,
`on_grid_type` onGridType, hjs.station_contact stationContact,
`on_grid_time` onGridTime, hjs.module_count moduleCount,
`third_station_id` thirdStationId, hjs.on_grid_type onGridType,
`third_code` thirdCode, hjs.on_grid_time onGridTime,
`station_id` stationId, hjs.third_station_id thirdStationId,
`day_power_use` dayPowerUse, hjs.third_code thirdCode,
`month_power_use` monthPowerUse, hjs.station_id stationId,
`year_power_use` yearPowerUse, hjs.day_power_use dayPowerUse,
CAST(`real_time_power` AS DECIMAL(20, 3)) realTimePower, hjs.month_power_use monthPowerUse,
CAST(`accumulated_power`/1000 AS DECIMAL(20, 3)) accumulatedPower, hjs.year_power_use yearPowerUse,
`state` , CAST( (FLOOR(hjs.real_time_power * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
`type`, CAST( (FLOOR(hjs.accumulated_power/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
`organizational_code` organizationalCode, hjs.state,
`is_delete` isDelete, hjs.type,
CAST(`day_generate` AS DECIMAL(20, 3)) dayGenerate, hjs.organizational_code organizationalCode,
CAST(`month_generate` AS DECIMAL(20, 3)) monthGenerate, hjs.is_delete isDelete,
CAST(`year_generate` AS DECIMAL(20, 3)) yearGenerate, CAST( (FLOOR(hjs.day_generate * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
`day_income` dayIncome, CAST( (FLOOR(hjs.month_generate * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
`month_income` monthIncome, CAST( (FLOOR(hjs.year_generate * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
`year_income` yearIncome, hjs.day_income dayIncome,
`area` , hjs.month_income monthIncome,
`cumulative_income` cumulativeIncome, hjs.year_income yearIncome,
`email`, hjs.area ,
rated_power ratedPower, hjs.cumulative_income cumulativeIncome,
CAST(`day_generate`/capacity AS DECIMAL(20, 3)) fullhour, hjs.email,
hjs.rated_power ratedPower,
CAST( (FLOOR(hjs.day_generate/hjs.capacity * 1000) / 1000) AS DECIMAL(20, 3)) fullhour,
(select privilege_company.COMPANY_NAME from privilege_company where (select privilege_company.COMPANY_NAME from privilege_company where
privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code) regionalCompaniesName privilege_company.ORG_CODE=hjs.regional_companies_code) regionalCompaniesName,
from hygf_jp_station lc.nbqSnCode
from hygf_jp_station hjs
INNER join
(
select MAX(hjs.sequence_nbr) AS sequence_nbr,group_concat(hji.sn_code) AS nbqSnCode from hygf_jp_station hjs left join hygf_jp_inverter hji on hjs.third_station_id = hji.third_station_id
group by hjs.third_station_id
) lc
on hjs.sequence_nbr = lc.sequence_nbr
<where> <where>
<if test="dto.name!=null"> <if test="dto.name!=null">
and hygf_jp_station.name like concat(concat('%',#{dto.name}),'%') and hjs.name like concat(concat('%',#{dto.name}),'%')
</if> </if>
<if test="dto.userName!=null"> <if test="dto.userName!=null">
and hygf_jp_station.user_name like concat(concat('%',#{dto.userName}),'%') and hjs.user_name like concat(concat('%',#{dto.userName}),'%')
</if> </if>
<if test="dto.address!=null"> <if test="dto.address!=null">
and hygf_jp_station.address like concat(concat('%',#{dto.address}),'%') and hjs.address like concat(concat('%',#{dto.address}),'%')
</if> </if>
<if test="dto.area!=null"> <if test="dto.area!=null">
and hygf_jp_station.area like concat(concat('%',#{dto.area}),'%') and hjs.area like concat(concat('%',#{dto.area}),'%')
</if> </if>
<if test="dto.statioId!=null"> <if test="dto.statioId!=null">
and hygf_jp_station.third_station_id in and hjs.third_station_id in
<foreach collection="dto.statioId" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto.statioId" item="item" index="index" open="(" separator="," close=")">
#{item.stationId} #{item.stationId}
</foreach> </foreach>
</if> </if>
<if test="dto.thirdStationId!=null"> <if test="dto.thirdStationId!=null">
and hygf_jp_station.third_station_id =#{dto.thirdStationId} and hjs.third_station_id =#{dto.thirdStationId}
</if> </if>
<if test="dto.type!=null and dto.type!=''"> <if test="dto.type!=null and dto.type!=''">
and hygf_jp_station.type =#{dto.type} and hjs.type =#{dto.type}
</if> </if>
<if test="dto.regionalCompaniesCode!=null"> <if test="dto.regionalCompaniesCode!=null">
and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode} and hjs.regional_companies_code =#{dto.regionalCompaniesCode}
</if> </if>
<if test="dto.state!=null"> <if test="dto.state!=null">
and hygf_jp_station.state =#{dto.state} and hjs.state =#{dto.state}
</if> </if>
<if test="dto.amosCompanyCode!=null"> <if test="dto.amosCompanyCode!=null">
and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode} and hjs.amos_company_code =#{dto.amosCompanyCode}
</if>
<if test="dto.nbqSnCode!=null">
and lc.nbqSnCode like concat('%',#{dto.nbqSnCode},'%')
</if> </if>
</where> </where>
ORDER BY CASE ORDER BY CASE
WHEN state = '报警' THEN 1 WHEN hjs.state = '报警' THEN 1
WHEN state = '离线' THEN 2 WHEN hjs.state = '离线' THEN 2
WHEN state = '在线' THEN 3 WHEN hjs.state = '在线' THEN 3
ELSE 4 ELSE 4
END END
</select> </select>
<!-- ========电站监控区域=======--> <!-- ========电站监控区域=======-->
<!-- <select id="getRegionPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">--> <!-- <select id="getRegionPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">-->
...@@ -733,11 +746,11 @@ ...@@ -733,11 +746,11 @@
<!-- code参数为区域公司orgCode或经销商orgCode--> <!-- code参数为区域公司orgCode或经销商orgCode-->
<!-- <select id="getRegionStatistics" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">--> <!-- <select id="getRegionStatistics" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">-->
<!-- SELECT COUNT(*) AS powerStationNumber,--> <!-- SELECT COUNT(*) AS powerStationNumber,-->
<!-- CAST(SUM(capacity)/1000, 3) AS totalCapacity,--> <!-- CAST( (FLOOR(SUM(capacity)/1000, 3) AS totalCapacity,-->
<!-- CAST(SUM(day_generate)/1000, 3) AS totalDayGenerate,--> <!-- CAST( (FLOOR(SUM(day_generate)/1000, 3) AS totalDayGenerate,-->
<!-- CAST(SUM(rated_power), 3) AS totalRatedPower,--> <!-- CAST( (FLOOR(SUM(rated_power), 3) AS totalRatedPower,-->
<!-- CAST(SUM(real_time_power), 3) AS totalRealTimePower,--> <!-- CAST( (FLOOR(SUM(real_time_power), 3) AS totalRealTimePower,-->
<!-- CAST(SUM(day_income), 3) AS totalDayIncome--> <!-- CAST( (FLOOR(SUM(day_income), 3) AS totalDayIncome-->
<!-- FROM hygf_jp_station hjs--> <!-- FROM hygf_jp_station hjs-->
<!-- <where>--> <!-- <where>-->
<!-- <if test="regionCode != null and regionCode !=''">--> <!-- <if test="regionCode != null and regionCode !=''">-->
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHYGFInverterDayGenerateMapper.xml
View file @ 33365b60
...@@ -83,6 +83,9 @@ ...@@ -83,6 +83,9 @@
<if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''"> <if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
and regional_companies_code = #{regionalCompaniesCode} and regional_companies_code = #{regionalCompaniesCode}
</if> </if>
<if test="name !=null and name != ''">
and name LIKE #{name}
</if>
</where> </where>
order by created_time desc order by created_time desc
</select> </select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java
View file @ 33365b60
...@@ -275,7 +275,7 @@ public class JpInverterController extends BaseController { ...@@ -275,7 +275,7 @@ public class JpInverterController extends BaseController {
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null; // 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) @TycloudOperation(ApiLevel = UserType.AGENCY)
...@@ -309,7 +309,7 @@ public class JpInverterController extends BaseController { ...@@ -309,7 +309,7 @@ public class JpInverterController extends BaseController {
} }
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null; // 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) @TycloudOperation(ApiLevel = UserType.AGENCY)
...@@ -344,7 +344,7 @@ public class JpInverterController extends BaseController { ...@@ -344,7 +344,7 @@ public class JpInverterController extends BaseController {
} }
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null; // 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) @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
View file @ 33365b60
...@@ -151,7 +151,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -151,7 +151,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
} }
@UserLimits @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<>(); Page<TdHYGFInverterDayGenerate> tdHYGFInverterDayGeneratePage = new Page<>();
// Date date = DateUtil.parse(time, "yyyy-MM-dd"); // Date date = DateUtil.parse(time, "yyyy-MM-dd");
// Date timeStart = DateUtils.dateAddHours(date, -8); // Date timeStart = DateUtils.dateAddHours(date, -8);
...@@ -194,9 +194,16 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -194,9 +194,16 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
maxCreatedTimeList.add(sdf.format(item.get("max_created_time"))); maxCreatedTimeList.add(sdf.format(item.get("max_created_time")));
} }
}); });
if(StringUtils.isNotEmpty(name)) {
name = '%' + name + "%";
}
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap(); Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
PageHelper.startPage(current, size); 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 -> { tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime()); Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
...@@ -263,19 +270,25 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -263,19 +270,25 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
return tdHYGFInverterDayGenerates; return tdHYGFInverterDayGenerates;
} }
@UserLimits @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<>(); Page<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGeneratePage = new Page<>();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>() QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>()
.eq("year_month", time); .eq("year_month", time);
// .in("third_station_id", stationIds); // .in("third_station_id", stationIds);
if (CollectionUtil.isNotEmpty(sncodes)) { if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes); queryWrapper.in("sn_code", sncodes);
} }
if (StringUtils.isNotEmpty(name)) {
queryWrapper.like("name", "%" + name + "%");
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode); queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("day_time"); queryWrapper.orderByDesc("day_time");
Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap(); Map<String, String> regionalCompaniesNameMap = getRegionalCompaniesNameMap();
PageHelper.startPage(current, size); PageHelper.startPage(current, size);
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper); List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper);
...@@ -329,7 +342,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -329,7 +342,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
return tdHYGFInverterMonthGenerates; return tdHYGFInverterMonthGenerates;
} }
@UserLimits @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<>(); Page<TdHYGFInverterYearGenerate> tdHYGFInverterYearGeneratePage = new Page<>();
QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>() QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>()
.eq("year", time); .eq("year", time);
...@@ -337,6 +350,9 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -337,6 +350,9 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
if (CollectionUtil.isNotEmpty(sncodes)) { if (CollectionUtil.isNotEmpty(sncodes)) {
queryWrapper.in("sn_code", sncodes); queryWrapper.in("sn_code", sncodes);
} }
if (StringUtils.isNotEmpty(name)) {
queryWrapper.like("name", "%" + name + "%");
}
queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode); queryWrapper.eq(!StringUtils.isEmpty(regionalCompaniesCode),"regional_companies_code",regionalCompaniesCode);
queryWrapper.orderByDesc("month_time"); queryWrapper.orderByDesc("month_time");
......
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