Skip to content

A
amos-boot-biz
Commit a0ecae62 authored by tangwei's avatar tangwei
Browse files
Options

修改户用光伏监控

parent 5ae1804b
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 48 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInverterDto.java
View file @ a0ecae62
......@@ -33,7 +33,7 @@ public class JpInverterDto extends BaseDto {
private Double ratedPower;
@ApiModelProperty(value = "采集器id")
private Long collectorId;
private String collectorId;
@ApiModelProperty(value = "采集器sn编码")
private String collectorSnCode;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpInverterElectricityDto.java
View file @ a0ecae62
......@@ -22,7 +22,7 @@ public class JpInverterElectricityDto extends BaseDto {
@ApiModelProperty(value = "逆变器id")
private Long inverterId;
private String inverterId;
@ApiModelProperty(value = "sn编码")
private String snCode;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpInverter.java
View file @ a0ecae62
......@@ -44,7 +44,7 @@ public class JpInverter extends BaseEntity {
* 采集器id
*/
@TableField("collector_id")
private Long collectorId;
private String collectorId;
/**
* 采集器sn编码
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpInverterElectricity.java
View file @ a0ecae62
......@@ -26,7 +26,7 @@ public class JpInverterElectricity extends BaseEntity {
* 逆变器id
*/
@TableField("inverter_id")
private Long inverterId;
private String inverterId;
/**
* sn编码
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IJpStationService.java
View file @ a0ecae62
......@@ -14,5 +14,5 @@ import java.util.Set;
*/
public interface IJpStationService {
Map<String, List<Object>> getPowerqx(String date, String type, List<Long> statioId);
Map<String, List<Object>> getPowerqx(String date, String type, List<String> statioId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/MonthPowerMapper.java
View file @ a0ecae62
......@@ -26,12 +26,12 @@ public interface MonthPowerMapper extends BaseMapper<MonthPower> {
List<PowerCurveDto> getDayPower(@Param("startTime") Long startTime, @Param("endTime") Long endTime,@Param("dto")List<Long> statioId);
List<PowerCurveDto> getMonthPower(@Param("date") String month,@Param("dto")List<Long> statioId);
List<PowerCurveDto> getMonthPower(@Param("date") String month,@Param("dto")List<String> statioId);
List<PowerCurveDto> getYearPower(@Param("date") String month,@Param("dto")List<Long> statioId);
List<PowerCurveDto> getYearPower(@Param("date") String month,@Param("dto")List<String> statioId);
List<PowerCurveDto> getAllPower(@Param("date") String month,@Param("dto")List<Long> statioId);
List<PowerCurveDto> getAllPower(@Param("date") String month,@Param("dto")List<String> statioId);
List<PowerCurveDto> getDayPowercount(@Param("date") String month,@Param("dto")List<Long> statioId);
List<PowerCurveDto> getDayPowercount(@Param("date") String month,@Param("dto")List<String> statioId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ a0ecae62
......@@ -33,13 +33,13 @@
`day_power_use` dayPowerUse,
`month_power_use` monthPowerUse,
`year_power_use` yearPowerUse,
FORMAT(`real_time_power`,3) realTimePower,
FORMAT(`accumulated_power`/1000,3) accumulatedPower,
ROUND(`real_time_power`,3) realTimePower,
ROUND(`accumulated_power`/1000,3) accumulatedPower,
`state` ,
`type`,
`organizational_code` organizationalCode,
`is_delete` isDelete,
FORMAT(`day_generate`,3) dayGenerate,
ROUND(`day_generate`,3) dayGenerate,
`month_generate` monthGenerate,
`year_generate` yearGenerate,
`day_income` dayIncome,
......@@ -83,20 +83,20 @@
select
FORMAT(sum(real_time_power),3) realTimePower,
FORMAT(sum(capacity)/1000,3) capacity,
FORMAT(sum(day_generate)/1000,3) dayGenerate,
FORMAT(sum(month_generate)/1000,3) monthGenerate,
FORMAT(sum(year_generate)/1000,3) yearGenerate,
FORMAT(sum(accumulated_power)/1000,3) accumulatedPower,
FORMAT( sum(day_income),3) dayIncome,
FORMAT(sum(month_income)/10000,3) monthIncome,
FORMAT(sum(year_income)/10000,3) yearIncome,
FORMAT(sum(cumulative_income)/10000,3) cumulativeIncome,
FORMAT(sum(day_power_use)/1000,3) dayPowerUse,
FORMAT(sum(month_power_use)/1000,3) monthPowerUse,
FORMAT(sum(year_power_use)/1000,3) yearPowerUse,
FORMAT(sum(rated_power),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>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ a0ecae62
......@@ -282,7 +282,7 @@ public class JpStationController extends BaseController {
@GetMapping(value = "/getPowerqx")
public ResponseModel< Map<String, List<Object>>> getPowerqx(JpStationDto reviewDto,String date, String type) {
//获取当前人管理场站
List<Long> data=new ArrayList();
List<String> data=new ArrayList();
if(reviewDto.getThirdStationId()==null){
//获取当前人管理场站
LambdaQueryWrapper<JpPersonStation> qug=new LambdaQueryWrapper<>();
......@@ -291,13 +291,13 @@ public class JpStationController extends BaseController {
if(pPersonStation!=null&&!pPersonStation.isEmpty()){
for (JpPersonStation jpPersonStation : pPersonStation) {
data.add(Long.valueOf(jpPersonStation.getStationId()));
data.add(jpPersonStation.getStationId());
}
}else{
return ResponseHelper.buildResponse(null);
}
}else{
data.add(Long.valueOf(reviewDto.getThirdStationId()));
data.add(reviewDto.getThirdStationId());
}
return ResponseHelper.buildResponse(jpStationServiceImpl.getPowerqx( date, type,data));
}
......
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 @ a0ecae62
......@@ -59,7 +59,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
@Override
public Map<String, List<Object>> getPowerqx(String date, String type,List<Long> statioId) {
public Map<String, List<Object>> getPowerqx(String date, String type,List<String> statioId) {
List<PowerCurveDto> data=null;
List<Object> listx =new ArrayList<>();
List<Object> listy =new ArrayList<>();
......@@ -88,7 +88,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
for (int i = 0; i < listx.size(); i++) {
if(datum.getDate().equals(listx.get(i).toString())){
listy.remove(i);
String format = new DecimalFormat("#.000").format(datum.getNum());
String format = datum.getNum()!=null?new DecimalFormat("#.000").format(datum.getNum()):"0";
listy.add(i,format);
break;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MonthPowerServiceImpl.java
View file @ a0ecae62
......@@ -62,14 +62,16 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower,
wrapperday.eq(MonthPower::getDay, formattedDateday);
List<MonthPower> listdday= this.list(wrapperday);
if(listdday!=null&&!listdday.isEmpty()){
for (MonthPower monthPower : listdday) {
for (MonthPower power : list) {
for (MonthPower monthPower : list) {
for (MonthPower power : listdday) {
if(monthPower.getThirdStationId().equals(power.getThirdStationId())){
monthPower.setPower(power.getPower());
power.setCreatedTime(monthPower.getCreatedTime());
}else{
}
}
}
this.saveBatch(listdday);
this.saveBatch(list);
}else{
this.saveBatch(list);
}
......@@ -83,14 +85,15 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower,
wrapper.eq(YearPower::getMonth, formattedDate);
List<YearPower> listdY= yearPowerServiceImpl.list(wrapper);
if(listdY!=null&&!listdY.isEmpty()){
for (YearPower yearPower : listdY) {
for (YearPower power : listd) {
if(yearPower.getThirdStationId().equals(power.getThirdStationId())){
yearPower.setPower(power.getPower());
for (YearPower yearPower : listd) {
for (YearPower power : listdY) {
if(yearPower.getThirdStationId()!=null&&yearPower.getThirdStationId().equals(power.getThirdStationId())){
//yearPower.setPower(power.getPower());
yearPower.setCreatedTime(power.getCreatedTime());
}
}
}
yearPowerServiceImpl.saveBatch(listdY);
yearPowerServiceImpl.saveBatch(listd);
}else{
yearPowerServiceImpl.saveBatch(listd);
}
......@@ -103,14 +106,15 @@ public class MonthPowerServiceImpl extends BaseService<MonthPowerDto,MonthPower,
wrapper1.eq(AllPower::getYear, formattedDate1);
List<AllPower> listdall= allPowerServiceImpl.list(wrapper1);
if(listdall!=null&&!listdall.isEmpty()){
for (AllPower yearPower : listdall) {
for (AllPower power : listdy) {
if(yearPower.getThirdStationId().equals(power.getThirdStationId())){
yearPower.setPower(power.getPower());
for (AllPower yearPower : listdy) {
for (AllPower power : listdall) {
if(yearPower.getThirdStationId()!=null&&yearPower.getThirdStationId().equals(power.getThirdStationId())){
// yearPower.setPower(power.getPower());
yearPower.setCreatedTime(power.getCreatedTime());
}
}
}
allPowerServiceImpl.saveBatch(listdall);
allPowerServiceImpl.saveBatch(listdy);
}else{
allPowerServiceImpl.saveBatch(listdy);
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/TemporaryDataMapper.xml
View file @ a0ecae62
......@@ -6,7 +6,7 @@
<select id="timingTemporarysSorageData" resultType="map">
SELECT FORMAT( sum(value),2)as value ,
SELECT ROUND( sum(value),2)as value ,
created_time as createdTime ,
equipmentIndexName
FROM
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectMapper.xml
View file @ a0ecae62
......@@ -91,7 +91,7 @@
</select>
<select id="projectScheduleSuperviseNum" resultType="String">
select format((l.num/(tz_ugp_project.length/10))*100,0) as scheludel from
select ROUND((l.num/(tz_ugp_project.length/10))*100,0) as scheludel from
(select q.project_id, (q.num - w.num) as num
from
(select tz_ugp_weld.project_id, count(*) as num from tz_ugp_weld where
......@@ -137,7 +137,7 @@
</select>
<select id="projectScheduleInspectionNum" resultType="String">
select format((l.num/(tz_ugp_project.length/10))*100,0) as scheludel from
select ROUND((l.num/(tz_ugp_project.length/10))*100,0) as scheludel from
(select q.project_id, (q.num - w.num) as num
from
(select tz_ugp_weld.project_id, count(*) as num from tz_ugp_weld where
......
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