diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/LogInfo.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/LogInfo.java index 9888ba61a..8579c0ca5 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/LogInfo.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/LogInfo.java @@ -11,6 +11,8 @@ public interface LogInfo { String UNKNOWN_USER = "unknown user"; + String UNKNOWN_ROLE = "unknown role"; + String UNKNOWN_IP = "unknown IP"; String UNKNOWN_CLIENT = "unknown client"; diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java index cb811298f..78d20a12c 100644 --- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java +++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java @@ -217,6 +217,18 @@ public class RequestUtil { } return userIndex; } + /** + * HttpServletRequest获取在网关中存储的用户角色 + */ + public static String getUserRole() { + String userIndex = LogInfo.UNKNOWN_ROLE; + JSONObject jwtPayload = getJwtPayload(); + if (Objects.nonNull(jwtPayload)) { + userIndex = jwtPayload.getString(SecurityConstants.JWT_AUTHORITIES_KEY); + } + return userIndex; + } + /** * HttpServletRequest获取在网关中存储的部门索引 diff --git a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java index 25fc9b0fa..4493aac2f 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java +++ b/pqs-influx/src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java @@ -82,7 +82,7 @@ public class CommonServiceImpl implements CommonService { .or("line_id",lineIds) .eq("phasic_type",phasic) .between("time", startTime, endTime) - .eq("value_type",dataType).groupBy("line_id"); + .eq("value_type",dataType); return commonMapper.getDeviceRtDataByTime(influxQueryWrapper); }