From 54a34e5d6afaf78f9b2e0d969b9625f634d75fb9 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 24 Mar 2023 10:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E9=89=B4=E6=9D=83=E5=8D=A1?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/PileAuthCardController.java | 16 ++++++- .../com/jsowell/pile/dto/PileAuthCardDTO.java | 16 +++++++ .../pile/service/IPileAuthCardService.java | 9 ++++ .../service/impl/PileAuthCardServiceImpl.java | 30 ++++++++++++ jsowell-ui/src/views/pile/card/index.vue | 47 ++++++++++++------- 5 files changed, 98 insertions(+), 20 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java 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 bac9471b1..fdb089dfb 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 @@ -3,6 +3,8 @@ package com.jsowell.web.controller.pile; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.jsowell.common.exception.BusinessException; +import com.jsowell.pile.dto.PileAuthCardDTO; import com.jsowell.pile.vo.web.PileAuthCardVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -68,14 +70,24 @@ public class PileAuthCardController extends BaseController { return AjaxResult.success(pileAuthCardService.selectPileAuthCardById(id)); } + /** + * 新增充电站鉴权卡 + */ + // @PreAuthorize("@ss.hasPermi('pile:card:add')") + // @Log(title = "充电站鉴权卡", businessType = BusinessType.INSERT) + // @PostMapping + // public AjaxResult add(@RequestBody PileAuthCard pileAuthCard) { + // return toAjax(pileAuthCardService.insertPileAuthCard(pileAuthCard)); + // } + /** * 新增充电站鉴权卡 */ @PreAuthorize("@ss.hasPermi('pile:card:add')") @Log(title = "充电站鉴权卡", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody PileAuthCard pileAuthCard) { - return toAjax(pileAuthCardService.insertPileAuthCard(pileAuthCard)); + public AjaxResult add(@RequestBody PileAuthCardDTO dto) { + return toAjax(pileAuthCardService.insertPileAuthCardForWeb(dto)); } /** 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 new file mode 100644 index 000000000..d4423650f --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java @@ -0,0 +1,16 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +/** + * 鉴权卡查询dto + * + * @author JS-ZZA + * @date 2023/3/24 9:29 + */ +@Data +public class PileAuthCardDTO { + private String logicCard; + + private String phoneNumber; +} 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 c49aaeddc..e4a324881 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 @@ -3,6 +3,7 @@ package com.jsowell.pile.service; import java.util.List; import com.jsowell.pile.domain.PileAuthCard; +import com.jsowell.pile.dto.PileAuthCardDTO; import com.jsowell.pile.vo.web.PileAuthCardVO; /** @@ -51,6 +52,14 @@ public interface IPileAuthCardService { */ public int insertPileAuthCard(PileAuthCard pileAuthCard); + /** + * 新增充电站鉴权卡 + * + * @param dto 充电站鉴权卡 + * @return 结果 + */ + int insertPileAuthCardForWeb(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 ca0e3f543..e175b75f1 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 @@ -2,7 +2,12 @@ package com.jsowell.pile.service.impl; import java.util.List; +import com.jsowell.common.enums.ykc.ReturnCodeEnum; +import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; +import com.jsowell.pile.domain.MemberBasicInfo; +import com.jsowell.pile.dto.PileAuthCardDTO; +import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.vo.web.PileAuthCardVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +26,9 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { @Autowired private PileAuthCardMapper pileAuthCardMapper; + @Autowired + private IMemberBasicInfoService memberBasicInfoService; + /** * 查询充电站鉴权卡 * @@ -75,6 +83,28 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { return pileAuthCardMapper.insertPileAuthCard(pileAuthCard); } + /** + * 新增充电站鉴权卡(后管用) + * + * @param dto 充电站鉴权卡 + * @return 结果 + */ + @Override + public int insertPileAuthCardForWeb(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() + .logicCard(dto.getLogicCard()) + .memberId(memberBasicInfo.getMemberId()) + .status("1") + .build(); + return pileAuthCardMapper.insertPileAuthCard(pileAuthCard); + } + /** * 修改充电站鉴权卡 * diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue index ce2b0d7da..191eb9ee2 100644 --- a/jsowell-ui/src/views/pile/card/index.vue +++ b/jsowell-ui/src/views/pile/card/index.vue @@ -32,16 +32,16 @@ - - - - - - - - - - + + 新增 + - - - - - - - - + + + + + + + + + + +
确 定 @@ -181,6 +184,13 @@ export default { form: {}, // 表单校验 rules: { + phoneNumber: [ + { + pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, + message: "请输入正确的手机号码", + trigger: "blur" + } + ], } }; }, @@ -209,6 +219,7 @@ export default { logicCard: null, physicsCard: null, memberId: null, + phoneNumber: null, createTime: null, createBy: null, updateTime: null,