Browse Source

#inspect 放开

zhongwei
yang_shj 2 years ago
parent
commit
9c6547c13b
  1. 4
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java
  2. 197
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/PhotovoltaicDeviceVo.java
  3. 12
      hzims-service-api/inspect-api/pom.xml
  4. 9
      hzims-service/inspect/pom.xml
  5. 4
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java
  6. 98
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PhotovoltaicServiceImpl.java
  7. 1
      hzims-service/safeproduct/pom.xml

4
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/constant/HomePageConstant.java

@ -1,9 +1,5 @@
package com.hnac.hzims.operational.main.constant;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import io.swagger.annotations.ApiModelProperty;
import java.util.Arrays;
import java.util.List;

197
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/main/vo/PhotovoltaicDeviceVo.java

@ -98,4 +98,201 @@ public class PhotovoltaicDeviceVo {
@ApiModelProperty(value = "近30天用电量")
private List<GenerationPowerVo> generationPowerVoList;
@ApiModelProperty(value = "直流电流1")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_one;
@ApiModelProperty(value = "直流电流2")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_two;
@ApiModelProperty(value = "直流电流3")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_three;
@ApiModelProperty(value = "直流电流4")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_four;
@ApiModelProperty(value = "直流电流5")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_five;
@ApiModelProperty(value = "直流电流6")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_six;
@ApiModelProperty(value = "直流电流7")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_seven;
@ApiModelProperty(value = "直流电流8")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_eight;
@ApiModelProperty(value = "直流电流9")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_nine;
@ApiModelProperty(value = "直流电流10")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_ten;
@ApiModelProperty(value = "直流电流11")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_eleven;
@ApiModelProperty(value = "直流电流12")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double direct_twelve;
@ApiModelProperty(value = "直流电压1")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_one;
@ApiModelProperty(value = "直流电压2")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_two;
@ApiModelProperty(value = "直流电压3")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_three;
@ApiModelProperty(value = "直流电压4")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_four;
@ApiModelProperty(value = "直流电压5")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_five;
@ApiModelProperty(value = "直流电压6")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_six;
@ApiModelProperty(value = "直流电压7")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_seven;
@ApiModelProperty(value = "直流电压8")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_eight;
@ApiModelProperty(value = "直流电压9")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_nine;
@ApiModelProperty(value = "直流电压10")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_ten;
@ApiModelProperty(value = "直流电压11")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_eleven;
@ApiModelProperty(value = "直流电压12")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double dc_voltage_twelve;
@ApiModelProperty(value = "直流电流1")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_one;
@ApiModelProperty(value = "直流电流2")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_two;
@ApiModelProperty(value = "直流电流3")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_three;
@ApiModelProperty(value = "直流电流4")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_four;
@ApiModelProperty(value = "直流电流5")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_five;
@ApiModelProperty(value = "直流电流6")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_six;
@ApiModelProperty(value = "直流电流7")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_seven;
@ApiModelProperty(value = "直流电流8")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_eight;
@ApiModelProperty(value = "直流电流9")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_nine;
@ApiModelProperty(value = "直流电流10")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_ten;
@ApiModelProperty(value = "直流电流11")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_eleven;
@ApiModelProperty(value = "直流电流12")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double series_twelve;
@ApiModelProperty(value = "直流电压1")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_one;
@ApiModelProperty(value = "直流电压2")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_two;
@ApiModelProperty(value = "直流电压3")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_three;
@ApiModelProperty(value = "直流电压4")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_four;
@ApiModelProperty(value = "直流电压5")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_five;
@ApiModelProperty(value = "直流电压6")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_six;
@ApiModelProperty(value = "直流电压7")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_seven;
@ApiModelProperty(value = "直流电压8")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_eight;
@ApiModelProperty(value = "直流电压9")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_nine;
@ApiModelProperty(value = "直流电压10")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_ten;
@ApiModelProperty(value = "直流电压11")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_eleven;
@ApiModelProperty(value = "直流电压12")
@JsonSerialize(nullsUsing = NullSerializer.class)
private Double se_voltage_twelve;
}

