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