调整字段

portal-service-application/src/main/java/com/hfln/portal/application/controller/admin/AdminDataController.java

@@ -4,7 +4,6 @@ import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
 import com.hfln.portal.common.dto.data.device.DeviceDTO;
 import com.hfln.portal.common.request.device.DeviceListQueryReq;
-import com.hfln.portal.common.request.share.ShareParam;
 import com.hfln.portal.common.vo.PageRecord;
 import com.hfln.portal.common.vo.UploadRes;
 import com.hfln.portal.domain.gateway.AdminGateway;
@@ -20,7 +19,7 @@ import java.io.IOException;
 
 @RestController
 @CatchAndLog
-@Tag(name = "数据管理")
+@Tag(name = "后台数据")
 @Slf4j
 @RequestMapping("/admin/data")
 public class AdminDataController {

portal-service-application/src/test/java/com/hfln/portal/application/controller/wap/UserControllerTest.java

@@ -275,7 +275,6 @@ class UserControllerTest {
         assertNotNull(resultData);
         assertEquals(expectedUserDto.getUserId(), resultData.getUserId());
         assertEquals(expectedUserDto.getPhone(), resultData.getPhone());
-        assertEquals(expectedUserDto.getOpenid(), resultData.getOpenid());
     }
 
     @Test
@@ -445,7 +444,6 @@ class UserControllerTest {
         assertNotNull(resultData);
         assertEquals(expectedUserDto.getUserId(), resultData.getUserId());
         assertEquals(expectedUserDto.getPhone(), resultData.getPhone());
-        assertEquals(expectedUserDto.getOpenid(), resultData.getOpenid());
     }
 
     @Test
@@ -721,7 +719,6 @@ class UserControllerTest {
         UserDto userDto = new UserDto();
         userDto.setUserId(1L);
         userDto.setPhone(TEST_PHONE);
-        userDto.setOpenid(TEST_OPENID);
         return userDto;
     }
     

portal-service-common/src/main/java/com/hfln/portal/common/request/group/GroupDeleteParams.java

@@ -1,22 +0,0 @@
-package com.hfln.portal.common.request.group;
-
-import com.hfln.portal.common.vo.BaseVO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotNull;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Schema(description = "删除群组")
-public class GroupDeleteParams extends BaseVO {
-
-
-        @NotNull(message = "群组Id不能为空!")
-        @Schema(description = "用户Id", required = true)
-        private Long devGroupId;
-
-}
-
-

portal-service-common/src/main/java/com/hfln/portal/common/response/user/UserTokenInfo.java

@@ -22,6 +22,7 @@ import lombok.EqualsAndHashCode;
  *         "tokenSessionTimeout": -2,        // Token-Session剩余有效时间 (单位: 秒) (-2表示系统中不存在这个缓存)
  *         "tokenActiveTimeout": -1,       // Token 距离被冻结还剩多少时间 (单位: 秒)
  *         "loginDevice": "DEF"   // 登录设备类型
+ *         "phone": "1**********"   //当前用户手机号
  *     }
  *     </pre>
  * </p>
