修改预警排序

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

@@ -741,7 +741,7 @@ public class HealthStatusIndicatorServiceImpl {
         wrapper.orderByAsc(PvHealthIndexHour::getTs);
         List<PvHealthIndexHour> healthIndices = pvHealthIndexHourMapper.selectList(wrapper);
         List<String> collect = healthIndices.stream().map(PvHealthIndexHour::getAnalysisObjSeq).collect(Collectors.toList());
-        if (null == healthIndices) {
+        if (null == healthIndices||collect==null||collect.isEmpty()) {
             return;
         }
         LambdaQueryWrapper<IdxBizPvWarningRuleSet> queryWrapper = new LambdaQueryWrapper<>();

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

@@ -197,4 +197,8 @@ 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
+base.url.zsfx:http://139.9.171.247:8052/intelligent-analysis/index-analysis
\ No newline at end of file
+
+forecast.url=
+
+logic=
\ No newline at end of file

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

@@ -2,7 +2,7 @@ spring.application.name=AMOS-JXIOP-ANALYSE-CZ
 server.servlet.context-path=/jxiop-analyse
 server.port=33400
 server.uri-encoding=UTF-8
-spring.profiles.active=kingbase8
+spring.profiles.active=dev1
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
@@ -90,4 +90,4 @@ healthValue_HourCount=6
 healthValue_MinCount=5
 
 ##是否打开健康计算计算 true 打开 false 关闭
-openHealth = true
+openHealth = false
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -160,7 +160,7 @@
             </if>
         </where>
         ORDER BY
-        log.REC_DATE DESC
+        log.CREATE_DATE DESC
         LIMIT #{start}, #{size}
     </select>