fix: 消费服务

1.新消费机获取token接口完善

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/TermBusiness.java

@@ -76,8 +76,11 @@ public class TermBusiness {
 
                 LocalDateTime now = LocalDateTime.now();
                 LocalDateTime expireTime = now.plusHours(2);
+                // termToken = new TermToken(strTermNo, UUID.randomUUID().toString(), admin, new Date().getTime(), minDate.getTime(),
+                //     Date.from(expireTime.toInstant(ZoneOffset.of("+8"))).getTime());
+
                 termToken = new TermToken(strTermNo, UUID.randomUUID().toString(), admin, new Date().getTime(), minDate.getTime(),
-                    Date.from(expireTime.toInstant(ZoneOffset.of("+8"))).getTime());
+                                          Date.from(expireTime.toInstant(ZoneOffset.of("+8"))).getTime(), remoteVo.getRoomName());
 
                 tokenManager.getTermToken().put(strTermNo, termToken);
             } else {
@@ -94,6 +97,7 @@ public class TermBusiness {
                     termToken.setDateTime(DateUtil.date().getTime());
                     termToken.setAuthTime(minDate.getTime());
                     termToken.setExpireTime(expireDate.getTime());
+                    termToken.setRoomName(remoteVo.getRoomName());
                 } else {
                     termToken.setAdmin(admin);
                 }

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/controller/v2/AuthControllerV2.java

@@ -1,14 +1,10 @@
 package org.dromara.server.consume.controller.v2;
 
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.constant.ApiErrorTypeConstants;
+import org.dromara.common.core.api.ReturnResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.model.ErrorInfo;
-import org.dromara.common.core.domain.model.ErrorResult;
 import org.dromara.server.consume.business.TermBusiness;
 import org.dromara.server.consume.domain.vo.yc.TermToken;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -26,19 +22,13 @@ public class AuthControllerV2 {
 	 */
 	@GetMapping("/token/term/{termId}")
 	public Object getTermToken(@PathVariable("termId") Long termId, @RequestHeader(name = "admin") String admin,
-			@RequestHeader(name = "pwd") String pwd) {
+                               @RequestHeader(name = "pwd") String pwd) {
 
 		R<TermToken> mapResult = termBusiness.getTermToken(termId, admin, pwd);
 
 		if (R.isError(mapResult)) {
-			ErrorResult result = new ErrorResult();
-			result.setStatusCode(HttpStatus.BAD_REQUEST.value());
-			result.setMessage("获取Token失败");
-			result.getErrors().add(new ErrorInfo(1, "获取设备Token失败", ApiErrorTypeConstants.BAD_REQUEST, mapResult.getMsg()));
-
-			return new ResponseEntity<Object>(result, null, HttpStatus.BAD_REQUEST);
+            return new ReturnResult(false, 1, "获取设备Token失败", null, System.currentTimeMillis());
 		}
-
-		return mapResult.getData();
+        return new ReturnResult(true, 1, "获取设备Token成功", mapResult.getData(), System.currentTimeMillis());
 	}
 }

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/domain/vo/yc/TermToken.java

@@ -28,6 +28,6 @@ public class TermToken implements Serializable {
     public Long dateTime;
     public Long authTime;
     public Long expireTime;
-
+    public String roomName;
 }