fix: 消费服务

1.消费机获取授权的时间相关字段返回值由日期改为时间戳

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

@@ -56,7 +56,7 @@ public class TermBusiness {
     private final TokenManager tokenManager;
     private final DefaultConfig defaultConfig;
 
-    public R<TermToken> getTermToken(Long termNo, java.lang.String admin, java.lang.String pwd) {
+    public R<TermToken> getTermToken(Long termNo, String admin, String pwd) {
         // XfTermVo termVo = termService.queryVoOneByNo(termNo);
         RemoteXfTermVo remoteVo = remoteTermService.queryByNo(termNo, defaultConfig.getTenantId());
         if (ObjectUtil.isEmpty(remoteVo)) {
@@ -76,12 +76,12 @@ public class TermBusiness {
 
                 LocalDateTime now = LocalDateTime.now();
                 LocalDateTime expireTime = now.plusHours(2);
-                termToken = new TermToken(strTermNo, UUID.randomUUID().toString(), admin, new Date(), minDate,
-                                          Date.from(expireTime.toInstant(ZoneOffset.of("+8"))));
+                termToken = new TermToken(strTermNo, UUID.randomUUID().toString(), admin, new Date().getTime(), minDate.getTime(),
+                                          Date.from(expireTime.toInstant(ZoneOffset.of("+8"))).getTime());
 
                 tokenManager.getTermToken().put(strTermNo, termToken);
             } else {
-                if (termToken.getExpireTime().getTime() < new Date().getTime()) {
+                if (termToken.getExpireTime() < new Date().getTime()) {
                     LocalDateTime ldt = LocalDateTime.of(2000, 1, 1, 0, 0, 0);
                     Date minDate = Date.from(ldt.toInstant(ZoneOffset.of("+8")));
 
@@ -91,9 +91,9 @@ public class TermBusiness {
 
                     termToken.setAdmin(admin);
                     termToken.setToken(UUID.randomUUID().toString());
-                    termToken.setDateTime(new Date());
-                    termToken.setAuthTime(minDate);
-                    termToken.setExpireTime(expireDate);
+                    termToken.setDateTime(DateUtil.date().getTime());
+                    termToken.setAuthTime(minDate.getTime());
+                    termToken.setExpireTime(expireDate.getTime());
                 } else {
                     termToken.setAdmin(admin);
                 }

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/controller/v1/TermsController.java

@@ -50,6 +50,7 @@ public class TermsController {
      * @param termNo 设备编号
      * @return 校时
      */
+
     @GetMapping("/CheckTime/{termNo}")
     public Object checkTermTime(@PathVariable("termNo") Integer termNo){
         R<Map<String,Object>> mapResult = termBusiness.checkTermTime(termNo);

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

@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 设备Token信息
@@ -19,13 +18,16 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 public class TermToken implements Serializable {
+
     @Serial
-    private static final long serialVersionUID = -6397545912397815036L;
+    private static final long serialVersionUID = 408489078315508152L;
+
     public String key;
 	public String token;
 	public String admin;
-	public Date dateTime;
-	public Date authTime;
-	public Date expireTime;
+    public Long dateTime;
+    public Long authTime;
+    public Long expireTime;
 
 }
+