Skip to content

A
amos-boot-zx-biz
Commit a2bf252c authored by chenzhao's avatar chenzhao
Browse files
Options

修改现场分析问题

parent 38b8dd5a
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 20 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java
View file @ a2bf252c
......@@ -174,11 +174,11 @@ public class TDBigScreenAnalyseController extends BaseController {
return s + " 00:00:00";
}).collect(Collectors.toList());
List<Map<String, Object>> healthListInfo = fanHealthIndexMapper.getInfoByDate(finalAreaCode,
finalStationCode, fullDateList);
finalStationCode, dateList);
Map<String, Object> map = healthListInfo.stream().collect(Collectors
.toMap(i -> String.valueOf(i.get("recdate")), i -> i.get("healthindex"), (key1, key2) -> key2));
for (String date : dateList) {
String value = map.get(date + " 00:00:00") != null ? String.valueOf(map.get(date + " 00:00:00"))
String value = map.get(date + " 00:00:00") != null ? String.valueOf(map.get(date))
: "100";
valueList.add(String.valueOf(Math.round(Double.valueOf(value) * 10.0) / 10.0));
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml
View file @ a2bf252c
......@@ -61,7 +61,7 @@
<where>
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -92,7 +92,7 @@
<where>
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -224,7 +224,7 @@
FROM fan_health_index_latest_data
WHERE ANALYSIS_OBJ_TYPE = '片区'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE - INTERVAL 1 DAY
GROUP BY ARAE
UNION ALL
(
......@@ -233,7 +233,7 @@
FROM pv_health_index_latest_data
WHERE ANALYSIS_OBJ_TYPE = '片区'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE - INTERVAL 1 DAY
GROUP BY ARAE
)
) a
......@@ -1343,7 +1343,7 @@
ANALYSIS_OBJ_TYPE = '场站'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -1369,7 +1369,7 @@
ANALYSIS_OBJ_TYPE = '场站'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -1401,7 +1401,7 @@
ANALYSIS_OBJ_TYPE = '设备'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -1427,7 +1427,7 @@
ANALYSIS_OBJ_TYPE = '子阵'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -1462,7 +1462,7 @@
ANALYSIS_OBJ_TYPE = '子系统'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -1488,7 +1488,7 @@
ANALYSIS_OBJ_TYPE = '设备'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -1521,7 +1521,7 @@
ANALYSIS_OBJ_TYPE = '测点'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -1547,7 +1547,7 @@
ANALYSIS_OBJ_TYPE = '测点'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
......@@ -1628,7 +1628,7 @@
fan_health_index_latest_data
<where>
ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURDATE() - INTERVAL 1 DAY
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
AND ANALYSIS_OBJ_TYPE = '片区'
......@@ -1649,7 +1649,7 @@
pv_health_index_latest_data
<where>
ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURDATE() - INTERVAL 1 DAY
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
AND ANALYSIS_OBJ_TYPE = '片区'
......@@ -1667,13 +1667,13 @@
</select>
<select id="getDateInfoBy15" resultType="java.util.Map">
SELECT
DATE_FORMAT( DATE_ADD(( DATE( DATE_ADD( now(), INTERVAL - 15 DAY ))), INTERVAL @s DAY ), '%Y-%m-%d' ) AS date,
DATE_FORMAT( DATE_ADD(( DATE( DATE_ADD( CURDATE() - INTERVAL 1 DAY, INTERVAL - 15 DAY ))), INTERVAL @s DAY ), '%Y-%m-%d' ) AS date,
@s := @s + 1 AS `index`
FROM
mysql.help_topic,
( SELECT @s := 1 ) temp
WHERE
DATEDIFF( now(), DATE( DATE_ADD( now(), INTERVAL - 15 DAY )) ) >= @s
DATEDIFF( CURDATE() - INTERVAL 1 DAY, DATE( DATE_ADD( CURDATE() - INTERVAL 1 DAY, INTERVAL - 15 DAY )) ) >= @s
</select>
<select id="getDateInfo" resultType="java.util.Map">
SELECT
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java
View file @ a2bf252c
......@@ -1240,9 +1240,8 @@ public class MonitorFanIdxController extends BaseController {
BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
//警情状态
List<QueryBuilder> should = boolMustAll.should();
String[] keys = new String[]{"日发电量", "月发电量", "年发电量"};
String[] keys = new String[]{"日发电量", "月发电量", "年发电量","有功功率"};
List<String> list = Arrays.asList(keys);
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
if (!stationBasic.getStationType().equals("FDZ")) {
......@@ -1303,6 +1302,8 @@ public class MonitorFanIdxController extends BaseController {
break;
case "年发电量":
map.put("yearNum", String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(value) * CommonConstans.pvGenPoweActorCurrentData));
case "有功功率":
map.put("yggl", String.format(CommonConstans.Fourdecimalplaces,Double.valueOf(value)));
}
}else{
......@@ -1324,6 +1325,8 @@ public class MonitorFanIdxController extends BaseController {
// case CommonConstans.taiHeGenIndicatorYear:
// map.put("yearNum", value);
// break;
case "有功功率":
map.put("yggl", String.format(CommonConstans.Fourdecimalplaces,Double.valueOf(value)));
}
}
......
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