From 6772cf3de0a0d0f11629ddce7a19cfee8efbabed Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 24 Mar 2023 13:15:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=89=B4=E6=9D=83=E5=8D=A1=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/PileAuthCardController.java | 10 +++--- .../com/jsowell/pile/domain/PileAuthCard.java | 2 ++ .../com/jsowell/pile/dto/PileAuthCardDTO.java | 8 +++++ .../pile/mapper/PileAuthCardMapper.java | 8 +++-- .../pile/service/IPileAuthCardService.java | 10 ++++-- .../service/impl/PileAuthCardServiceImpl.java | 31 +++++++++++++--- .../jsowell/pile/vo/web/PileAuthCardVO.java | 8 +++++ .../mapper/pile/PileAuthCardMapper.xml | 36 ++++++++++++++----- jsowell-ui/src/views/pile/card/index.vue | 28 ++++++++------- 9 files changed, 105 insertions(+), 36 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileAuthCardController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileAuthCardController.java index fdb089dfb..88e6f52f7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileAuthCardController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileAuthCardController.java @@ -42,10 +42,10 @@ public class PileAuthCardController extends BaseController { */ @PreAuthorize("@ss.hasPermi('pile:card:list')") @GetMapping("/list") - public TableDataInfo list(PileAuthCard pileAuthCard) { + public TableDataInfo list(PileAuthCardDTO dto) { startPage(); // List list = pileAuthCardService.selectPileAuthCardList(pileAuthCard); - List list = pileAuthCardService.getPileAuthCardInfoList(pileAuthCard); + List list = pileAuthCardService.getPileAuthCardInfoList(dto); return getDataTable(list); } @@ -67,7 +67,7 @@ public class PileAuthCardController extends BaseController { @PreAuthorize("@ss.hasPermi('pile:card:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return AjaxResult.success(pileAuthCardService.selectPileAuthCardById(id)); + return AjaxResult.success(pileAuthCardService.getCardInfoById(id)); } /** @@ -96,8 +96,8 @@ public class PileAuthCardController extends BaseController { @PreAuthorize("@ss.hasPermi('pile:card:edit')") @Log(title = "充电站鉴权卡", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody PileAuthCard pileAuthCard) { - return toAjax(pileAuthCardService.updatePileAuthCard(pileAuthCard)); + public AjaxResult edit(@RequestBody PileAuthCardDTO dto) { + return toAjax(pileAuthCardService.updateCardInfo(dto)); } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileAuthCard.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileAuthCard.java index 46caea7c5..93bcccc45 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileAuthCard.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileAuthCard.java @@ -1,5 +1,6 @@ package com.jsowell.pile.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.jsowell.common.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -55,6 +56,7 @@ public class PileAuthCard { */ private String delFlag; + @JsonFormat( pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; private String createBy; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java index d4423650f..3395e231e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java @@ -10,7 +10,15 @@ import lombok.Data; */ @Data public class PileAuthCardDTO { + private Long id; + private String logicCard; + private String physicsCard; + + private String status; + + private String memberId; + private String phoneNumber; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java index 9adbe7c5f..75ab4eb6a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java @@ -3,6 +3,7 @@ package com.jsowell.pile.mapper; import java.util.List; import com.jsowell.pile.domain.PileAuthCard; +import com.jsowell.pile.dto.PileAuthCardDTO; import com.jsowell.pile.vo.web.PileAuthCardVO; import org.springframework.stereotype.Repository; @@ -20,8 +21,9 @@ public interface PileAuthCardMapper { * @param id 充电站鉴权卡主键 * @return 充电站鉴权卡 */ - public PileAuthCard selectPileAuthCardById(Long id); + // public PileAuthCard selectPileAuthCardById(Long id); + PileAuthCardVO getCardInfoById(Long id); /** * 查询充电站鉴权卡信息 * @param pileAuthCard @@ -40,10 +42,10 @@ public interface PileAuthCardMapper { /** * 查询充电站鉴权卡列表 * - * @param pileAuthCard 充电站鉴权卡 + * @param dto 充电站鉴权卡 * @return 充电站鉴权卡集合 */ - public List getPileAuthCardInfoList(PileAuthCard pileAuthCard); + public List getPileAuthCardInfoList(PileAuthCardDTO dto); /** * 新增充电站鉴权卡 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java index e4a324881..c84733a97 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java @@ -19,7 +19,9 @@ public interface IPileAuthCardService { * @param id 充电站鉴权卡主键 * @return 充电站鉴权卡 */ - public PileAuthCard selectPileAuthCardById(Long id); + // public PileAuthCard selectPileAuthCardById(Long id); + + PileAuthCardVO getCardInfoById(Long id); /** * 查询充电站鉴权卡信息 @@ -39,10 +41,10 @@ public interface IPileAuthCardService { /** * 查询充电站鉴权卡列表 * - * @param pileAuthCard 充电站鉴权卡 + * @param dto 充电站鉴权卡 * @return 充电站鉴权卡集合 */ - public List getPileAuthCardInfoList(PileAuthCard pileAuthCard); + public List getPileAuthCardInfoList(PileAuthCardDTO dto); /** * 新增充电站鉴权卡 @@ -68,6 +70,8 @@ public interface IPileAuthCardService { */ public int updatePileAuthCard(PileAuthCard pileAuthCard); + public int updateCardInfo(PileAuthCardDTO dto); + /** * 批量删除充电站鉴权卡 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index e175b75f1..132cb63fb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java @@ -35,9 +35,14 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { * @param id 充电站鉴权卡主键 * @return 充电站鉴权卡 */ + // @Override + // public PileAuthCard selectPileAuthCardById(Long id) { + // return pileAuthCardMapper.selectPileAuthCardById(id); + // } + @Override - public PileAuthCard selectPileAuthCardById(Long id) { - return pileAuthCardMapper.selectPileAuthCardById(id); + public PileAuthCardVO getCardInfoById(Long id) { + return pileAuthCardMapper.getCardInfoById(id); } /** @@ -64,12 +69,12 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { /** * 查询充电站鉴权卡列表 * - * @param pileAuthCard 充电站鉴权卡 + * @param dto 充电站鉴权卡 * @return 充电站鉴权卡集合 */ @Override - public List getPileAuthCardInfoList(PileAuthCard pileAuthCard) { - return pileAuthCardMapper.getPileAuthCardInfoList(pileAuthCard); + public List getPileAuthCardInfoList(PileAuthCardDTO dto) { + return pileAuthCardMapper.getPileAuthCardInfoList(dto); } /** @@ -116,6 +121,22 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { return pileAuthCardMapper.updatePileAuthCard(pileAuthCard); } + @Override + public int updateCardInfo(PileAuthCardDTO dto) { + // 通过手机号查询memberId + MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber()); + if (memberBasicInfo == null) { + // 为空则说明未查到该用户的注册信息 + throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); + } + PileAuthCard pileAuthCard = PileAuthCard.builder() + .id(dto.getId()) + .logicCard(dto.getLogicCard()) + .memberId(memberBasicInfo.getMemberId()) + .build(); + return pileAuthCardMapper.updatePileAuthCard(pileAuthCard); + } + /** * 批量删除充电站鉴权卡 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileAuthCardVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileAuthCardVO.java index d0bbad652..b4493dca5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileAuthCardVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileAuthCardVO.java @@ -2,6 +2,8 @@ package com.jsowell.pile.vo.web; import lombok.Data; +import java.util.Date; + /** * 鉴权卡VO * @@ -16,7 +18,13 @@ public class PileAuthCardVO { private String physicsCard; + private String status; + + private String createTime; + private String memberId; + private String phoneNumber; + private String nickName; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml index 4f3a44584..c79708139 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml @@ -35,11 +35,28 @@ - + select + t1.id, + t1.logic_card as logicCard, + t1.physics_card as physicsCard, + t1.status, + t1.create_time as createTime, + t1.member_id as memberId, + t2.mobile_number as phoneNumber, + t2.nick_name as nickName + from pile_auth_card t1 + join member_basic_info t2 on t1.member_id = t2.member_id + where t1.del_flag = '0' + and t1.id = #{id} + insert into pile_auth_card @@ -73,7 +90,6 @@ physics_card = #{physicsCard}, status = #{status}, member_id = #{memberId}, - create_time = #{createTime}, create_by = #{createBy}, update_time = #{updateTime}, update_by = #{updateBy}, @@ -122,14 +138,18 @@ t1.id, t1.logic_card as logicCard, t1.physics_card as physicsCard, + t1.status, + t1.create_time as createTime, t1.member_id as memberId, + t2.mobile_number as phoneNumber, t2.nick_name as nickName from pile_auth_card t1 join member_basic_info t2 on t1.member_id = t2.member_id where t1.del_flag = '0' - and logic_card = #{logicCard} - and physics_card = #{physicsCard} - and status = #{status} - and member_id = #{memberId} + and t1.logic_card = #{logicCard} + and t1.physics_card = #{physicsCard} + and t1.status = #{status} + and t2.mobile_number = #{phoneNumber} + and t1.member_id = #{memberId} \ No newline at end of file diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue index 191eb9ee2..78e5008f3 100644 --- a/jsowell-ui/src/views/pile/card/index.vue +++ b/jsowell-ui/src/views/pile/card/index.vue @@ -9,18 +9,18 @@ @keyup.enter.native="handleQuery" /> - + + + + + + + + + - - - @@ -81,7 +81,8 @@ - + + + +