Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -671,6 +671,9 @@ public class DateUtils {
 //        System.out.println(getWeekBeginDate(dateParse("2021-10-11", null)));
 //        System.out.println(getWeekEndDate(dateParse("2021-10-11", null)));
         System.out.println(secondsToTimeStr(3600));
+
+        List<String> beforeCurrentMonth = getBeforeCurrentMonth(3, true);
+        System.out.println(beforeCurrentMonth);
     }
 
     /**
@@ -1073,4 +1076,26 @@ public class DateUtils {
         final LocalDateTime end = LocalDateTime.parse(sdf.format(endTime), DateTimeFormatter.ofPattern(pattern));
         return Duration.between(start, end).toDays();
     }
+
+
+
+    public static List<String> getBeforeCurrentMonth(int num,Boolean bool ){
+        int n = 0;
+        if (!bool){
+            n = n+1;
+        }
+        List<String> objects = new ArrayList<>();
+        for (int i = n; shouldContinue(i,num,bool); i++) {
+            Date date1 = dateAddMonths(new Date(),num>0?i:-i);
+            String s = convertDateToString(date1, MONTH_PATTERN);
+            objects.add(s);
+        }
+
+        return objects;
+    }
+
+
+    private static boolean shouldContinue(int i, int num, Boolean bool) {
+        return bool ? i < Math.abs(num) : i <=Math.abs(num) ;
+    }
 }

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

@@ -5,7 +5,7 @@
     <select id="getDayGenerateph" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate">
         SELECT
         *
-        FROM house_pv_data.td_hygf_station_day_generate
+        FROM house_pv_data.td_hygf_station_generate_month
         <where>
             <if test="dto!=null">
                 third_station_id in
@@ -39,7 +39,7 @@
         SELECT
         sum(generate)num,
         `day_time` date
-        FROM house_pv_data.td_hygf_station_day_generate
+        FROM house_pv_data.td_hygf_station_generate_month
         <where>
         <if test="dto!=null">
             third_station_id in
@@ -71,7 +71,7 @@
         SELECT
         sum(generate)num,
         `month_time` date
-        FROM house_pv_data.td_hygf_station_month_generate
+        FROM house_pv_data.td_hygf_station_generate_year
 
         <where>
             <if test="dto!=null">
@@ -106,7 +106,7 @@
         SELECT
         sum(generate)num,
         `year_time` date
-        FROM house_pv_data.td_hygf_station_year_generate
+        FROM house_pv_data.td_hygf_station_generate_all
         <where>
             <if test="dto!=null">
                 third_station_id in
@@ -137,7 +137,7 @@
     <select id="selectPagenewDayGenerate"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate">
         SELECT
       *
-        FROM house_pv_data.td_hygf_station_day_generate
+        FROM house_pv_data.td_hygf_station_generate_month
         <where>
             <if test="dto!=null">
                 third_station_id in

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

@@ -4,7 +4,7 @@
     <select id="selectPagenewMonthGenerate"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate">
         SELECT
         *
-        FROM house_pv_data.td_hygf_station_month_generate
+        FROM house_pv_data.td_hygf_station_generate_year
         <where>
             <if test="dto!=null">
                 third_station_id in

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

@@ -4,7 +4,7 @@
     <select id="selectPagenewYearGenerate"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate">
         SELECT
         *
-        FROM house_pv_data.td_hygf_station_year_generate
+        FROM house_pv_data.td_hygf_station_generate_all
         <where>
             <if test="dto!=null">
                 third_station_id in

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

@@ -196,7 +196,7 @@ public class TestController extends BaseController {
 			time = DateUtil.offsetMinute(time, -DateUtil.minute(time) % 10);
 			String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
 			time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
-			tdengineTimeService.insertMomentDataTest("2024-07-25 08:00:00");
+			tdengineTimeService.insertMomentDataTest("2024-07-24 08:00:00");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -211,7 +211,7 @@ public class TestController extends BaseController {
 			time = DateUtil.offsetMinute(time, -DateUtil.minute(time) % 10);
 			String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
 			time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
-			// tdengineTimeService.insertMomentDataPvTest("2024-07-24 08:00:00");
+			tdengineTimeService.insertMomentDataPvTest("2024-07-24 08:00:00");
 
 			//区域 全域最后统一生成
 			tdengineTimeService.insertMomentDataAllTest("2024-07-24 08:00:00");

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/TdengineTimeServiceImpl.java

@@ -108,7 +108,7 @@ public class TdengineTimeServiceImpl {
         String startTime = DateUtils.dateFormat(DateUtils.dateAddMinutes(new Date(), -541), DateUtils.DATE_TIME_PATTERN);
         // 测点
         List<IdxBizFanHealthLevel> levelList = idxBizFanHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "测点").last("limit 4"));
-        List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.getInfoListByGroupByCdFan(startTime, "fan_health_index_moment", "测点");
+        List<FanHealthIndex> fanHealthIndices = fanHealthIndexService.getInfoListByGroupByCdFan(startTime, "fan_health_index_moment", "测点");
         saveBatchFan(fanHealthIndices, "fan_health_index_hour", recDate, WarningPeriodEnum.HOUR.getName(), levelList);
         // 子系统
         List<IdxBizFanHealthLevel> levelListZxt = idxBizFanHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "子系统").last("limit 4"));
@@ -126,7 +126,7 @@ public class TdengineTimeServiceImpl {
         idxFanHealthIndexMapper.deleteAllDataByTableName("pv_health_index_latest_data", WarningPeriodEnum.HOUR.getName());
         // 测点
         List<IdxBizPvHealthLevel> pvLevelList = idxBizPvHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizPvHealthLevel>().eq(IdxBizPvHealthLevel::getAnalysisObjType, "测点").last("limit 4"));
-        List<PvHealthIndex> pvHealthIndices = pvHealthIndexMapper.getInfoListByGroupByCdPv(startTime, "pv_health_index_moment", "测点");
+        List<PvHealthIndex> pvHealthIndices = pvHealthIndexService.getInfoListByGroupByCdPv(startTime, "pv_health_index_moment", "测点");
         saveBatchPv(pvHealthIndices, "pv_health_index_hour", recDate, WarningPeriodEnum.HOUR.getName(), pvLevelList);
         // 设备
         List<IdxBizPvHealthLevel> pvLevelListSb = idxBizPvHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizPvHealthLevel>().eq(IdxBizPvHealthLevel::getAnalysisObjType, "设备").last("limit 4"));
@@ -200,7 +200,7 @@ public class TdengineTimeServiceImpl {
 
         idxFanHealthIndexMapper.deleteAllDataByTableName("pv_health_index_latest_data", WarningPeriodEnum.DAY.getName());
         List<IdxBizPvHealthLevel> pvLevelList = idxBizPvHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizPvHealthLevel>().eq(IdxBizPvHealthLevel::getAnalysisObjType, "测点").last("limit 4"));
-        List<PvHealthIndex> pvHealthIndices = pvHealthIndexMapper.getInfoListByGroupByCdPv(startTime, "pv_health_index_hour", "测点");
+        List<PvHealthIndex> pvHealthIndices = pvHealthIndexService.getInfoListByGroupByCdPv(startTime, "pv_health_index_hour", "测点");
         saveBatchPv(pvHealthIndices, "pv_health_index_day", recDate, WarningPeriodEnum.DAY.getName(), pvLevelList);
         // 设备
         List<IdxBizPvHealthLevel> pvLevelListSb = idxBizPvHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizPvHealthLevel>().eq(IdxBizPvHealthLevel::getAnalysisObjType, "设备").last("limit 4"));
@@ -429,8 +429,11 @@ public class TdengineTimeServiceImpl {
     }
 
 
-    public void insertMomentDataTest(String startTime) throws ParseException {
+    public void insertMomentDataTest(String startTime) {
         //s 489分钟 为  8小时  +  19分钟
+        List<FanHealthIndex> fanHealthIndicesCd = fanHealthIndexMapper.getInfoListByGroupByCdFan(startTime, "fan_health_index_moment", "测点");
+        List<FanHealthIndex> fanHealthIndicesCdNew = fanHealthIndexService.getInfoListByGroupByCdFan(startTime, "fan_health_index_moment", "测点");
+        print("测点", fanHealthIndicesCd, fanHealthIndicesCdNew);
         // 子系统
         List<FanHealthIndex> fanHealthIndicesZxt = fanHealthIndexMapper.getInfoListByGroupByZxtFan(startTime, "fan_health_index_moment", "测点");
         List<FanHealthIndex> fanHealthIndicesNew = fanHealthIndexService.getInfoListByGroupByZxtFan(startTime, "fan_health_index_moment", "测点");
@@ -445,7 +448,10 @@ public class TdengineTimeServiceImpl {
         print("场站", fanHealthIndicesCz, fanHealthIndicesCzNew);
     }
 
-    public void insertMomentDataPvTest(String startTime) throws ParseException {
+    public void insertMomentDataPvTest(String startTime) {
+        List<PvHealthIndex> pvHealthIndicesCd = pvHealthIndexMapper.getInfoListByGroupByCdPv(startTime, "pv_health_index_moment", "测点");
+        List<PvHealthIndex> pvHealthIndicesCdNew = pvHealthIndexService.getInfoListByGroupByCdPv(startTime, "pv_health_index_moment", "测点");
+        printPv("测点", pvHealthIndicesCd, pvHealthIndicesCdNew);
         // 设备
         List<PvHealthIndex> fanHealthIndicesSb = pvHealthIndexMapper.getInfoListByGroupBySbPv(startTime, "pv_health_index_moment", "测点");
         List<PvHealthIndex> fanHealthIndicesSbNew = pvHealthIndexService.getInfoListByGroupBySbPv(startTime, "pv_health_index_moment", "测点");
@@ -468,14 +474,10 @@ public class TdengineTimeServiceImpl {
     }
 
     public void printPv(String desc, List<PvHealthIndex> olds, List<PvHealthIndex> news) {
-       try {
-           olds.sort(Comparator.comparing(PvHealthIndex::getArea).thenComparing(PvHealthIndex::getStation).thenComparing(PvHealthIndex::getEquipmentName).thenComparing(PvHealthIndex::getSubarray).thenComparing(PvHealthIndex::getPointName));
-           news.sort(Comparator.comparing(PvHealthIndex::getArea).thenComparing(PvHealthIndex::getStation).thenComparing(PvHealthIndex::getEquipmentName).thenComparing(PvHealthIndex::getSubarray).thenComparing(PvHealthIndex::getPointName));
-           log.info("对比{} old => {}", desc, olds);
-           log.info("对比{} news => {}", desc, news);
-       } catch (Exception e) {
-           e.printStackTrace();
-       }
+        olds.sort(Comparator.comparing(PvHealthIndex::getArea).thenComparing(PvHealthIndex::getStation).thenComparing(PvHealthIndex::getSubarray).thenComparing(PvHealthIndex::getEquipmentName).thenComparing(PvHealthIndex::getPointName));
+        news.sort(Comparator.comparing(PvHealthIndex::getArea).thenComparing(PvHealthIndex::getStation).thenComparing(PvHealthIndex::getSubarray).thenComparing(PvHealthIndex::getEquipmentName).thenComparing(PvHealthIndex::getPointName));
+        log.info("对比{} old => {}", desc, olds);
+        log.info("对比{} news => {}", desc, news);
     }
     
     public void insertMomentDataAll(String recDate) throws ParseException {

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EarningsForecastImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESMoonPowerGeneration;
@@ -33,8 +35,16 @@ public class EarningsForecastImpl {
     private StationBasicMapper stationBasicMapper;
     //收益 时间曲线图数据组装
     public Object earningsForecastSJQXT (Long stationId, String type){
-        List<Map<String, String>> list = commonMapper.selectAgo10Month();
-        List<Map<String, String>> lastThreeMonth = commonMapper.selectLast3Month();
+
+        List<String> beforeMonth = DateUtils.getBeforeCurrentMonth(-10, false);
+        List<String> afterMonth = DateUtils.getBeforeCurrentMonth(3, true);
+
+        List<Map<String, String>> list = beforeMonth.stream()
+                .map(month -> MapBuilder.<String,String>create().put ("MonthYear", month).build())
+                .collect(Collectors.toList());
+        List<Map<String, String>> lastThreeMonth = afterMonth.stream()
+                .map(month -> MapBuilder.<String,String>create().put ("MonthYear", month).build())
+                .collect(Collectors.toList());
 
         Map<String, List<String>> queryCondtion1 = new HashMap<>();
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
@@ -124,10 +134,14 @@ public class EarningsForecastImpl {
 
 //收益 折线图数据组装
     public Object earningsForecastZXT (Long stationId, String type){
-        List<Map<String, String>> list = commonMapper.selectAgo10Month();
-        List<Map<String, String>> lastThreeMonth = commonMapper.selectLast3Month();
-
-
+        List<String> beforeMonth = DateUtils.getBeforeCurrentMonth(-10, false);
+        List<String> afterMonth = DateUtils.getBeforeCurrentMonth(3, true);
+        List<Map<String, String>> list = beforeMonth.stream()
+                .map(month -> MapBuilder.<String,String>create().put ("MonthYear", month).build())
+                .collect(Collectors.toList());
+        List<Map<String, String>> lastThreeMonth = afterMonth.stream()
+                .map(month -> MapBuilder.<String,String>create().put ("MonthYear", month).build())
+                .collect(Collectors.toList());
         Map<String, List<String>> queryCondtion1 = new HashMap<>();
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         if (type.equals("FDZ")){

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/SjglZsjZsbtzMapper.java

@@ -24,6 +24,9 @@ public interface SjglZsjZsbtzMapper extends BaseMapper<SjglZsjZsbtz> {
 
 
     List<Map<String,Object>> getStationInfoMapByStationWerks(String WERKS, String DATAID);
+    List<Map<String,Object>> getStationInfoMapByStationWerksNew(String WERKS, String DATAID);
     List<Map<String,Object>> getStationInfoMapByStationGFWerks(String WERKS,String DATAID);
 
+    List<Map<String, Object>> getStationInfoMapByStationGFWerksNew(String WERKS,String DATAID);
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -1227,8 +1227,26 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 				.filter(esEquipments -> esEquipments.getEquipmentIndexName().equals("有功功率"))
 				.collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getValueF));
 		TpriDmpDatabook tpriDmpDatabook = tpriDmpDatabookServiceImpl.getTpriDmpDatabookByDataName("风机");
-		List<Map<String, Object>> dataMaps = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper
-				.getStationInfoMapByStationWerks(werks, tpriDmpDatabook.getDataid().toString());
+//		List<Map<String, Object>> dataMaps = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper
+//				.getStationInfoMapByStationWerks(werks, tpriDmpDatabook.getDataid().toString());
+
+
+		List<Map<String, Object>> dataMapss = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper
+				.getStationInfoMapByStationWerksNew(werks, tpriDmpDatabook.getDataid().toString());
+
+		Map<String, List<Map<String, Object>>> dataResult = dataMapss.stream().collect(Collectors.groupingBy(map -> (String) map.get("name")));
+		List<Map<String, Object>> dataMaps = new ArrayList<>();
+		dataResult.keySet().forEach(m->{
+			String equipNum = dataResult.get(m).stream()
+					.map(map ->map.get("equipNum").toString().replace(m+"#",""))
+					.reduce((a, b) -> a + "," + b)
+					.orElse("");
+			Map<String, Object> hashMap = new HashMap<>();
+			hashMap.put("name",m.replace("#",""));
+			hashMap.put("equipNum",equipNum);
+			dataMaps.add(hashMap);
+		});
+
 		// 获取风机列表
 		List<ESEquipmentsDTO> fanStatusList = getFanStatusList(stationId);
 		fanStatusList.forEach(equipments -> {
@@ -2360,8 +2378,28 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 			map.put("state" + number, equipStatesMap.get(esEquipments.getEquipmentNumber()));
 			maps.add(map);
 		}
-		List<Map<String, Object>> dataMaps = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper
-				.getStationInfoMapByStationGFWerks(werks, "集电线");
+//		List<Map<String, Object>> dataMaps = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper
+//				.getStationInfoMapByStationGFWerks(werks, "集电线");
+
+		List<Map<String, Object>> dataMapss = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper
+				.getStationInfoMapByStationGFWerksNew(werks,"集电线");
+
+		Map<String, List<Map<String, Object>>> dataResult = dataMapss.stream().collect(Collectors.groupingBy(map -> (String) map.get("name")));
+		List<Map<String, Object>> dataMaps = new ArrayList<>();
+		dataResult.keySet().forEach(m->{
+			String equipNum = dataResult.get(m).stream()
+					.map(map ->map.get("equipNum").toString().replace(m,""))
+					.reduce((a, b) -> a + "," + b)
+					.orElse("");
+			Map<String, Object> hashMap = new HashMap<>();
+			hashMap.put("name",m.replace("#",""));
+			hashMap.put("equipNum",equipNum);
+			dataMaps.add(hashMap);
+		});
+
+
+
+
 		int i = 0;
 		// 逆变器需要根据所属集电线分类组装 下面循环是将同一子阵下的不同逆变器组装为消息数据
 		for (Map<String, Object> dataMap : dataMaps) {

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -18,7 +18,31 @@
             FSB
 
 </select>
+    <select id="getStationInfoMapByStationWerksNew" resultType="map">
 
+        SELECT
+            SUBSTRING(sjgl_zsj_zsbtz.SBMC, 1, 4)  AS name,
+            REPLACE(sjgl_zsj_zsbtz.SBMC, '风机系统', '') as  equipNum
+        FROM
+            sjgl_zsj_zsbtz
+        WHERE
+                FSB IN (
+                SELECT
+                    DBID
+                FROM
+                    sjgl_zsj_zsbtz
+                WHERE
+                        MACHGENRE = (
+                        SELECT
+                            DATAID
+                        FROM
+                            tpri_dmp_databook
+                        WHERE
+                            MACHGENRE = #{DATAID} and WERKS = #{WERKS}
+                    )
+            )
+
+    </select>
     <select id="getStationInfoMapByStationGFWerks" resultType="map">
 
         SELECT LEFT
@@ -37,6 +61,17 @@
             B.FSB
     </select>
 
+    <select id="getStationInfoMapByStationGFWerksNew" resultType="com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz">
+
+            SELECT
+                REPLACE(sjgl_zsj_zsbtz.SBMC, '光伏阵区系统', '') as  equipNum,
+                SUBSTRING(sjgl_zsj_zsbtz.SBMC, 1, LOCATE('#', sjgl_zsj_zsbtz.SBMC)) AS name
+            FROM
+            sjgl_zsj_zsbtz
+            WHERE
+            FSB IN ( SELECT DBID FROM sjgl_zsj_zsbtz WHERE MACHGENRE = ( SELECT DATAID FROM tpri_dmp_databook WHERE DATANAME = #{DATAID} ) AND WERKS = #{WERKS} )
+    </select>
+
     <select id="getEquipQrcodeInfo" resultType="com.yeejoin.amos.boot.module.jxiop.api.entity.StationQrCodeStatistics">
         SELECT
             WERKS AS code,