fix:智能分析权限过滤错误问题修改。

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

@@ -391,6 +391,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			startTimeTop = formatter.format(startDate);
 		}
 		List<String> gatewayIds = this.getGatewayIds();
+		if(this.getGatewayIds().size()==0){
+			gatewayIds= Arrays.asList("qweqweqweqweqweqwe");
+		}
 		List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, gatewayIds);
 
 		fanHealthIndexDays.forEach(item -> {
@@ -568,8 +571,10 @@ public class IdxBizFanHealthIndexController extends BaseController {
 														@RequestParam(value = "subSystem",required = false) String subSystem,
 														@RequestParam(value = "current",required = false) Integer current,
 														@RequestParam(value = "size",required = false) Integer size){
-
-
+		List<String> gatewayIds = this.getGatewayIds();
+		if(this.getGatewayIds().size()==0){
+			gatewayIds= Arrays.asList("qweqweqweqweqweqwe");
+		}
 		if (requiredType.equals("按天")){
 //			if (null != type && type.equals("0")){
 				Date startDayTime = DateUtils.getCurrentDayStartTime(new Date());
@@ -583,7 +588,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //				Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 //				startTimeTop = formatter.format(startDate);
 //			}
-			List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, null);
+			List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, gatewayIds);
 			fanHealthIndexDays.forEach(item -> {
 				item.setHealthIndex(Double.parseDouble(df.format(item.getHealthIndex())));
 			});
@@ -608,7 +613,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //				Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 //				startTimeTop = formatter.format(startDate);
 //			}
-			List<FanHealthIndexHour> fanHealthIndexHours = fanHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, null);
+			List<FanHealthIndexHour> fanHealthIndexHours = fanHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, gatewayIds);
 			fanHealthIndexHours.forEach(item -> {
 				item.setHealthIndex(Double.parseDouble(df.format(item.getHealthIndex())));
 			});
@@ -632,7 +637,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //				Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 //				startTimeTop = formatter.format(startDate);
 //			}
-			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, null);
+			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, gatewayIds);
 			fanHealthIndexMoments.forEach(item -> {
 				item.setHealthIndex(Double.parseDouble(df.format(item.getHealthIndex())));
 			});

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

@@ -265,6 +265,9 @@ public class IdxBizPvHealthIndexController extends BaseController {
 
 
 		List<String> gatewayIds = this.getGatewayIds();
+		if(gatewayIds.size()==0){
+			gatewayIds = Arrays.asList("qweqweqweqeqwqweqw");
+		}
 		if (requiredType.equals("按天")){
 			Date startDayTime = DateUtils.getCurrentDayStartTime(new Date());
 			Date date = DateUtils.dateAddHours(startDayTime, -9);

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

@@ -101,7 +101,7 @@ public class IPermissionServiceImpl implements IPermissionService {
 
     @Override
     public String getCurrentUserPersmissions() {
-        String rootNodeName = "all";
+        String rootNodeName = "";
 		ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 		String userId = reginParams.getUserModel().getUserId();
 		StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
@@ -112,7 +112,7 @@ public class IPermissionServiceImpl implements IPermissionService {
 			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);
 			String companyLevel = companyInfo.get("level").toString();
 			if (companyLevel.equals("categroy_leve2")) {
-				return rootNodeName;
+				return "all";
 			}
 			if (companyLevel.equals("area")) {
 				List<StationBasic> stationBasics = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().like("project_org_code", permissionOrgCode));