解决冲突

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/dto/InverterDetailDto.java

@@ -127,4 +127,5 @@ public class InverterDetailDto {
     private Double pow30;
     private Double pow31;
     private Double pow32;
+    private Double inverterTemperature;
 }

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFInverterDayGenerate.java

@@ -92,6 +92,22 @@ public class TdHYGFInverterDayGenerate implements Serializable {
      */
     private Double acc4;
     /**
+     * 直流电流1
+     */
+    private Double pv1;
+    /**
+     * 直流电流2
+     */
+    private Double pv2;
+    /**
+     * 直流电流3
+     */
+    private Double pv3;
+    /**
+     * 直流电流4
+     */
+    private Double pv4;
+    /**
      * 总功率
      */
     private Double totalPower;
@@ -122,6 +138,9 @@ public class TdHYGFInverterDayGenerate implements Serializable {
     /**
      * IGBT温度
      */
-    private Double igbtTmep;
+    private Double igbtTemp;
+
+    private Double income;
+    private Double fullhour;
 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFInverterMonthGenerate.java

@@ -24,13 +24,13 @@ public class TdHYGFInverterMonthGenerate implements Serializable {
      */
     private String snCode;
     /**
-     *日  yyyy-MM
+     *日  yyyy-MM-dd
      */
-    private String monthTime;
+    private String dayTime;
     /**
      *月  yyyy
      */
-    private String year;
+    private String yearMonth;
     /**
      * 发电量
      */
@@ -39,5 +39,6 @@ public class TdHYGFInverterMonthGenerate implements Serializable {
      * 满发小时数
      */
     private Double fullhour;
+    private Double income;
 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFInverterTotalGenerate.java

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author DELL
+ */
+@Data
+@TableName(value = "td_hygf_inverter_total_generate" ,autoResultMap = true)
+public class TdHYGFInverterTotalGenerate implements Serializable {
+    /**
+     * 创建时间
+     */
+    private Long createdTime;
+    /**
+     * 第三方场站id
+     */
+    private String thirdStationId;
+    /**
+     * sncode
+     */
+    private String snCode;
+    /**
+     *日  yyyy-MM
+     */
+    private String yearTime;
+    /**
+     *月  yyyy
+     */
+    private String year;
+    /**
+     * 发电量
+     */
+    private Double generate;
+    /**
+     * 满发小时数
+     */
+    private Double fullhour;
+    private Double income;
+}
+

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFInverterYearGenerate.java

@@ -26,7 +26,7 @@ public class TdHYGFInverterYearGenerate implements Serializable {
     /**
      *日  yyyy-MM
      */
-    private String yearTime;
+    private String monthTime;
     /**
      *月  yyyy
      */
@@ -39,5 +39,6 @@ public class TdHYGFInverterYearGenerate implements Serializable {
      * 满发小时数
      */
     private Double fullhour;
+    private Double income;
 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationDayGenerate.java

@@ -31,5 +31,6 @@ public class TdHYGFStationDayGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    private Double fullhour;
 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationMonthGenerate.java

@@ -31,5 +31,6 @@ public class TdHYGFStationMonthGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    private Double fullhour;
 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/TdHYGFStationYearGenerate.java

@@ -31,5 +31,6 @@ public class TdHYGFStationYearGenerate implements Serializable {
      * 发电量
      */
     private Double generate;
+    private Double fullhour;
 }
 

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdHYGFInverterTotalGenerateMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdHYGFInverterTotalGenerate;
+
+public interface TdHYGFInverterTotalGenerateMapper extends BaseMapper<TdHYGFInverterTotalGenerate> {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java

@@ -642,7 +642,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexDays.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexDays.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}else if (requiredType.equals("按小时")){
 
@@ -666,7 +666,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexHour> fanHealthIndexHours = fanHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexHours.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexHours.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}else {
 //			if (null != type && type.equals("0")){
@@ -683,7 +683,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexMoments.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexMoments.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}
 	}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexDayMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
     @Select("<script>"+
@@ -24,7 +25,17 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "order by health_index "+
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<PvHealthIndexDay> selectData(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName
+    List<PvHealthIndexDay> selectData(@Param("station")String station,
+                                      @Param("analysisType")String analysisType,
+                                      @Param("indexAddress")String indexAddress,
+                                      @Param("healthLevel")String healthLevel,
+                                      @Param("area")String area,
+                                      @Param("analysisObjType")String analysisObjType,
+                                      @Param("subarray")String subarray,
+                                      @Param("pointName")String pointName,
+                                      @Param("startTimeTop") String startTimeTop,
+                                      @Param("endTimeTop")String endTimeTop,
+                                      @Param("equipmentName")String equipmentName
             , @Param("current")Integer current, @Param("size")Integer size);
 
 
@@ -43,4 +54,12 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "</script>")
     int selectDataTotal(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName);
 
+    @Select("<script>"+
+            "SELECT  station, health_level as healthlevel,( CASE HEALTH_LEVEL WHEN '危险' THEN 4 WHEN '警告' THEN 3 WHEN '注意' THEN 2 ELSE 1 END ) AS sort, count( 1 ) AS `value` FROM analysis_data.pv_health_index_day WHERE analysis_obj_type = #{analysisObjType} AND ts >= TODAY()-8h" +
+            "<if test='area!= null'> AND area = #{area} </if> " +
+            "<if test='station!= null'>AND station = #{station} </if>" +
+            " GROUP BY station,health_level  order by sort"+
+            "</script>")
+    List<Map<String,Object>> selectEquipStatusByStationPv(@Param("area")String area, @Param("analysisObjType")String analysisObjType, @Param("station")String station);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvWarningRecord.xml

@@ -152,7 +152,8 @@
 
 
     <select id="selectWarningPointTotal"  resultType="int">
-        SELECT
+        select count(1) from
+        (SELECT
         a.station,
         a.warning_name,
         a.content,
@@ -178,7 +179,7 @@
         point_name,
         rec_date ,
         content,
-        warning_name
+        warning_name) b
     </select>
 
     <select id="selectEquipWarningTotal" resultType="map">
@@ -204,7 +205,7 @@
         `z`.`warning_name` as `WARNING_NAME`,
         count( 1 ) as `num`
         from
-        analysis_data.fan_warning_record z where
+        analysis_data.pv_warning_record z where
         ( `z`.`status` = 0 )
         <if test="STATION != null and  STATION != '' ">
             AND z.station = #{STATION}