From bf07dc7110da782eeb655371d6d6c11818c1b33f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 16:43:46 +0800
Subject: [PATCH] 设备模块代码恢复
---
src/main/java/com/moral/security/model/token/RefreshToken.java | 2 +-
src/main/resources/mapper/DeviceMapper.xml | 19 +++++++++++++++++++
src/main/java/com/moral/security/model/token/JwtTokenFactory.java | 3 +--
src/main/java/com/moral/mapper/DeviceMapper.java | 3 +++
4 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 1eba557..44650c0 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -14,5 +14,8 @@
List<Map<String, Object>> getDeviceStatesByAccount(Map<String, Object> parameters);
List<Device> selectWithRelationData(Example example);
List<Map<String, Object>> getSensorsByDevice(@Param("mac")String mac);
+ List<String> getDeviceMacByMonitorPointAndDeviceVersion(@Param("monitorPointId")Integer monitorPointId,@Param("deviceVersionId")Integer deviceVersionId);
+
+ List<Map<String, Object>> getDeviceVersionIdByMonitorPoint(Integer monitorPointId);
List<Device> selectByOrgIdAndDevName(@Param("orgId")Integer orgId,@Param("devName")String devName);
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/security/model/token/JwtTokenFactory.java b/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
index 6db2228..bfec8d4 100644
--- a/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
+++ b/src/main/java/com/moral/security/model/token/JwtTokenFactory.java
@@ -75,8 +75,7 @@
Claims claims = Jwts.claims().setSubject(userContext.getUsername());
claims.put("mode",userContext.getMode());
-// claims.put("scopes", Arrays.asList(Scopes.REFRESH_TOKEN.authority()));
-
+ claims.put("scopes", Arrays.asList(Scopes.REFRESH_TOKEN.authority()));
String token = Jwts.builder()
.setClaims(claims)
.setIssuer(settings.getTokenIssuer())
diff --git a/src/main/java/com/moral/security/model/token/RefreshToken.java b/src/main/java/com/moral/security/model/token/RefreshToken.java
index 0f67cd0..d426fcd 100644
--- a/src/main/java/com/moral/security/model/token/RefreshToken.java
+++ b/src/main/java/com/moral/security/model/token/RefreshToken.java
@@ -38,7 +38,7 @@
Jws<Claims> claims = token.parseClaims(signingKey);
List<String> scopes = claims.getBody().get("scopes", List.class);
- if (scopes == null || scopes.isEmpty()
+ if (scopes == null || scopes.isEmpty()
|| !scopes.stream().filter(scope -> Scopes.REFRESH_TOKEN.authority().equals(scope)).findFirst().isPresent()) {
return Optional.empty();
}
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index cb2cba0..bd99802 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -122,4 +122,23 @@
ORDER BY
s.id
</select>
+ <select id="getDeviceVersionIdByMonitorPoint" resultType="map">
+ SELECT
+ device_version_id deviceVersionId
+ FROM
+ device
+ WHERE
+ monitor_point_id = #{monitorPoint}
+ GROUP BY
+ device_version_id
+ </select>
+ <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string">
+ SELECT
+ mac
+ FROM
+ device
+ WHERE
+ monitor_point_id = #{monitorPointId}
+ AND device_version_id = #{deviceVersionId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0