12
hzims-service-api/inspect-api/pom.xml

@ -3,20 +3,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>hzims-service-api</artifactId>
<groupId>com.hnac.hzims</groupId>
<version>4.0.0-SNAPSHOT</version>
<artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.6.RELEASE</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.hnac.hzinfo</groupId>
<artifactId>inspect-api</artifactId>
<name>${project.artifactId}</name>
<packaging>jar</packaging>
<properties>
<bladex.project.version>2.7.6.RELEASE</bladex.project.version>
</properties>

9
hzims-service/inspect/pom.xml

@ -4,13 +4,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.hnac.hzims</groupId>
<artifactId>hzims-service</artifactId>
<version>4.0.0-SNAPSHOT</version>
<artifactId>BladeX</artifactId>
<groupId>org.springblade</groupId>
<version>2.7.6.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.hnac.hzinfo.inspect</groupId>
<artifactId>hzinfo-inspect</artifactId>
<packaging>jar</packaging>
<properties>
<bladex.project.version>2.7.6.RELEASE</bladex.project.version>

4
hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java

@ -233,8 +233,8 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
}*/
// condition.setEndTime(LocalDateTime.now());
// FIXME 测试使用时间
condition.setBeginTime(LocalDateTime.parse("2023-03-22 10:06:38", format));
condition.setEndTime(LocalDateTime.parse("2023-03-24 16:06:38", format));
condition.setBeginTime(LocalDateTime.parse("2023-02-01 00:00:00", format));
condition.setEndTime(LocalDateTime.parse("2023-02-27 00:00:00", format));
condition.setNeedPage(true);
condition.setPage(param.getCurrent());
condition.setLimit(param.getSize());

98
hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/PhotovoltaicServiceImpl.java

