修改刷卡系统查询卡授权设备列表接口,添加授权给谁字段
This commit is contained in:
parent
c060b74622
commit
5974bf6ee3
@ -56,6 +56,11 @@ public class ListOfAuthorizedDevices {
|
|||||||
*/
|
*/
|
||||||
@JsonProperty("grantOperator")
|
@JsonProperty("grantOperator")
|
||||||
private String grantOperator;
|
private String grantOperator;
|
||||||
|
/**
|
||||||
|
* 授权给谁的,0运营商,1平台
|
||||||
|
*/
|
||||||
|
@JsonProperty("type")
|
||||||
|
private Integer type;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -45,6 +45,11 @@ public class TIccardDevice implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private String tenantId;
|
private String tenantId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 授权给谁,0表示运营商,1表示平台
|
||||||
|
*/
|
||||||
|
private Integer type;
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -19,7 +19,7 @@ public interface IXhpcCardService {
|
|||||||
R cardStartup(String cardno, String serialNumber);
|
R cardStartup(String cardno, String serialNumber);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询卡授权列表
|
* 查询卡授权设备列表
|
||||||
*
|
*
|
||||||
* @return 返回卡授权列表
|
* @return 返回卡授权列表
|
||||||
* @author WH
|
* @author WH
|
||||||
|
|||||||
@ -97,6 +97,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
|
|||||||
dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber());
|
dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber());
|
||||||
TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex());
|
TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex());
|
||||||
dataDTO.setGrantOperator(tIccardUser.getUsername());
|
dataDTO.setGrantOperator(tIccardUser.getUsername());
|
||||||
|
dataDTO.setType(tIccardDevice.getType());
|
||||||
}
|
}
|
||||||
return R.ok(listOfAuthorizedDevices);
|
return R.ok(listOfAuthorizedDevices);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,10 +10,11 @@
|
|||||||
<result column="corpIndex" jdbcType="INTEGER" property="corpindex"/>
|
<result column="corpIndex" jdbcType="INTEGER" property="corpindex"/>
|
||||||
<result column="createTime" jdbcType="TIMESTAMP" property="createtime"/>
|
<result column="createTime" jdbcType="TIMESTAMP" property="createtime"/>
|
||||||
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
|
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
|
||||||
|
<result column="type" jdbcType="INTEGER" property="type"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
<sql id="Base_Column_List">
|
<sql id="Base_Column_List">
|
||||||
id
|
id
|
||||||
, devName, devType, serialNumber, corpIndex, createTime, tenant_id
|
, devName, devType, serialNumber, corpIndex, createTime, tenant_id, type
|
||||||
</sql>
|
</sql>
|
||||||
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
||||||
select
|
select
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user