@@ -43,23 +44,26 @@ public class UserTokenInfo extends BaseVO {
     @Schema(description = "是否已登录")
     private Boolean isLogin;
 
-    @Schema(description = "登录设备类型")
+    @Schema(description = "此token对应的LoginId，未登录时为null")
+    public Object loginId;
+
+    @Schema(description = "多账号体系下的账号类型")
     private String loginType;
 
-    @Schema(description = "token超时时间")
+    @Schema(description = "token 剩余有效期（单位: 秒）")
     private Long tokenTimeout;
 
-    @Schema(description = "Session ID")
-    private String sessionId;
+    @Schema(description = "Account-Session 剩余有效时间（单位: 秒）")
+    private Long sessionTimeout;
 
-    @Schema(description = "token剩余有效时间")
+    @Schema(description = "Token-Session 剩余有效时间（单位: 秒）")
     private Long tokenSessionTimeout;
 
-    @Schema(description = "token无操作超时时间")
-    private Long tokenActivityTimeout;
+    @Schema(description = "token 距离被冻结还剩多少时间（单位: 秒）")
+    private Long tokenActiveTimeout;
 
-    @Schema(description = "登录ID")
-    private String loginId;
+    @Schema(description = "登录设备类型")
+    private String loginDeviceType;
 
     @Schema(description = "自定义数据（暂无意义，留作扩展）")
     private String tag;
@@ -112,14 +116,12 @@ public class UserTokenInfo extends BaseVO {
     /**
      * @return 此 token 对应的LoginId，未登录时为null
      */
-    public String getLoginId() {
-        return loginId;
-    }
+    public Object getLoginId() { return loginId; }
 
     /**
      * @param loginId 此 token 对应的LoginId，未登录时为null
      */
-    public void setLoginId(String loginId) {
+    public void setLoginId(Object loginId) {
         this.loginId = loginId;
     }
 
@@ -140,57 +142,72 @@ public class UserTokenInfo extends BaseVO {
     /**
      * @return token 剩余有效期（单位: 秒）
      */
-    public Long getTokenTimeout() {
+    public long getTokenTimeout() {
         return tokenTimeout;
     }
 
     /**
      * @param tokenTimeout token剩余有效期（单位: 秒）
      */
-    public void setTokenTimeout(Long tokenTimeout) {
+    public void setTokenTimeout(long tokenTimeout) {
         this.tokenTimeout = tokenTimeout;
     }
 
     /**
-     * @return Session ID
+     * @return Account-Session 剩余有效时间（单位: 秒）
      */
-    public String getSessionId() {
-        return sessionId;
+    public long getSessionTimeout() {
+        return sessionTimeout;
     }
 
     /**
-     * @param sessionId Session ID
+     * @param sessionTimeout Account-Session剩余有效时间（单位: 秒）
      */
-    public void setSessionId(String sessionId) {
-        this.sessionId = sessionId;
+    public void setSessionTimeout(long sessionTimeout) {
+        this.sessionTimeout = sessionTimeout;
     }
 
     /**
      * @return Token-Session剩余有效时间（单位: 秒）
      */
-    public Long getTokenSessionTimeout() {
+    public long getTokenSessionTimeout() {
         return tokenSessionTimeout;
     }
 
     /**
      * @param tokenSessionTimeout Token-Session剩余有效时间（单位: 秒）
      */
-    public void setTokenSessionTimeout(Long tokenSessionTimeout) {
+    public void setTokenSessionTimeout(long tokenSessionTimeout) {
         this.tokenSessionTimeout = tokenSessionTimeout;
     }
 
     /**
      * @return token 距离被冻结还剩多少时间（单位: 秒）
      */
-    public Long getTokenActivityTimeout() {
-        return tokenActivityTimeout;
+    public long getTokenActiveTimeout() {
+        return tokenActiveTimeout;
+    }
+
+    /**
+     * @param tokenActiveTimeout token 距离被冻结还剩多少时间（单位: 秒）
+     */
+    public void setTokenActiveTimeout(long tokenActiveTimeout) {
+        this.tokenActiveTimeout = tokenActiveTimeout;
+    }
+
+
+    /**
+     * @return 登录设备类型
+     */
+    public String getLoginDeviceType() {
+        return loginDeviceType;
     }
 
     /**
-     * @param tokenActivityTimeout token 距离被冻结还剩多少时间（单位: 秒）
+     * @param loginDeviceType 登录设备类型
      */
-    public void setTokenActivityTimeout(Long tokenActivityTimeout) {
-        this.tokenActivityTimeout = tokenActivityTimeout;
+    public void setLoginDeviceType(String loginDeviceType) {
+        this.loginDeviceType = loginDeviceType;
     }
 
     /**
@@ -228,8 +245,8 @@ public class UserTokenInfo extends BaseVO {
     public String toString() {
         return "SaTokenInfo [tokenName=" + tokenName + ", tokenValue=" + tokenValue + ", isLogin=" + isLogin
                 + ", loginId=" + loginId + ", loginType=" + loginType + ", tokenTimeout=" + tokenTimeout
-                + ", sessionId=" + sessionId + ", tokenSessionTimeout=" + tokenSessionTimeout
-                + ", tokenActivityTimeout=" + tokenActivityTimeout + ", tag=" + tag + ", phone=" + phone + "]";
+                + ", sessionId=" + sessionTimeout + ", tokenSessionTimeout=" + tokenSessionTimeout
+                + ", tokenActiveTimeout=" + tokenActiveTimeout + ", tag=" + tag + ", phone=" + phone + "]";
     }
 }