Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

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<PileAuthCard> list = pileAuthCardService.selectPileAuthCardList(pileAuthCard);
+        // List<PileAuthCard> list = pileAuthCardService.selectPileAuthCardList(pileAuthCard);
+        List<PileAuthCardVO> list = pileAuthCardService.getPileAuthCardInfoList(pileAuthCard);
         return getDataTable(list);
     }
 

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<PileAuthCard> selectPileAuthCardList(PileAuthCard pileAuthCard);
 
+    /**
+     * 查询充电站鉴权卡列表
+     *
+     * @param pileAuthCard 充电站鉴权卡
+     * @return 充电站鉴权卡集合
+     */
+    public List<PileAuthCardVO> getPileAuthCardInfoList(PileAuthCard pileAuthCard);
+
     /**
      * 新增充电站鉴权卡
      *

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<PileAuthCard> selectPileAuthCardList(PileAuthCard pileAuthCard);
 
+    /**
+     * 查询充电站鉴权卡列表
+     *
+     * @param pileAuthCard 充电站鉴权卡
+     * @return 充电站鉴权卡集合
+     */
+    public List<PileAuthCardVO> getPileAuthCardInfoList(PileAuthCard pileAuthCard);
+
     /**
      * 新增充电站鉴权卡
      *

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<PileAuthCardVO> getPileAuthCardInfoList(PileAuthCard pileAuthCard) {
+        return pileAuthCardMapper.getPileAuthCardInfoList(pileAuthCard);
+    }
+
     /**
      * 新增充电站鉴权卡
      *

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;
+}

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}
     </update>
+
+    <select id="getPileAuthCardInfoList" resultType="com.jsowell.pile.vo.web.PileAuthCardVO">
+        select
+            t1.id,
+            t1.logic_card as logicCard,
+            t1.physics_card as physicsCard,
+            t1.member_id as memberId,
+            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'
+        <if test="logicCard != null  and logicCard != ''"> and logic_card = #{logicCard}</if>
+        <if test="physicsCard != null  and physicsCard != ''"> and physics_card = #{physicsCard}</if>
+        <if test="status != null  and status != ''"> and status = #{status}</if>
+        <if test="memberId != null  and memberId != ''"> and member_id = #{memberId}</if>
+    </select>
 </mapper>

jsowell-ui/src/views/pile/card/index.vue

@@ -82,7 +82,16 @@
 <!--      <el-table-column label="主键" align="center" prop="id" />-->
       <el-table-column label="逻辑卡号" align="center" prop="logicCard" />
       <el-table-column label="物理卡号" align="center" prop="physicsCard" />
-      <el-table-column label="所属用户" align="center" prop="memberId" />
+      <el-table-column label="所属用户" align="center" prop="nickName" >
+        <template slot-scope="scope">
+          <router-link
+            :to="'/member/detail/index/'+scope.row.memberId"
+            class="link-type"
+          >
+            <span>{{ scope.row.nickName }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button