Skip to content

A
amos-boot-zx-biz
Commit 8a8f57e4 authored by wujiang's avatar wujiang
Browse files
Options

人大金仓适配

parent 047108cc
Show whitespace changes
Inline Side-by-side
Showing with 360 additions and 128 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java
View file @ 8a8f57e4
......@@ -15,7 +15,7 @@ import java.util.Map;
* @createDate: 2023/11/9
*/
public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
@Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
@Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
CompanyModel getCompanyInfoByOrgCode(String orgCode);
}
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 @ 8a8f57e4
......@@ -60,6 +60,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvHealthIndexDayMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvHealthIndexMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.tdMapper2.PvWaringRecordMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.utils.TimeRangeUtil;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
......@@ -154,21 +155,26 @@ public class TDBigScreenAnalyseController extends BaseController {
}
HashMap<String, Object> resultMap = new HashMap<>();
List<Map<String, String>> dateInfoBy15 = new ArrayList<>();
//List<Map<String, String>> dateInfoBy15 = new ArrayList<>();
List<String> dateList=new ArrayList<>();
if (startTime != null && endTime != null) {
if (WarningPeriodEnum.DAY.getName().equals(analysisType)) {
dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfo(startTime, endTime);
//dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfo(startTime, endTime);
dateList=TimeRangeUtil.getDateInfo(startTime, endTime);
} else if (WarningPeriodEnum.HOUR.getName().equals(analysisType)) {
dateInfoBy15 = idxBizFanHealthIndexMapper.getHourInfo(startTime, endTime);
//dateInfoBy15 = idxBizFanHealthIndexMapper.getHourInfo(startTime, endTime);
dateList=TimeRangeUtil.getHourInfo(startTime, endTime);
} else if (WarningPeriodEnum.MINUTES.getName().equals(analysisType)) {
dateInfoBy15 = idxBizFanHealthIndexMapper.getMomentInfo(startTime, endTime);
//dateInfoBy15 = idxBizFanHealthIndexMapper.getMomentInfo(startTime, endTime);
dateList=TimeRangeUtil.getMomentInfo(startTime, endTime);
}
} else {
dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfoBy15();
//dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfoBy15();
dateList=TimeRangeUtil.getDateInfoBy15();
}
List<String> valueList = new ArrayList<>();
String finalStationCode = stationCode;
List<String> dateList = dateInfoBy15.stream().map(i -> i.get("date")).collect(Collectors.toList());
// List<String> dateList = dateInfoBy15.stream().map(i -> i.get("date")).collect(Collectors.toList());
String finalAreaCode = areaCode;
if ((WarningPeriodEnum.DAY.getName().equals(analysisType) || analysisType == null)) {
List<String> fullDateList = dateList.stream().map(s -> {
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/kafka/KafkaConsumerService.java
View file @ 8a8f57e4
......@@ -41,7 +41,7 @@ import static com.yeejoin.amos.boot.module.jxiop.biz.kafka.Constant.*;
* @create 2022/11/1 10:06
**/
@Slf4j
@Service
//@Service
public class KafkaConsumerService {
@Autowired
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java
View file @ 8a8f57e4
......@@ -31,13 +31,13 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
BigDecimal getHealthScoreInfoByParam(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode,
@Param("analysisType") String analysisType);
List<Map<String, String>> getDateInfoBy15();
List<Map<String, String>> getDateInfo(Date startTime, Date endTime);
List<Map<String, String>> getHourInfo(Date startTime, Date endTime);
List<Map<String, String>> getMomentInfo(Date startTime, Date endTime);
// List<Map<String, String>> getDateInfoBy15();
//
// List<Map<String, String>> getDateInfo(Date startTime, Date endTime);
//
// List<Map<String, String>> getHourInfo(Date startTime, Date endTime);
//
// List<Map<String, String>> getMomentInfo(Date startTime, Date endTime);
List<Map<String, Object>> getHealthListInfo(@Param("areaCode") String areaCode,
@Param("stationCode") String stationCode, @Param("gatewayIds") List<String> gatewayIds);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/utils/TimeRangeUtil.java 0 → 100644
View file @ 8a8f57e4
package com.yeejoin.amos.boot.module.jxiop.biz.utils;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class TimeRangeUtil {
// public static void main(String[] args) throws ParseException {
// LocalDate start = LocalDate.of(2024, 7, 5);
// LocalDate end = LocalDate.of(2024, 7, 9);
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
// Date date = sdf.parse("2024-07-05");
// Date date2 = sdf.parse("2024-07-09");
// //getDateInfo(date, date2);
// //getHourInfo(date, date2);
// //getMomentInfo(date, date2);
// }
public static List<String> getDateInfoBy15() {
List<String> list = new ArrayList<String>();
LocalDate today = LocalDate.now().minusDays(1); // 获取今天的日期
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
for (int i = 0; i < 15; i++) {
LocalDate previousDay = today.minusDays(i);
String formattedDate = previousDay.format(formatter);
list.add(formattedDate);
}
return list;
}
public static List<String> getDateInfo(Date startTime, Date endTime) {
List<String> list = new ArrayList<String>();
List<LocalDate> dates = new ArrayList<>();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
LocalDate startInclusive = LocalDate.parse(sdf.format(startTime));
LocalDate endExclusive = LocalDate.parse(sdf.format(endTime));
while (!startInclusive.isAfter(endExclusive.minusDays(0))) {
dates.add(startInclusive);
String formattedDate = startInclusive.format(formatter);
list.add(formattedDate);
startInclusive = startInclusive.plusDays(1);
}
return list;
}
public static List<String> getHourInfo(Date startTime, Date endTime) {
List<String> list = new ArrayList<String>();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
LocalDateTime startInclusive = LocalDateTime.parse(sdf.format(startTime),formatter);
LocalDateTime endExclusive = LocalDateTime.parse(sdf.format(endTime),formatter);
List<LocalDateTime> hourlyList = new ArrayList<>();
LocalDateTime currentDateTime = startInclusive;
// 当前时间小于或等于结束时间
while (currentDateTime.isBefore(endExclusive.plusDays(1)) || currentDateTime.isEqual(endExclusive)) {
// 仅在开始和结束时间范围内添加每小时
if (currentDateTime.isAfter(startInclusive.minusSeconds(1))
&& currentDateTime.isBefore(endExclusive.plusSeconds(1))) {
hourlyList.add(currentDateTime.withMinute(0).withSecond(0).withNano(0)); // 移除分钟、秒和纳秒
list.add(formatter.format(currentDateTime));
}
// 移动到下一个小时
currentDateTime = currentDateTime.plus(1, ChronoUnit.HOURS);
}
return list;
}
public static List<String> getMomentInfo(Date startTime, Date endTime) {
List<String> list = new ArrayList<String>();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
LocalDateTime startInclusive = LocalDateTime.parse(sdf.format(startTime),formatter);
LocalDateTime endExclusive = LocalDateTime.parse(sdf.format(endTime),formatter);
List<LocalDateTime> hourlyList = new ArrayList<>();
LocalDateTime currentDateTime = startInclusive;
// 当前时间小于或等于结束时间
while (currentDateTime.isBefore(endExclusive.plusDays(1)) || currentDateTime.isEqual(endExclusive)) {
// 仅在开始和结束时间范围内添加每小时
if (currentDateTime.isAfter(startInclusive.minusSeconds(1))
&& currentDateTime.isBefore(endExclusive.plusSeconds(1))) {
hourlyList.add(currentDateTime.withMinute(0).withSecond(0).withNano(0)); // 移除分钟、秒和纳秒
list.add(formatter.format(currentDateTime));
}
// 移动到下一个小时
currentDateTime = currentDateTime.plus(10, ChronoUnit.MINUTES);
}
for(String s: list)
{
System.out.println(s);
}
return list;
}
}
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application-kingbase8.properties
View file @ 8a8f57e4
## DB properties:
## db1-production database
spring.db1.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db1.datasource.url=jdbc:mysql://10.20.1.157:54321/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db1.datasource.url=jdbc:kingbase8://10.20.1.176:54321/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db1.datasource.username=root
spring.db1.datasource.password=Yeejoin@2020
spring.db1.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
spring.db1.datasource.driver-class-name=com.kingbase8.Driver
## db2-sync_data
spring.db2.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db2.datasource.url=jdbc:mysql://10.20.1.157:3306/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db2.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_idx_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db2.datasource.username=root
spring.db2.datasource.password=Yeejoin@2020
spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
spring.db2.datasource.driver-class-name=com.kingbase8.Driver
## db5-sync_data
spring.db5.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db5.datasource.url=jdbc:mysql://10.20.1.157:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db5.datasource.url=jdbc:kingbase8://10.20.1.176:54321/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db5.datasource.username=root
spring.db5.datasource.password=Yeejoin@2020
spring.db5.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
spring.db5.datasource.driver-class-name=com.kingbase8.Driver
## amos-project
spring.db6.datasource.type: com.alibaba.druid.pool.DruidDataSource
spring.db6.datasource.url=jdbc:mysql://10.20.1.157:3306/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db6.datasource.url=jdbc:kingbase8://10.20.1.176:54321/amos_project?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.db6.datasource.username=root
spring.db6.datasource.password=Yeejoin@2020
spring.db6.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
spring.db6.datasource.driver-class-name=com.kingbase8.Driver
## eureka properties:
eureka.instance.hostname=10.20.1.160
eureka.instance.hostname=47.92.234.253
eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
## redis properties:
spring.redis.database=1
spring.redis.host=10.20.1.210
spring.redis.host=47.92.234.253
spring.redis.port=6379
spring.redis.password=yeejoin@2020
......@@ -66,10 +66,10 @@ lettuce.timeout=10000
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://10.20.1.210:2883
emqx.broker=tcp://47.92.234.253:2883
emqx.user-name=admin
emqx.password=public
mqtt.scene.host=mqtt://10.20.1.210:8083/mqtt
mqtt.scene.host=mqtt://47.92.234.253:8083/mqtt
mqtt.client.product.id=mqtt
mqtt.topic=topic_mqtt
spring.mqtt.completionTimeout=3000
......@@ -150,7 +150,7 @@ amos.secret.key=qaz
#eureka.instance.ip-address=172.16.3.122
spring.activemq.broker-url=tcp://10.20.1.210:61616
spring.activemq.broker-url=tcp://47.92.234.253:61616
spring.activemq.user=admin
spring.activemq.password=admin
spring.jms.pub-sub-domain=false
......@@ -198,3 +198,6 @@ base.url.GKHF=http://139.9.171.247:8052/intelligent-analysis/working-condition-d
base.url.ZXZ=http://139.9.171.247:8052/intelligent-analysis/central-value
#ָ���������㷨����
base.url.zsfx:http://139.9.171.247:8052/intelligent-analysis/index-analysis
forecast.url=
logic=
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application.properties
View file @ 8a8f57e4
......@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-ANALYSE-WJ
server.servlet.context-path=/jxiop-analyse
server.port=33400
server.uri-encoding=UTF-8
spring.profiles.active=dev1
spring.profiles.active=kingbase8
spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
logging.config=classpath:logback-${spring.profiles.active}.xml
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/logback-kingbase8.xml 0 → 100644
View file @ 8a8f57e4
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="log" />
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
<!-- 按照每天生成日志文件 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/ccs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>7</MaxHistory>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>${LOG_PATTERN}</pattern>
</encoder>
<!--日志文件最大的大小-->
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>30mb</MaxFileSize>
</triggeringPolicy>
</appender>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="DEBUG"/>
<logger name="java.sql.Connection" level="DEBUG"/>
<logger name="java.sql.Statement" level="DEBUG"/>
<logger name="java.sql.PreparedStatement" level="DEBUG"/>
<logger name="com.baomidou.mybatisplus" level="DEBUG"/>
<logger name="org.springframework" level="DEBUG"/>
<logger name="org.typroject" level="DEBUG"/>
<logger name="com.yeejoin" level="DEBUG"/>
<!-- 日志输出级别 -->
<root level="INFO">
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
</root>
</configuration>
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml
View file @ 8a8f57e4
......@@ -12,7 +12,7 @@
idx_biz_fan_health_index
<where>
ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
AND ANALYSIS_OBJ_TYPE = '片区'
......@@ -33,7 +33,7 @@
idx_biz_pv_health_index
<where>
ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
AND ANALYSIS_OBJ_TYPE = '片区'
......@@ -61,15 +61,18 @@
<where>
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
......@@ -92,15 +95,18 @@
<where>
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
......@@ -124,7 +130,8 @@
${tableName}
<where>
ANALYSIS_TYPE = '按天'
AND DATE_ADD(DATE_FORMAT( REC_DATE, "%Y-%m-%d" ),INTERVAL 1 DAY) = CURRENT_DATE
<!-- AND DATE_ADD(DATE_FORMAT( REC_DATE, '%Y-%m-%d' ),INTERVAL 1 DAY) = CURRENT_DATE-->
AND CURRENT_DATE = get_time_add(1,'DAY')
<if test="stationCode != null and stationCode != ''">
AND GATEWAY_ID = #{stationCode}
AND ANALYSIS_OBJ_TYPE = '场站'
......@@ -150,7 +157,7 @@
LEFT JOIN (
SELECT
HEALTH_INDEX,
DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) AS recDate
DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) AS recDate
FROM
idx_biz_pv_health_index
<where>
......@@ -177,7 +184,7 @@
(
SELECT
HEALTH_INDEX,
DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) AS recDate
DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) AS recDate
FROM
idx_biz_fan_health_index
<where>
......@@ -201,7 +208,7 @@
</if>
</where>
)
) b ON DATE_FORMAT( b.recDate, "%Y-%m-%d" ) = a.date
) b ON DATE_FORMAT( b.recDate, '%Y-%m-%d' ) = a.date
GROUP BY
a.date
</select>
......@@ -211,7 +218,8 @@
count(1) as num
FROM ${tableName} a
where (a.DISPOSOTION_STATE = '待确认')
or (a.DISPOSOTION_STATE = '已确认' and a.DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY ))
<!-- or (a.DISPOSOTION_STATE = '已确认' and a.DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY ))-->
or (a.DISPOSOTION_STATE = '已确认' and a.DISPOSOTION_DATE > get_time_sub(3,'DAY')
group by ARAE,
WARNING_NAME
</select>
......@@ -224,7 +232,8 @@
FROM fan_health_index_latest_data
WHERE ANALYSIS_OBJ_TYPE = '片区'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURRENT_DATE - INTERVAL 1 DAY-->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
GROUP BY ARAE
UNION ALL
(
......@@ -233,7 +242,8 @@
FROM pv_health_index_latest_data
WHERE ANALYSIS_OBJ_TYPE = '片区'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURRENT_DATE - INTERVAL 1 DAY
<!--AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURRENT_DATE - INTERVAL 1 DAY-->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
GROUP BY ARAE
)
) a
......@@ -249,12 +259,14 @@
FROM idx_biz_fan_warning_record wr
WHERE ((wr.DISPOSOTION_STATE = '待确认')
or (wr.DISPOSOTION_STATE = '已确认' and
wr.DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY )))
<!--wr.DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY )))-->
wr.DISPOSOTION_DATE > get_time_sub(3,'DAY')
AND wr.STATION = STATION
) AS allNum
FROM idx_biz_fan_warning_record
WHERE ((DISPOSOTION_STATE = '待确认')
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY )))
<!--or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY )))-->
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > get_time_sub(3,'DAY')
GROUP BY STATION,
WARNING_NAME
UNION ALL
......@@ -265,12 +277,14 @@
FROM idx_biz_pv_warning_record wr
WHERE ((wr.DISPOSOTION_STATE = '待确认')
or (wr.DISPOSOTION_STATE = '已确认' and
wr.DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY )))
<!--wr.DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY )))-->
wr.DISPOSOTION_DATE > get_time_sub(3,'DAY')
AND wr.STATION = STATION
) AS allNum
FROM idx_biz_pv_warning_record
WHERE ((DISPOSOTION_STATE = '待确认')
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY )))
<!--or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD(now(), INTERVAL - 3 DAY )))-->
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > get_time_sub(3,'DAY')
GROUP BY STATION,
WARNING_NAME
) a
......@@ -290,7 +304,8 @@
<where>
ANALYSIS_OBJ_TYPE = '场站'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE - INTERVAL 1 DAY
<!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL 1 DAY-->
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
</if>
......@@ -306,7 +321,8 @@
<where>
ANALYSIS_OBJ_TYPE = '场站'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE - INTERVAL 1 DAY
<!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL 1 DAY-->
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
</if>
......@@ -330,7 +346,8 @@
idx_biz_fan_warning_record
<where>
((DISPOSOTION_STATE = '待确认')
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
<!--or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))-->
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > get_time_sub(3,'DAY')
<if test="stationCode != null and stationCode != ''">
and GATEWAY_ID = #{stationCode}
</if>
......@@ -342,7 +359,8 @@
idx_biz_pv_warning_record
<where>
((DISPOSOTION_STATE = '待确认')
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
<!--or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))-->
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > get_time_sub(3,'DAY')
<if test="stationCode != null and stationCode != ''">
and GATEWAY_ID = #{stationCode}
</if>
......@@ -359,7 +377,8 @@
(select count(1) from ${tableName} as tb
<where>
((tb.DISPOSOTION_STATE = '待确认')
or (tb.DISPOSOTION_STATE = '已确认' and tb.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
<!--or (tb.DISPOSOTION_STATE = '已确认' and tb.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))-->
or (tb.DISPOSOTION_STATE = '已确认' and tb.DISPOSOTION_DATE > get_time_sub(3,'DAY') ))
and tb.POINT_NAME = a.POINT_NAME
<if test="areaCode != null and areaCode != ''">
and tb.ARAE like concat('%', #{areaCode}, '%')
......@@ -370,7 +389,8 @@
${tableName} a
<where>
((a.DISPOSOTION_STATE = '待确认')
or (a.DISPOSOTION_STATE = '已确认' and a.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
<!--or (a.DISPOSOTION_STATE = '已确认' and a.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))-->
or (a.DISPOSOTION_STATE = '已确认' and a.DISPOSOTION_DATE > get_time_sub(3,'DAY') ))
<if test="areaCode != null and areaCode != ''">
and a.ARAE like concat('%', #{areaCode}, '%')
</if>
......@@ -393,7 +413,8 @@
( SELECT count( 1 ) FROM idx_biz_pv_warning_record
<where>
((DISPOSOTION_STATE = '待确认')
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
<!--or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))-->
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > get_time_sub(3,'DAY') ))
AND wr.POINT_NAME = POINT_NAME
<if test="areaCode != null and areaCode != ''">
and ARAE like concat('%', #{areaCode}, '%')
......@@ -404,7 +425,8 @@
idx_biz_pv_warning_record wr
<where>
((wr.DISPOSOTION_STATE = '待确认')
or (wr.DISPOSOTION_STATE = '已确认' and wr.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
<!--or (wr.DISPOSOTION_STATE = '已确认' and wr.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))-->
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > get_time_sub(3,'DAY') ))
<if test="areaCode != null and areaCode != ''">
and wr.ARAE like concat('%', #{areaCode}, '%')
</if>
......@@ -419,7 +441,8 @@
( SELECT count( 1 ) FROM idx_biz_fan_warning_record
<where>
((DISPOSOTION_STATE = '待确认')
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
<!--or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))-->
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > get_time_sub(3,'DAY') ))
AND wr.POINT_NAME = POINT_NAME
<if test="areaCode != null and areaCode != ''">
and ARAE like concat('%', #{areaCode}, '%')
......@@ -430,7 +453,8 @@
idx_biz_fan_warning_record wr
<where>
((wr.DISPOSOTION_STATE = '待确认')
or (wr.DISPOSOTION_STATE = '已确认' and wr.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))
<!--or (wr.DISPOSOTION_STATE = '已确认' and wr.DISPOSOTION_DATE > DATE_ADD( now(), INTERVAL - 3 DAY ) ))-->
or (DISPOSOTION_STATE = '已确认' and DISPOSOTION_DATE > get_time_sub(3,'DAY') ))
<if test="areaCode != null and areaCode != ''">
and wr.ARAE like concat('%', #{areaCode}, '%')
</if>
......@@ -446,14 +470,15 @@
</select>
<select id="getSubSystemInfo" resultType="java.util.Map">
SELECT
round(IFNULL( HEALTH_INDEX, 100 ), 1) AS healthIndex,
round(IFNULL( MAX(HEALTH_INDEX), 100 ), 1) AS healthIndex,
SUB_SYSTEM AS subSystem
FROM
fan_health_index_latest_data
<where>
ANALYSIS_OBJ_TYPE = '子系统'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE - INTERVAL 1 DAY
<!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL 1 DAY-->
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
<if test="equipmentName != null and equipmentName != ''">
AND EQUIPMENT_NAME like concat( '%', #{equipmentName} ,'风机')
</if>
......@@ -490,7 +515,8 @@
<where>
ANALYSIS_OBJ_TYPE = '设备'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE - INTERVAL 1 DAY
<!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL 1 DAY-->
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
<if test="gatewayId != null and gatewayId != ''">
AND GATEWAY_ID = #{gatewayId}
</if>
......@@ -541,7 +567,7 @@
</select>
<select id="getHealthInfoBySubSystem" resultType="java.util.Map">
SELECT
IFNULL(HEALTH_INDEX, 100) AS healthIndex,
IFNULL(MAX(HEALTH_INDEX), 100) AS healthIndex,
POINT_NAME AS pointName
FROM
fan_health_index_latest_data
......@@ -608,7 +634,8 @@
<where>
ANALYSIS_OBJ_TYPE = '子阵'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE - INTERVAL 1 DAY
<!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL 1 DAY-->
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
<if test="gatewayId != null and gatewayId != ''">
AND GATEWAY_ID = #{gatewayId}
</if>
......@@ -625,7 +652,8 @@
<where>
ANALYSIS_OBJ_TYPE = '设备'
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURRENT_DATE - INTERVAL 1 DAY
<!--AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURRENT_DATE - INTERVAL 1 DAY-->
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
<if test="subarray != null and subarray != ''">
AND SUBARRAY = concat('#', #{subarray})
</if>
......@@ -782,7 +810,7 @@
FROM idx_biz_fan_health_index
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
GROUP BY STATION
UNION ALL
(
......@@ -791,7 +819,7 @@
FROM idx_biz_pv_health_index
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
GROUP BY STATION
)
) a
......@@ -806,7 +834,7 @@
FROM idx_biz_fan_health_index
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
GROUP BY EQUIPMENT_NAME
UNION ALL
(
......@@ -815,7 +843,7 @@
FROM idx_biz_pv_health_index
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
GROUP BY SUBARRAY
)
) a
......@@ -834,7 +862,7 @@
FROM idx_biz_fan_health_index
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
GROUP BY SUB_SYSTEM
UNION ALL
(
......@@ -843,7 +871,7 @@
FROM idx_biz_pv_health_index
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
GROUP BY EQUIPMENT_NAME
)
) a
......@@ -855,21 +883,21 @@
</select>
<select id="getPointNameIndexInfo" resultType="java.util.Map">
SELECT IFNULL(HEALTH_INDEX, 100) AS healthIndex,
concat(STATION, '_', INDEX_ADDRESS) as gatewayIndexAddress
SELECT IFNULL(MAX(HEALTH_INDEX), 100) AS healthIndex,
concat(MAX(STATION), '_', INDEX_ADDRESS) as gatewayIndexAddress
FROM idx_biz_fan_health_index
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
GROUP BY INDEX_ADDRESS
UNION ALL
(
SELECT IFNULL(HEALTH_INDEX, 100) AS healthIndex,
concat(STATION, '_', INDEX_ADDRESS) as gatewayIndexAddress
SELECT IFNULL(MAX(HEALTH_INDEX), 100) AS healthIndex,
concat(MAX(STATION), '_', INDEX_ADDRESS) as gatewayIndexAddress
FROM idx_biz_pv_health_index
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
GROUP BY INDEX_ADDRESS
)
</select>
......@@ -932,7 +960,7 @@
) b
LEFT JOIN `idx_biz_fan_health_index` `ibfhi` ON ( ( `b`.`EQUIPMENT_NAME` = `ibfhi`.`EQUIPMENT_NAME` ) )
AND ibfhi.ANALYSIS_OBJ_TYPE = '设备' AND ANALYSIS_OBJ_TYPE = '设备' AND ANALYSIS_TYPE = '按天' AND
DATE_FORMAT(ibfhi.REC_DATE,"%Y-%m-%d") = DATE_FORMAT(NOW(),"%Y-%m-%d")
DATE_FORMAT(ibfhi.REC_DATE,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
<where>
<if test="STATION != '' and STATION != null">
b.STATION = #{STATION}
......@@ -966,7 +994,7 @@
) b
LEFT JOIN `idx_biz_fan_health_index` `ibfhi` ON ( ( `b`.`EQUIPMENT_NAME` = `ibfhi`.`EQUIPMENT_NAME` ) )
AND ibfhi.ANALYSIS_OBJ_TYPE = '设备' AND ANALYSIS_OBJ_TYPE = '设备' AND ANALYSIS_TYPE = '按天' AND
DATE_FORMAT(ibfhi.REC_DATE,"%Y-%m-%d") = DATE_FORMAT(NOW(),"%Y-%m-%d")
DATE_FORMAT(ibfhi.REC_DATE,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
<where>
<if test="STATION != '' and STATION != null">
b.STATION = #{STATION}
......@@ -999,7 +1027,7 @@
) b
LEFT JOIN `idx_biz_fan_health_index` `ibfhi` ON ( ( `b`.`EQUIPMENT_NAME` = `ibfhi`.`EQUIPMENT_NAME` ) )
AND ibfhi.ANALYSIS_OBJ_TYPE = '设备' AND ANALYSIS_OBJ_TYPE = '设备' AND ANALYSIS_TYPE = '按天' AND
DATE_FORMAT(ibfhi.REC_DATE,"%Y-%m-%d") = DATE_FORMAT(NOW(),"%Y-%m-%d")
DATE_FORMAT(ibfhi.REC_DATE,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
<where>
<if test="STATION != '' and STATION != null">
b.STATION = #{STATION}
......@@ -1034,9 +1062,11 @@
`idx_biz_fan_health_index`
WHERE
ANALYSIS_OBJ_TYPE = '测点'
AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 1 HOUR ) )
<!--AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 1 HOUR ) )-->
AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= get_time_sub(1,'HOUR') )
OR ( REC_DATE >= CURRENT_DATE ( ) AND ANALYSIS_TYPE = '按天' )
OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 10 MINUTE ) )
<!--OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 10 MINUTE ) )-->
OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= get_time_sub(10,'MINUTE'))
) b
INNER JOIN idx_biz_fan_warning_rule_set rule ON rule.ANALYSIS_POINT_ID = b.ANALYSIS_OBJ_SEQ
AND rule.WARNING_NAME = '注意'
......@@ -1080,9 +1110,11 @@
`idx_biz_fan_health_index`
WHERE
ANALYSIS_OBJ_TYPE = '测点'
AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 1 HOUR ) )
<!--AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 1 HOUR ) )-->
AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= get_time_sub(1,'HOUR') )
OR ( REC_DATE >= CURRENT_DATE ( ) AND ANALYSIS_TYPE = '按天' )
OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 10 MINUTE ) )
<!--OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 10 MINUTE ) )-->
OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= get_time_sub(10,'MINUTE'))
) b
INNER JOIN idx_biz_fan_warning_rule_set rule ON rule.ANALYSIS_POINT_ID = b.ANALYSIS_OBJ_SEQ
AND rule.WARNING_NAME = '注意'
......@@ -1124,9 +1156,11 @@
`idx_biz_fan_health_index`
WHERE
ANALYSIS_OBJ_TYPE = '测点'
AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 1 HOUR ) )
<!--AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 1 HOUR ) )-->
AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= get_time_sub(1,'HOUR') )
OR ( REC_DATE >= CURRENT_DATE ( ) AND ANALYSIS_TYPE = '按天' )
OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 10 MINUTE ) )
<!--OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 10 MINUTE ) )-->
OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= get_time_sub(10,'MINUTE'))
) b
INNER JOIN idx_biz_fan_warning_rule_set rule ON rule.ANALYSIS_POINT_ID = b.ANALYSIS_OBJ_SEQ
AND rule.WARNING_NAME = '注意'
......@@ -1203,9 +1237,12 @@
WHERE
ANALYSIS_OBJ_TYPE = '测点'
<if test="(startTime == null or startTime == '' ) and (endTime == null or endTime =='') ">
AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 15 HOUR ) )
OR ( REC_DATE >=DATE_SUB( NOW(), INTERVAL 15 DAY ) AND ANALYSIS_TYPE = '按天' )
OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 150 MINUTE ) )
<!--AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 15 HOUR ) )-->
AND ( ANALYSIS_TYPE = '按小时' AND REC_DATE >= get_time_sub(15,'HOUR'))
<!--OR ( REC_DATE >=DATE_SUB( NOW(), INTERVAL 15 DAY ) AND ANALYSIS_TYPE = '按天' )-->
OR ( ANALYSIS_TYPE = '按天' AND REC_DATE >= get_time_sub(15,'DAY'))
<!--OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= DATE_SUB( NOW( ), INTERVAL 150 MINUTE ) )-->
OR ( ANALYSIS_TYPE = '按10分钟' AND REC_DATE >= get_time_sub(150,'MINUTE'))
</if>
<if test="startTime != null and startTime != '' or endTime != null and endTime != '' ">
AND REC_DATE >= #{startTime}
......@@ -1343,15 +1380,18 @@
ANALYSIS_OBJ_TYPE = '场站'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
<foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
......@@ -1369,15 +1409,18 @@
ANALYSIS_OBJ_TYPE = '场站'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
<foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
......@@ -1401,15 +1444,18 @@
ANALYSIS_OBJ_TYPE = '设备'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
<foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
......@@ -1427,15 +1473,18 @@
ANALYSIS_OBJ_TYPE = '子阵'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
<foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
......@@ -1462,15 +1511,18 @@
ANALYSIS_OBJ_TYPE = '子系统'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
<foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
......@@ -1488,15 +1540,18 @@
ANALYSIS_OBJ_TYPE = '设备'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
<foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
......@@ -1514,22 +1569,25 @@
</select>
<select id="getPointNameIndexInfoByParam" resultType="java.util.Map">
SELECT
ROUND(IFNULL(HEALTH_INDEX, 100), 1) AS healthIndex,
concat(STATION, '_', INDEX_ADDRESS) as gatewayIndexAddress
ROUND(IFNULL(MAX(HEALTH_INDEX), 100), 1) AS healthIndex,
concat(MAX(STATION), '_', INDEX_ADDRESS) as gatewayIndexAddress
FROM fan_health_index_latest_data
<where>
ANALYSIS_OBJ_TYPE = '测点'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
<foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
......@@ -1540,22 +1598,25 @@
GROUP BY INDEX_ADDRESS
UNION ALL
(
SELECT IFNULL(HEALTH_INDEX, 100) AS healthIndex,
concat(STATION, '_', INDEX_ADDRESS) as gatewayIndexAddress
SELECT IFNULL(MAX(HEALTH_INDEX), 100) AS healthIndex,
concat(MAX(STATION), '_', INDEX_ADDRESS) as gatewayIndexAddress
FROM pv_health_index_latest_data
<where>
ANALYSIS_OBJ_TYPE = '测点'
<if test="analysisType == '按天' or analysisType == null or analysisType == ''">
AND ANALYSIS_TYPE = '按天'
AND DATE_FORMAT(REC_DATE, "%Y-%m-%d") = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = CURDATE() - INTERVAL 1 DAY -->
AND DATE_FORMAT(REC_DATE, '%Y-%m-%d') = get_time_sub(1,'DAY')
</if>
<if test="analysisType == '按小时'">
AND ANALYSIS_TYPE = '按小时'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE )
<!--AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 59 MINUTE ) -->
AND REC_DATE >= get_time_sub(59,'MINUTE')
</if>
<if test="analysisType == '按10分钟'">
AND ANALYSIS_TYPE = '按10分钟'
AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE )
<!-- AND REC_DATE >= DATE_SUB( NOW(), INTERVAL 9 MINUTE ) -->
AND REC_DATE >= get_time_sub(9,'MINUTE')
</if>
<if test="gatewayIds != null and gatewayIds.size() > 0"> and GATEWAY_ID in
<foreach item="item" index="index" collection="gatewayIds" open="(" separator="," close=")">
......@@ -1628,7 +1689,8 @@
fan_health_index_latest_data
<where>
ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURDATE() - INTERVAL 1 DAY-->
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
AND ANALYSIS_OBJ_TYPE = '片区'
......@@ -1649,7 +1711,8 @@
pv_health_index_latest_data
<where>
ANALYSIS_TYPE = '按天'
AND DATE_FORMAT( REC_DATE, "%Y-%m-%d" ) = CURDATE() - INTERVAL 1 DAY
<!-- AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = CURDATE() - INTERVAL 1 DAY-->
AND DATE_FORMAT( REC_DATE, '%Y-%m-%d' ) = get_time_sub(1,'DAY')
<if test="areaCode != null and areaCode != ''">
AND ARAE like concat('%', #{areaCode}, '%')
AND ANALYSIS_OBJ_TYPE = '片区'
......@@ -1665,7 +1728,7 @@
)
) a
</select>
<select id="getDateInfoBy15" resultType="java.util.Map">
<!--<select id="getDateInfoBy15" resultType="java.util.Map">
SELECT
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`
......@@ -1704,7 +1767,7 @@
( SELECT @s := 1 ) temp
WHERE
TIMESTAMPDIFF( MINUTE, #{startTime} , #{endTime})/10 >= @s-1
</select>
</select>-->
<select id="getHealthIndexByIndexAddress" resultType="java.util.Map">
select ROUND(ifnull(HEALTH_INDEX, 100.0), 1) as healthIndex,
......
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizTableMapper.xml
View file @ 8a8f57e4
......@@ -5,10 +5,10 @@
SELECT
DISTINCT ${column} AS text,
<if test="valueColumn != null and valueColumn != ''">
${valueColumn} AS value
MAX(${valueColumn}) AS value
</if>
<if test="valueColumn == null or valueColumn == ''">
${column} AS value
MAX(${column}) AS value
</if>
FROM
${tableName}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/HouseholdPv.java
View file @ 8a8f57e4
......@@ -132,7 +132,7 @@ public class HouseholdPv extends BaseEntity {
/**
* 告警等级
*/
@TableField("level")
@TableField("level_")
private String level;
/**
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java
View file @ 8a8f57e4
......@@ -243,7 +243,7 @@ public class LargeScreenImpl {
}
@Scheduled(cron = "0/10 * * * * ?")
//@PostConstruct
@PostConstruct
private void sendQYYXZBMqtt() {
List<StationCacheInfoDto> listStationCacheInfoDto = commonServiceImpl.getListStationCacheInfoDto();
Map<String, List<StationCacheInfoDto>> belongAreaList = listStationCacheInfoDto.stream()
......@@ -434,7 +434,7 @@ public class LargeScreenImpl {
// 计算昨天日期
LocalDate yesterday = currentDate.minusDays(1);
formattedDate = yesterday.format(formatter);
data = httpRequestUtil.getResPonse(requestUrl + "&reporting_data=" + formattedDate, Constants.REQUEST_GET,
data = httpRequestUtil.getResPonse(requestUrl + "&reporting_data=" + formattedDate+"&code="+s, Constants.REQUEST_GET,
"", Constants.resovleRule_data);
}
mapdta.put("SS", data.getString("average_wind_speed"));
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/amosprojectmapper/UserEmpowerMapper.java
View file @ 8a8f57e4
......@@ -17,7 +17,7 @@ import java.util.Map;
* @createDate: 2023/11/9
*/
public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
@Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
@Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
CompanyModel getCompanyInfoByOrgCode(String orgCode);
List<CompanyModel> getCompanyBoList(@Param("companyType") String companyType,
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/PrivilegeCompany.java
View file @ 8a8f57e4
......@@ -22,7 +22,7 @@ public class PrivilegeCompany extends BaseEntity {
private Long parentId;
@TableField("REGION_SEQ")
private String regionSeq;
@TableField("LEVEL")
@TableField("LEVEL_")
private String level;
@TableField("EMAIL")
private String email;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/amosprojectmapper/UserEmpowerMapper.java
View file @ 8a8f57e4
......@@ -12,7 +12,7 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
* @createDate: 2023/11/9
*/
public interface UserEmpowerMapper extends BaseMapper<StdUserEmpower> {
@Select("select company_name as companyName , level from privilege_company where org_code = #{orgCode}")
@Select("select company_name as companyName , level_ from privilege_company where org_code = #{orgCode}")
CompanyModel getCompanyInfoByOrgCode(String orgCode);
}
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