yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改刷卡系统查询卡授权设备列表接口，添加授权给谁字段

Browse Source
This commit is contained in:
wen 2022-01-25 18:03:52 +08:00
parent c060b74622
commit 5974bf6ee3
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java
View File

@ -56,6 +56,11 @@ public class ListOfAuthorizedDevices {
*/
@JsonProperty("grantOperator")
private String grantOperator;
/**
* 授权给谁的，0运营商，1平台
*/
@JsonProperty("type")
private Integer type;
}

5
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java
View File

@ -45,6 +45,11 @@ public class TIccardDevice implements Serializable {
*/
private String tenantId;
/**
* 授权给谁，0表示运营商，1表示平台
*/
private Integer type;
private static final long serialVersionUID = 1L;
}

2
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java
View File

@ -19,7 +19,7 @@ public interface IXhpcCardService {
R cardStartup(String cardno, String serialNumber);
/**
* 查询卡授权列表
* 查询卡授权设备列表
*
* @return 返回卡授权列表
* @author WH

1
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
View File

@ -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);
}

3
xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml
View File

@ -10,10 +10,11 @@
<result column="corpIndex" jdbcType="INTEGER" property="corpindex"/>
<result column="createTime" jdbcType="TIMESTAMP" property="createtime"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="type" jdbcType="INTEGER" property="type"/>
</resultMap>
<sql id="Base_Column_List">
id
, devName, devType, serialNumber, corpIndex, createTime, tenant_id
, devName, devType, serialNumber, corpIndex, createTime, tenant_id, type
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select