提交修改

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpPersonStationDto.java

@@ -16,23 +16,22 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JpPersonStationDto", description="户用光伏监盘人员场站关系表")
-public class JpPersonStationDto  extends BaseDto {
+@ApiModel(value = "JpPersonStationDto", description = "户用光伏监盘人员场站关系表")
+public class JpPersonStationDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "人员id")
+	private String personId;
 
-    @ApiModelProperty(value = "人员id")
-    private String personId;
+	@ApiModelProperty(value = "场站id")
+	private String stationId;
 
-    @ApiModelProperty(value = "场站id")
-    private Long stationId;
+	@ApiModelProperty(value = "场站名称")
+	private String stationName;
+	/**
+	 * 业主名称
+	 */
 
-    @ApiModelProperty(value = "场站名称")
-    private String stationName;
-    /**
-     * 业主名称
-     */
-
-    private String owner;
+	private String owner;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInverterWarnDto.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 户用光伏监盘逆变器报警表
@@ -51,5 +52,7 @@ public class TdHygfJpInverterWarnDto {
 
 	@ApiModelProperty(value = "时间")
 	private Long time;
+	
+	private List<String> stationIds;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/JpPersonStation.java

@@ -32,7 +32,7 @@ public class JpPersonStation extends BaseEntity {
      * 场站id
      */
 	@TableField("station_id")
-    private Long stationId;
+    private String stationId;
 
     /**
      * 场站名称

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInvertorElecHistoryMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInvertorElecHistoryMapper">
-
+	<select id="list" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto">
+		SELECT * FROM house_pv_data.td_hygf_jp_inverter_warn
+		<where>
+			<if test="param.state!=null">
+			`state` = #{param.state}
+		</if>
+		</where>
+	</select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application.properties

-spring.application.name=AMOS-HYGF
+spring.application.name=AMOS-HYGF-WJ
 server.servlet.context-path=/hygf
 server.port=33330
 server.uri-encoding=UTF-8