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 09164a085..bac9471b1 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,7 @@ package com.jsowell.web.controller.pile; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.jsowell.pile.vo.web.PileAuthCardVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -41,7 +42,8 @@ public class PileAuthCardController extends BaseController { @GetMapping("/list") public TableDataInfo list(PileAuthCard pileAuthCard) { startPage(); - List list = pileAuthCardService.selectPileAuthCardList(pileAuthCard); + // List list = pileAuthCardService.selectPileAuthCardList(pileAuthCard); + List list = pileAuthCardService.getPileAuthCardInfoList(pileAuthCard); return getDataTable(list); } 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 078411c11..9adbe7c5f 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.vo.web.PileAuthCardVO; import org.springframework.stereotype.Repository; /** @@ -36,6 +37,14 @@ public interface PileAuthCardMapper { */ public List selectPileAuthCardList(PileAuthCard pileAuthCard); + /** + * 查询充电站鉴权卡列表 + * + * @param pileAuthCard 充电站鉴权卡 + * @return 充电站鉴权卡集合 + */ + public List getPileAuthCardInfoList(PileAuthCard pileAuthCard); + /** * 新增充电站鉴权卡 * 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 61b38b3b3..c49aaeddc 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.vo.web.PileAuthCardVO; /** * 充电站鉴权卡Service接口 @@ -34,6 +35,14 @@ public interface IPileAuthCardService { */ public List selectPileAuthCardList(PileAuthCard pileAuthCard); + /** + * 查询充电站鉴权卡列表 + * + * @param pileAuthCard 充电站鉴权卡 + * @return 充电站鉴权卡集合 + */ + public List getPileAuthCardInfoList(PileAuthCard pileAuthCard); + /** * 新增充电站鉴权卡 * 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 bf28692a1..ca0e3f543 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 @@ -3,6 +3,7 @@ package com.jsowell.pile.service.impl; import java.util.List; import com.jsowell.common.util.DateUtils; +import com.jsowell.pile.vo.web.PileAuthCardVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.PileAuthCardMapper; @@ -52,6 +53,17 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { return pileAuthCardMapper.selectPileAuthCardList(pileAuthCard); } + /** + * 查询充电站鉴权卡列表 + * + * @param pileAuthCard 充电站鉴权卡 + * @return 充电站鉴权卡集合 + */ + @Override + public List getPileAuthCardInfoList(PileAuthCard pileAuthCard) { + return pileAuthCardMapper.getPileAuthCardInfoList(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 new file mode 100644 index 000000000..d0bbad652 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileAuthCardVO.java @@ -0,0 +1,22 @@ +package com.jsowell.pile.vo.web; + +import lombok.Data; + +/** + * 鉴权卡VO + * + * @author JS-ZZA + * @date 2023/3/22 14:25 + */ +@Data +public class PileAuthCardVO { + private String id; + + private String logicCard; + + private String physicsCard; + + private String memberId; + + 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 bc72771d7..4f3a44584 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml @@ -116,4 +116,20 @@ where member_id = #{memberId,jdbcType=VARCHAR} and logic_card = #{logicCard,jdbcType=VARCHAR} + + \ 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 932296b8b..ce2b0d7da 100644 --- a/jsowell-ui/src/views/pile/card/index.vue +++ b/jsowell-ui/src/views/pile/card/index.vue @@ -82,7 +82,16 @@ - + + +