From c060b74622abd59a618b22fc22e63951deef2d61 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Tue, 25 Jan 2022 17:39:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/controller/XhpcCardController.java | 19 ++- .../card/domain/ListOfAuthorizedDevices.java | 62 ++++++++ .../xhpc/card/mapper/TIccardDeviceMapper.java | 30 ++++ .../xhpc/card/mapper/TIccardUsersMapper.java | 19 +++ .../com/xhpc/card/pojo/TIccardDevice.java | 50 +++++++ .../java/com/xhpc/card/pojo/TIccardUsers.java | 60 ++++++++ .../xhpc/card/service/IXhpcCardService.java | 19 ++- .../service/impl/XhpcCardServiceImpl.java | 49 ++++++- .../resources/mapper/TIccardDeviceMapper.xml | 119 +++++++++++++++ .../resources/mapper/TIccardUsersMapper.xml | 137 ++++++++++++++++++ 10 files changed, 546 insertions(+), 18 deletions(-) create mode 100644 xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java create mode 100644 xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardDeviceMapper.java create mode 100644 xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardUsersMapper.java create mode 100644 xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java create mode 100644 xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardUsers.java create mode 100644 xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml create mode 100644 xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardUsersMapper.xml diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java index 1fd3c3e5..9a26698e 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java @@ -1,20 +1,16 @@ package com.xhpc.card.controller; +import com.xhpc.card.domain.ListOfAuthorizedDevices; import com.xhpc.card.service.IXhpcCardService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; import io.swagger.annotations.Api; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - /** * @author yuyang * @date 2022/1/20 11:33 @@ -27,8 +23,6 @@ public class XhpcCardController extends BaseController { @Autowired private IXhpcCardService xhpcCardService; - private static final Logger logger = LoggerFactory.getLogger(XhpcCardController.class); - /** * 卡启动前判断 * @param cardno 卡物理卡号 @@ -36,9 +30,18 @@ public class XhpcCardController extends BaseController { * @return */ @GetMapping("/cardStartup") - public R cardStartup(@RequestParam(value = "cardno") String cardno, @RequestParam(value = "serialNumber") String serialNumber){ + public R cardStartup(@RequestParam(value = "cardno") String cardno, @RequestParam(value = "serialNumber") String serialNumber) { + logger.info("<<<<<<<<<<<<<<<<<<<<<<<<卡启动充电判断>>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<<<<<<<<<卡启动充电判断>>>>>>>>>>>>>>>>>"); return xhpcCardService.cardStartup(cardno, serialNumber); } + + @GetMapping("/devices") + public R queryDeviceList() { + + return xhpcCardService.queryDeviceList(); + } + + } 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 new file mode 100644 index 00000000..8722cf74 --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/ListOfAuthorizedDevices.java @@ -0,0 +1,62 @@ +package com.xhpc.card.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 卡授权设备列表包装类 + * + * @author WH + * @date 2022/1/25 16:21 + * @since version-1.0 + */ +@NoArgsConstructor +@Data +public class ListOfAuthorizedDevices { + + + /** + * totalItems + */ + @JsonProperty("totalItems") + private Integer totalItems; + /** + * data + */ + @JsonProperty("data") + private List data; + + /** + * DataDTO + */ + @NoArgsConstructor + @Data + public static class DataDTO { + + /** + * deviceNumber + */ + @JsonProperty("deviceNumber") + private String deviceNumber; + /** + * deviceName + */ + @JsonProperty("deviceName") + private String deviceName; + /** + * deviceType + */ + @JsonProperty("deviceType") + private String deviceType; + /** + * grantOperator + */ + @JsonProperty("grantOperator") + private String grantOperator; + + } + +} diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardDeviceMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardDeviceMapper.java new file mode 100644 index 00000000..8bf8c41f --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardDeviceMapper.java @@ -0,0 +1,30 @@ +package com.xhpc.card.mapper; + +import com.xhpc.card.pojo.TIccardDevice; + +import java.util.List; + +public interface TIccardDeviceMapper { + + int deleteByPrimaryKey(Integer id); + + int insert(TIccardDevice record); + + int insertSelective(TIccardDevice record); + + TIccardDevice selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(TIccardDevice record); + + int updateByPrimaryKey(TIccardDevice record); + + /** + * 查询所有记录 + * + * @author WH + * @date 2022/1/25 17:07 + * @since version-1.0 + */ + List selectAll(); + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardUsersMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardUsersMapper.java new file mode 100644 index 00000000..ce83f320 --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardUsersMapper.java @@ -0,0 +1,19 @@ +package com.xhpc.card.mapper; + +import com.xhpc.card.pojo.TIccardUsers; + +public interface TIccardUsersMapper { + + int deleteByPrimaryKey(Integer id); + + int insert(TIccardUsers record); + + int insertSelective(TIccardUsers record); + + TIccardUsers selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(TIccardUsers record); + + int updateByPrimaryKey(TIccardUsers record); + +} \ No newline at end of file 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 new file mode 100644 index 00000000..71ec8684 --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardDevice.java @@ -0,0 +1,50 @@ +package com.xhpc.card.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * t_iccard_device + * + * @author WH + */ +@Data +public class TIccardDevice implements Serializable { + + private Integer id; + + /** + * 设备名称 + */ + private String devname; + + /** + * 设备型号 + */ + private String devtype; + + /** + * 卡读写器全球唯一编号 + */ + private String serialnumber; + + /** + * 企业索引 + */ + private Integer corpindex; + + /** + * 添加日期 + */ + private Date createtime; + + /** + * 租户id + */ + private String tenantId; + + 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/pojo/TIccardUsers.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardUsers.java new file mode 100644 index 00000000..e513cd24 --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardUsers.java @@ -0,0 +1,60 @@ +package com.xhpc.card.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * t_iccard_users + * + * @author + */ +@Data +public class TIccardUsers implements Serializable { + + private Integer id; + + /** + * 用户姓名 + */ + private String username; + + /** + * 年龄 + */ + private Byte userage; + + /** + * 性别 + */ + private Byte usersex; + + /** + * 身份证号码 + */ + private String idnumber; + + /** + * 电话号码 + */ + private String phone; + + /** + * 车牌号码 + */ + private String licenceplate; + + /** + * 添加日期 + */ + private Date createtime; + + /** + * 租户id + */ + private String tenantId; + + 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 ef7d13a0..43655dec 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 @@ -1,5 +1,6 @@ package com.xhpc.card.service; +import com.xhpc.card.domain.ListOfAuthorizedDevices; import com.xhpc.common.core.domain.R; /** @@ -10,9 +11,21 @@ public interface IXhpcCardService { /** * 卡启动充电判断 - * @param cardno 卡物理卡号 - * @param serialNumber 终端卡号 + * + * @param cardno 卡物理卡号 + * @param serialNumber 终端卡号 * @return */ - R cardStartup(String cardno,String serialNumber); + R cardStartup(String cardno, String serialNumber); + + /** + * 查询卡授权列表 + * + * @return 返回卡授权列表 + * @author WH + * @date 2022/1/25 16:18 + * @since version-1.0 + */ + R queryDeviceList(); + } 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 3678c5ab..8d9fe6ff 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 @@ -1,6 +1,11 @@ package com.xhpc.card.service.impl; +import com.xhpc.card.domain.ListOfAuthorizedDevices; +import com.xhpc.card.mapper.TIccardDeviceMapper; +import com.xhpc.card.mapper.TIccardUsersMapper; import com.xhpc.card.mapper.XhpcCardMapper; +import com.xhpc.card.pojo.TIccardDevice; +import com.xhpc.card.pojo.TIccardUsers; import com.xhpc.card.service.IXhpcCardService; import com.xhpc.common.api.CardHistoryOrderService; import com.xhpc.common.core.constant.Constants; @@ -10,6 +15,10 @@ import com.xhpc.common.domain.XhpcIcCardInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + /** * @author yuyang * @date 2022/1/20 13:44 @@ -22,6 +31,10 @@ public class XhpcCardServiceImpl implements IXhpcCardService { @Autowired private CardHistoryOrderService cardHistoryOrderService; + @Resource + private TIccardDeviceMapper tIccardDeviceMapper; + @Resource + private TIccardUsersMapper tIccardUsersMapper; /** @@ -56,14 +69,36 @@ public class XhpcCardServiceImpl implements IXhpcCardService { } //查询卡号对应的用户 XhpcIcCardInfo xhpcIcCardInfo = xhpcCardMapper.getXhpcIcCardInfo(iccardInfo.getId().toString()); - if(xhpcIcCardInfo ==null){ + if (xhpcIcCardInfo == null) { return R.fail(Constants.LNVALID_USER); } - Long userId=xhpcIcCardInfo.getUserId(); - Integer userType=xhpcIcCardInfo.getUserType(); - String tenantId=xhpcIcCardInfo.getTenantId(); - Integer type =1; - String grantOperator=xhpcIcCardInfo.getGrantOperatorId(); - return cardHistoryOrderService.cardStartup(userId, serialNumber, userType,tenantId,type,grantOperator); + Long userId = xhpcIcCardInfo.getUserId(); + Integer userType = xhpcIcCardInfo.getUserType(); + String tenantId = xhpcIcCardInfo.getTenantId(); + Integer type = 1; + String grantOperator = xhpcIcCardInfo.getGrantOperatorId(); + return cardHistoryOrderService.cardStartup(userId, serialNumber, userType, tenantId, type, grantOperator); } + + @Override + public R queryDeviceList() { + + ListOfAuthorizedDevices listOfAuthorizedDevices = new ListOfAuthorizedDevices(); + listOfAuthorizedDevices.setData(new ArrayList<>()); + listOfAuthorizedDevices.setTotalItems(0); + List tIccardDeviceList = tIccardDeviceMapper.selectAll(); + if (tIccardDeviceList.isEmpty()) { + return R.ok(listOfAuthorizedDevices); + } + for (TIccardDevice tIccardDevice : tIccardDeviceList) { + ListOfAuthorizedDevices.DataDTO dataDTO = new ListOfAuthorizedDevices.DataDTO(); + dataDTO.setDeviceName(tIccardDevice.getDevname()); + dataDTO.setDeviceType(tIccardDevice.getDevtype()); + dataDTO.setDeviceNumber(tIccardDevice.getSerialnumber()); + TIccardUsers tIccardUser = tIccardUsersMapper.selectByPrimaryKey(tIccardDevice.getCorpindex()); + dataDTO.setGrantOperator(tIccardUser.getUsername()); + } + 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 new file mode 100644 index 00000000..73e5ee32 --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardDeviceMapper.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + id + , devName, devType, serialNumber, corpIndex, createTime, tenant_id + + + + + delete + from t_iccard_device + where id = #{id,jdbcType=INTEGER} + + + insert into t_iccard_device (devName, devType, serialNumber, + corpIndex, createTime, tenant_id) + values (#{devname,jdbcType=VARCHAR}, #{devtype,jdbcType=VARCHAR}, #{serialnumber,jdbcType=VARCHAR}, + #{corpindex,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP}, #{tenantId,jdbcType=VARCHAR}) + + + insert into t_iccard_device + + + devName, + + + devType, + + + serialNumber, + + + corpIndex, + + + createTime, + + + tenant_id, + + + + + #{devname,jdbcType=VARCHAR}, + + + #{devtype,jdbcType=VARCHAR}, + + + #{serialnumber,jdbcType=VARCHAR}, + + + #{corpindex,jdbcType=INTEGER}, + + + #{createtime,jdbcType=TIMESTAMP}, + + + #{tenantId,jdbcType=VARCHAR}, + + + + + update t_iccard_device + + + devName = #{devname,jdbcType=VARCHAR}, + + + devType = #{devtype,jdbcType=VARCHAR}, + + + serialNumber = #{serialnumber,jdbcType=VARCHAR}, + + + corpIndex = #{corpindex,jdbcType=INTEGER}, + + + createTime = #{createtime,jdbcType=TIMESTAMP}, + + + tenant_id = #{tenantId,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + update t_iccard_device + set devName = #{devname,jdbcType=VARCHAR}, + devType = #{devtype,jdbcType=VARCHAR}, + serialNumber = #{serialnumber,jdbcType=VARCHAR}, + corpIndex = #{corpindex,jdbcType=INTEGER}, + createTime = #{createtime,jdbcType=TIMESTAMP}, + tenant_id = #{tenantId,jdbcType=VARCHAR} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardUsersMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardUsersMapper.xml new file mode 100644 index 00000000..934dcd15 --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardUsersMapper.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + id + , userName, userAge, userSex, idNumber, phone, licencePlate, createTime, tenant_id + + + + delete + from t_iccard_users + where id = #{id,jdbcType=INTEGER} + + + insert into t_iccard_users (userName, userAge, userSex, + idNumber, phone, licencePlate, + createTime, tenant_id) + values (#{username,jdbcType=VARCHAR}, #{userage,jdbcType=TINYINT}, #{usersex,jdbcType=TINYINT}, + #{idnumber,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{licenceplate,jdbcType=VARCHAR}, + #{createtime,jdbcType=TIMESTAMP}, #{tenantId,jdbcType=VARCHAR}) + + + insert into t_iccard_users + + + userName, + + + userAge, + + + userSex, + + + idNumber, + + + phone, + + + licencePlate, + + + createTime, + + + tenant_id, + + + + + #{username,jdbcType=VARCHAR}, + + + #{userage,jdbcType=TINYINT}, + + + #{usersex,jdbcType=TINYINT}, + + + #{idnumber,jdbcType=VARCHAR}, + + + #{phone,jdbcType=VARCHAR}, + + + #{licenceplate,jdbcType=VARCHAR}, + + + #{createtime,jdbcType=TIMESTAMP}, + + + #{tenantId,jdbcType=VARCHAR}, + + + + + update t_iccard_users + + + userName = #{username,jdbcType=VARCHAR}, + + + userAge = #{userage,jdbcType=TINYINT}, + + + userSex = #{usersex,jdbcType=TINYINT}, + + + idNumber = #{idnumber,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + licencePlate = #{licenceplate,jdbcType=VARCHAR}, + + + createTime = #{createtime,jdbcType=TIMESTAMP}, + + + tenant_id = #{tenantId,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + update t_iccard_users + set userName = #{username,jdbcType=VARCHAR}, + userAge = #{userage,jdbcType=TINYINT}, + userSex = #{usersex,jdbcType=TINYINT}, + idNumber = #{idnumber,jdbcType=VARCHAR}, + phone = #{phone,jdbcType=VARCHAR}, + licencePlate = #{licenceplate,jdbcType=VARCHAR}, + createTime = #{createtime,jdbcType=TIMESTAMP}, + tenant_id = #{tenantId,jdbcType=VARCHAR} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file