@ -254,7 +254,7 @@ public class PhotovoltaicServiceImpl implements PhotovoltaicService {
target.setDeviceName(device.getName());
target.setDeptName(device.getName());
// 当日运行时长
//target.setRunHours(this.runHours(device.getPoint().get(HomePageConstant.PV_JOINT_RELAY)));
target.setRunHours(this.runHours(device.getPoint().get(HomePageConstant.PV_JOINT_RELAY)));
// 年发电量
target.setGenerationYear((double) this.sumValueByTime(device.getEmCode(), device.getRideCount(), "0"));
// 月发电量
@ -1531,6 +1531,102 @@ public class PhotovoltaicServiceImpl implements PhotovoltaicService {
item.setLastLoad(mateReals.get(0).getLastLoad());
item.setVoltage(mateReals.get(0).getVoltage());
item.setCurrent(mateReals.get(0).getCurrent());
// 直流电流1
item.setDirect_one(mateReals.get(0).getDirect_one());
// 直流电流2
item.setDirect_two(mateReals.get(0).getDirect_two());
// 直流电流3
item.setDirect_three(mateReals.get(0).getDirect_three());
// 直流电流4
item.setDirect_four(mateReals.get(0).getDirect_four());
// 直流电流5
item.setDirect_five(mateReals.get(0).getDirect_five());
// 直流电流6
item.setDirect_six(mateReals.get(0).getDirect_six());
// 直流电流7
item.setDirect_seven(mateReals.get(0).getDirect_seven());
// 直流电流8
item.setDirect_eight(mateReals.get(0).getDirect_eight());
// 直流电流9
item.setDirect_nine(mateReals.get(0).getDirect_nine());
// 直流电流10
item.setDirect_ten(mateReals.get(0).getDirect_ten());
// 直流电流11
item.setDirect_eleven(mateReals.get(0).getDirect_eleven());
// 直流电流12
item.setDirect_twelve(mateReals.get(0).getDirect_twelve());
// 直流电压1
item.setDc_voltage_one(mateReals.get(0).getDc_voltage_one());
// 直流电压2
item.setDc_voltage_two(mateReals.get(0).getDc_voltage_two());
// 直流电压3
item.setDc_voltage_three(mateReals.get(0).getDc_voltage_three());
// 直流电压4
item.setDc_voltage_four(mateReals.get(0).getDc_voltage_four());
// 直流电压5
item.setDc_voltage_five(mateReals.get(0).getDc_voltage_five());
// 直流电压6
item.setDc_voltage_six(mateReals.get(0).getDc_voltage_six());
// 直流电压7
item.setDc_voltage_seven(mateReals.get(0).getDc_voltage_seven());
// 直流电压8
item.setDc_voltage_eight(mateReals.get(0).getDc_voltage_eight());
// 直流电压9
item.setDc_voltage_nine(mateReals.get(0).getDc_voltage_nine());
// 直流电压10
item.setDc_voltage_ten(mateReals.get(0).getDc_voltage_ten());
// 直流电压11
item.setDc_voltage_eleven(mateReals.get(0).getDc_voltage_eleven());
// 直流电压12
item.setDc_voltage_twelve(mateReals.get(0).getDc_voltage_twelve());
// 串流电流1
item.setDirect_one(mateReals.get(0).getDirect_one());
// 串流电流2
item.setSeries_two(mateReals.get(0).getSeries_two());
// 串流电流3
item.setSeries_three(mateReals.get(0).getSeries_three());
// 串流电流4
item.setSeries_four(mateReals.get(0).getSeries_four());
// 串流电流5
item.setSeries_five(mateReals.get(0).getSeries_five());
// 串流电流6
item.setSeries_six(mateReals.get(0).getSeries_six());
// 串流电流7
item.setSeries_seven(mateReals.get(0).getSeries_seven());
// 串流电流8
item.setSeries_eight(mateReals.get(0).getSeries_eight());
// 串流电流9
item.setSeries_nine(mateReals.get(0).getSeries_nine());
// 串流电流10
item.setSeries_ten(mateReals.get(0).getSeries_ten());
// 串流电流11
item.setSeries_eleven(mateReals.get(0).getSeries_eleven());
// 串流电流12
item.setSeries_twelve(mateReals.get(0).getSeries_twelve());
// 串流电压1
item.setSe_voltage_one(mateReals.get(0).getSe_voltage_one());
// 串流电压2
item.setSe_voltage_two(mateReals.get(0).getSe_voltage_two());
// 串流电压3
item.setSe_voltage_three(mateReals.get(0).getSe_voltage_three());
// 串流电压4
item.setSe_voltage_four(mateReals.get(0).getSe_voltage_four());
// 串流电压5
item.setSe_voltage_five(mateReals.get(0).getSe_voltage_five());
// 串流电压6
item.setSe_voltage_six(mateReals.get(0).getSe_voltage_six());
// 串流电压7
item.setSe_voltage_seven(mateReals.get(0).getSe_voltage_seven());
// 串流电压8
item.setSe_voltage_eight(mateReals.get(0).getSe_voltage_eight());
// 串流电压9
item.setSe_voltage_nine(mateReals.get(0).getSe_voltage_nine());
// 串流电压10
item.setSe_voltage_ten(mateReals.get(0).getSe_voltage_ten());
// 串流电压11
item.setSe_voltage_eleven(mateReals.get(0).getSe_voltage_eleven());
// 串流电压12
item.setSe_voltage_twelve(mateReals.get(0).getSe_voltage_twelve());
// 环比功率
if (Math.abs(mateReals.get(0).getLoad()) <= 0 || mateReals.get(0).getLastLoad() <= 0) {
item.setLoadRatio(0.0);

1
hzims-service/safeproduct/pom.xml

@ -128,7 +128,6 @@
<dependency>
<groupId>com.hnac.hzinfo</groupId>
<artifactId>inspect-api</artifactId>
<version>2.7.6.RELEASE</version>
</dependency>
<dependency>
<groupId>com.hnac.hzims</groupId>

Loading…
Cancel
Save