Skip to content

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

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

parents 17d6fa05 8a28d4fd
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml
View file @ 28a3dcc9
......@@ -50,9 +50,9 @@
hjc.collector_sn_code,
hjc.update_time,
hjc.current_power,
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,
ROUND(hjc.day_power_generation ,3) as dayPowerGeneration,
ROUND(hjc.month_power_generation ,3) as monthPowerGeneration,
ROUND(hjc.year_power_generation ,3) as yearPowerGeneration,
hjc.brand,
hjc.model,
hjc.national_standard,
......@@ -64,7 +64,7 @@
hjc.AFCI_version,
hjc.ID,
hjc.capacity,
CAST( (FLOOR(hjc.total_power_generation/1000 * 1000) / 1000) AS DECIMAL(20, 3)) as totalPowerGeneration,
ROUND(hjc.total_power_generation/1000 ,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/mysql/JpStationMapper.xml
View file @ 28a3dcc9
......@@ -33,13 +33,13 @@
`day_power_use` dayPowerUse,
`month_power_use` monthPowerUse,
`year_power_use` yearPowerUse,
CAST( (FLOOR(`real_time_power` * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
CAST( (FLOOR(`accumulated_power`/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
ROUND(`real_time_power` ,3) realTimePower,
ROUND(`accumulated_power`/1000 ,3) accumulatedPower,
`state` ,
`type`,
`organizational_code` organizationalCode,
`is_delete` isDelete,
CAST( (FLOOR(`day_generate` * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
ROUND(`day_generate` ,3) dayGenerate,
`month_generate` monthGenerate,
`year_generate` yearGenerate,
`day_income` dayIncome,
......@@ -93,20 +93,20 @@
select
CAST( (FLOOR(sum(real_time_power) * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
CAST( (FLOOR(sum(capacity)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
CAST( (FLOOR(sum(day_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
CAST( (FLOOR(sum(month_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
CAST( (FLOOR(sum(year_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
CAST( (FLOOR(sum(accumulated_power)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
CAST( (FLOOR( sum(day_income) * 1000) / 1000) AS DECIMAL(20, 3)) dayIncome,
CAST( (FLOOR(sum(month_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) monthIncome,
CAST( (FLOOR(sum(year_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) yearIncome,
CAST( (FLOOR(sum(cumulative_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) cumulativeIncome,
CAST( (FLOOR(sum(day_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayPowerUse,
CAST( (FLOOR(sum(month_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthPowerUse,
CAST( (FLOOR(sum(year_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearPowerUse,
CAST( (FLOOR(sum(rated_power) * 1000) / 1000) AS DECIMAL(20, 3)) ratedPower,
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,
count(*) countBuiltNum
from hygf_jp_station
<where>
......@@ -380,20 +380,20 @@
<select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
select
CAST( (FLOOR(sum(real_time_power) * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
CAST( (FLOOR(sum(capacity)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
CAST( (FLOOR(sum(day_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
CAST( (FLOOR(sum(month_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
CAST( (FLOOR(sum(year_generate)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
CAST( (FLOOR(sum(accumulated_power)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
CAST( (FLOOR( sum(day_income) * 1000) / 1000) AS DECIMAL(20, 3)) dayIncome,
CAST( (FLOOR(sum(month_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) monthIncome,
CAST( (FLOOR(sum(year_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) yearIncome,
CAST( (FLOOR(sum(cumulative_income)/10000 * 1000) / 1000) AS DECIMAL(20, 3)) cumulativeIncome,
CAST( (FLOOR(sum(day_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) dayPowerUse,
CAST( (FLOOR(sum(month_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) monthPowerUse,
CAST( (FLOOR(sum(year_power_use)/1000 * 1000) / 1000) AS DECIMAL(20, 3)) yearPowerUse,
CAST( (FLOOR(sum(rated_power) * 1000) / 1000) AS DECIMAL(20, 3)) ratedPower,
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,
count(*) countBuiltNum
from hygf_jp_station
<where>
......@@ -646,7 +646,7 @@
hjs.regional_companies_code,
hjs.amos_company_code,
hjs.sn_code snCode,
CAST( (FLOOR(hjs.capacity * 1000) / 1000) AS DECIMAL(20, 3)) capacity,
ROUND(hjs.capacity ,3) capacity,
hjs.name ,
hjs.code ,
hjs.system_code systemCode,
......@@ -668,15 +668,15 @@
hjs.day_power_use dayPowerUse,
hjs.month_power_use monthPowerUse,
hjs.year_power_use yearPowerUse,
CAST( (FLOOR(hjs.real_time_power * 1000) / 1000) AS DECIMAL(20, 3)) realTimePower,
CAST( (FLOOR(hjs.accumulated_power/1000 * 1000) / 1000) AS DECIMAL(20, 3)) accumulatedPower,
ROUND(hjs.real_time_power ,3) realTimePower,
ROUND(hjs.accumulated_power/1000 ,3) accumulatedPower,
hjs.state,
hjs.type,
hjs.organizational_code organizationalCode,
hjs.is_delete isDelete,
CAST( (FLOOR(hjs.day_generate * 1000) / 1000) AS DECIMAL(20, 3)) dayGenerate,
CAST( (FLOOR(hjs.month_generate * 1000) / 1000) AS DECIMAL(20, 3)) monthGenerate,
CAST( (FLOOR(hjs.year_generate * 1000) / 1000) AS DECIMAL(20, 3)) yearGenerate,
ROUND(hjs.day_generate ,3) dayGenerate,
ROUND(hjs.month_generate ,3) monthGenerate,
ROUND(hjs.year_generate ,3) yearGenerate,
hjs.day_income dayIncome,
hjs.month_income monthIncome,
hjs.year_income yearIncome,
......@@ -684,7 +684,7 @@
hjs.cumulative_income cumulativeIncome,
hjs.email,
hjs.rated_power ratedPower,
CAST( (FLOOR(hjs.day_generate/hjs.capacity * 1000) / 1000) AS DECIMAL(20, 3)) fullhour,
ROUND(hjs.day_generate/hjs.capacity ,3) fullhour,
(select privilege_company.COMPANY_NAME from privilege_company where
privilege_company.ORG_CODE=hjs.regional_companies_code) regionalCompaniesName,
lc.nbqSnCode
......@@ -760,11 +760,11 @@
<!-- code参数为区域公司orgCode或经销商orgCode-->
<!-- <select id="getRegionStatistics" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">-->
<!-- SELECT COUNT(*) AS powerStationNumber,-->
<!-- CAST( (FLOOR(SUM(capacity)/1000, 3) AS totalCapacity,-->
<!-- CAST( (FLOOR(SUM(day_generate)/1000, 3) AS totalDayGenerate,-->
<!-- CAST( (FLOOR(SUM(rated_power), 3) AS totalRatedPower,-->
<!-- CAST( (FLOOR(SUM(real_time_power), 3) AS totalRealTimePower,-->
<!-- CAST( (FLOOR(SUM(day_income), 3) AS totalDayIncome-->
<!-- 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-->
<!-- FROM hygf_jp_station hjs-->
<!-- <where>-->
<!-- <if test="regionCode != null and regionCode !=''">-->
......
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