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

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

@@ -1016,7 +1016,7 @@ public class TDBigScreenAnalyseController extends BaseController {
 				LambdaQueryWrapper<IdxBizPvHealthLevel> query = new LambdaQueryWrapper<>();
 				query.eq(IdxBizPvHealthLevel::getAnalysisObjType, "设备");
 				query.eq(IdxBizPvHealthLevel::getStatus, item.get("station"));
-				query.le(IdxBizPvHealthLevel::getGroupLowerLimit, equipmentHealthScore);
+				query.lt(IdxBizPvHealthLevel::getGroupLowerLimit, equipmentHealthScore);
 				query.ge(IdxBizPvHealthLevel::getGroupUpperLimit, equipmentHealthScore);
 				IdxBizPvHealthLevel idxBizFanHealthLevel = idxBizPvHealthLevelMapper.selectOne(query);
 				if (ObjectUtils.isEmpty(idxBizFanHealthLevel)) {

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

@@ -2073,7 +2073,7 @@ public class CommonServiceImpl {
                         // 获取健康指数对应等级
                         for (IdxBizFanHealthLevel idxBizFanHealthLevel : idxBizFanHealthLevels) {
                             if (indexValueArray.getDoubleValue(i) <= idxBizFanHealthLevel.getGroupUpperLimit()
-                                    && indexValueArray.getDoubleValue(i) >= idxBizFanHealthLevel.getGroupLowerLimit()) {
+                                    && indexValueArray.getDoubleValue(i) > idxBizFanHealthLevel.getGroupLowerLimit()) {
                                 idxBizFanHealthIndex.setHealthLevel(idxBizFanHealthLevel.getHealthLevel());
 
                             }
@@ -2679,7 +2679,7 @@ public class CommonServiceImpl {
 
                         for (IdxBizPvHealthLevel idxBizFanHealthLevel : idxBizFanHealthLevels) {
                             if (indexValueArray.getDoubleValue(i) <= idxBizFanHealthLevel.getGroupUpperLimit()
-                                    && indexValueArray.getDoubleValue(i) >= idxBizFanHealthLevel.getGroupLowerLimit()) {
+                                    && indexValueArray.getDoubleValue(i) > idxBizFanHealthLevel.getGroupLowerLimit()) {
                                 idxBizPvHealthIndex.setHealthLevel(idxBizFanHealthLevel.getHealthLevel());
 
                             }