用户管理接口 接口

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/config/MybatisPlusMetaObjectHandler.java

@@ -68,21 +68,6 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
 	private Long getUserId() {
 		try {
 			// 使用Sa-Token获取当前登录用户ID
-//			if (StpUtil.isLogin()) {
-//				Object loginId = StpUtil.getLoginId();
-////				if (loginId != null) {
-////					// 如果是字符串，尝试转换为Long
-////					if (loginId instanceof String) {
-////						return Long.valueOf((String) loginId);
-////					} else if (loginId instanceof Long) {
-////						return (Long) loginId;
-////					} else if (loginId instanceof Number) {
-////						return ((Number) loginId).longValue();
-////					}
-////				}
-//				return SaTokenUtil.getUserId(loginId);
-//			}
-//			return 0L;
 			return StpUtil.getSession().getLong(UserConstants.SA_USER_ID);
 		} catch (Exception e) {
 			log.warn("获取当前用户ID失败");

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/UserGatewayImpl.java

@@ -189,11 +189,13 @@ public class UserGatewayImpl implements UserGateway {
         // 2 校验当前用户是否已登录
         boolean isLogin = StpUtil.isLogin();
         if (!isLogin) {
-            StpUtil.login(RedisCacheConstant.WX_USER_PRE + userInfo.getUserId(), DeviceType.WX.getCode());
 
+            // 先清除之前登录信息
+            StpUtil.logout(RedisCacheConstant.WX_USER_PRE + userInfo.getUserId(), DeviceType.WX.getCode());
+
+            StpUtil.login(RedisCacheConstant.WX_USER_PRE + userInfo.getUserId(), DeviceType.WX.getCode());
             // 这里可以考虑 在session 中插入信息
             // 同账户多设备 登录共享信息
-
             // 当前 token session 独享信息
             SaSession saSession = StpUtil.getSession();
             saSession.set(UserConstants.SA_USER_PHONE, userInfo.getPhone());

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mqtt/MqttSubHandle.java

@@ -389,7 +389,7 @@ public class MqttSubHandle {
         msg.put("x", x);
         msg.put("y", y);
         msg.put("zt", pose);
-        msg.put("dev_id", clientId);
+        msg.put("client_id", clientId);
         msg.put("msg_type", "target_point");
 //        if (topic.equals("/das/realtime_pos")) {
 //            msg.put("msg_type", "target_point");
@@ -485,11 +485,11 @@ public class MqttSubHandle {
     public void subDasExist(String topic, String payload) {
 
         JSONObject obj = JSONObject.parseObject(payload);
-        String dev_id = obj.getString("dev_id");
+        String clientId = obj.getString("dev_id");
         String event = obj.getString("event");
         //向前端发送数据
         JSONObject msg = new JSONObject();
-        msg.put("dev_id", dev_id);
+        msg.put("client_id", clientId);
         msg.put("event", event);
         msg.put("msg_type", "exist");