From fd90eaebe2d70d1f7cf7ee511f084e0b97fc16a2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 二月 2025 17:08:12 +0800
Subject: [PATCH] 修改bug和对接测试iotd
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Operator.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Operator.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Operator.java
index 206524e..56083a6 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Operator.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Operator.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDateTime;
@@ -62,11 +63,6 @@
@TableField("url")
private String url;
/**
- * 我方登录三方秘钥
- */
- @TableField("ourOperatorSecret")
- private String ourOperatorSecret;
- /**
* 各平台登录token
*/
@TableField("accessToken")
@@ -75,8 +71,39 @@
* token过期时间（秒）
*/
@TableField("tokenAvailableTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime tokenAvailableTime;
/**
+ * 我方运营商唯一码
+ */
+ @TableField("ourOperatorId")
+ private String ourOperatorId;
+ /**
+ * 我方运营商名称
+ */
+ @TableField("ourName")
+ private String ourName;
+ /**
+ * 我方运营商秘钥
+ */
+ @TableField("ourOperatorSecret")
+ private String ourOperatorSecret;
+ /**
+ * 我方数据加密秘钥
+ */
+ @TableField("ourDataSecret")
+ private String ourDataSecret;
+ /**
+ * 我方初始化向量
+ */
+ @TableField("ourDataSecretIv")
+ private String ourDataSecretIv;
+ /**
+ * 我方签名秘钥
+ */
+ @TableField("ourSigSecret")
+ private String ourSigSecret;
+ /**
* token
*/
@TableField(exist = false)
--
Gitblit v1.7.1