From 5974bf6ee3110d94b7b20c6856401ce32879a1c3 Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Tue, 25 Jan 2022 18:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B7=E5=8D=A1=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E6=9F=A5=E8=AF=A2=E5=8D=A1=E6=8E=88=E6=9D=83=E8=AE=BE?=
=?UTF-8?q?=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=8E=88=E6=9D=83=E7=BB=99=E8=B0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/xhpc/card/domain/ListOfAuthorizedDevices.java | 5 +++++
.../src/main/java/com/xhpc/card/pojo/TIccardDevice.java | 5 +++++
.../main/java/com/xhpc/card/service/IXhpcCardService.java | 2 +-
.../java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java | 1 +
.../src/main/resources/mapper/TIccardDeviceMapper.xml | 3 ++-
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java
index 8722cf74..e1e96a8b 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java
@@ -56,6 +56,11 @@ public class ListOfAuthorizedDevices {
*/
@JsonProperty("grantOperator")
private String grantOperator;
+ /**
+ * 授权给谁的，0运营商，1平台
+ */
+ @JsonProperty("type")
+ private Integer type;
}
diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java
index 71ec8684..f8ae38d7 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java
@@ -45,6 +45,11 @@ public class TIccardDevice implements Serializable {
*/
private String tenantId;
+ /**
+ * 授权给谁，0表示运营商，1表示平台
+ */
+ private Integer type;
+
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java
index 43655dec..f7b86d2c 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java
@@ -19,7 +19,7 @@ public interface IXhpcCardService {
R cardStartup(String cardno, String serialNumber);
/**
- * 查询卡授权列表
+ * 查询卡授权设备列表
*
* @return 返回卡授权列表
* @author WH
diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
index 8d9fe6ff..522296d2 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
@@ -97,6 +97,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber());
TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex());
dataDTO.setGrantOperator(tIccardUser.getUsername());
+ dataDTO.setType(tIccardDevice.getType());
}
return R.ok(listOfAuthorizedDevices);
}
diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml
index 73e5ee32..0f4ad3f2 100644
--- a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml
+++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml
@@ -10,10 +10,11 @@
+
id
- , devName, devType, serialNumber, corpIndex, createTime, tenant_id
+ , devName, devType, serialNumber, corpIndex, createTime, tenant_id, type