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

jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java

@@ -214,7 +214,7 @@ public class MemberController extends BaseController {
 		try {
 			MemberPlateNumberRelation info = new MemberPlateNumberRelation();
 			info.setMemberId(memberId);
-			List<MemberPlateNumberRelation> resultList = memberPlateNumberRelationService.selectMemberLicensePlateNumberRelationList(info);
+			List<MemberPlateNumberRelation> resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info);
 			response = new RestApiResponse<>(resultList);
 		} catch (Exception e) {
 			logger.error("通过 memberId 查询用户个人基本信息 error", e);

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -251,7 +251,7 @@ public class MemberService {
 		MemberPlateNumberRelation relation = new MemberPlateNumberRelation();
 		relation.setMemberId(dto.getMemberId());
 		relation.setLicensePlateNumber(dto.getCarNo());
-		List<MemberPlateNumberRelation> list = memberPlateNumberRelationService.selectMemberLicensePlateNumberRelationList(relation);
+		List<MemberPlateNumberRelation> list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation);
 		if (CollectionUtils.isNotEmpty(list)) {
 			// 不为空说明该用户绑定过此车牌号
 			throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING);

jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java

@@ -20,16 +20,16 @@ public class Constants {
 	public static final String SOCKET_IP = "127.0.0.1";
 	public static final Integer SOCKET_PORT = 9011;
 
-	public static final String updateServerIP = "192.168.2.2";
+	public static final String updateServerIP = "192.168.2.5";
 	public static final int port = 0x15;
 
 	public static final byte[] updateServerPort = new byte[]{port};
 
-	public static final String updateServerUserName = "vuser1";
+	public static final String updateServerUserName = "ftpuser";
 
-	public static final String updateServerPassword = "vuser1";
+	public static final String updateServerPassword = "ftp123456";
 
-	public static final String filePath = "/test.bin";
+	public static final String filePath = "/pile/test.bin";
 
 	public static final String partnerId = "1632405339"; // 商户号Id
 

jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java

@@ -1,7 +1,6 @@
 package com.jsowell.pile.domain;
 
 import com.jsowell.common.annotation.Excel;
-import com.jsowell.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java

@@ -10,7 +10,7 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation;
  * @author jsowell
  * @date 2023-03-06
  */
-public interface MemberLicensePlateNumberRelationMapper {
+public interface MemberPlateNumberRelationMapper {
     /**
      * 查询用户车牌对应关系
      *
@@ -25,7 +25,7 @@ public interface MemberLicensePlateNumberRelationMapper {
      * @param memberLicensePlateNumberRelation 用户车牌对应关系
      * @return 用户车牌对应关系集合
      */
-    public List<MemberPlateNumberRelation> selectMemberLicensePlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation);
+    public List<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation);
 
     /**
      * 新增用户车牌对应关系
@@ -62,7 +62,7 @@ public interface MemberLicensePlateNumberRelationMapper {
     /**
      * 用户解除绑定车牌号（逻辑删除，将 del_flag 改为 1）
      *
-     * @param dto
+     * @param ids
      * @return
      */
     public int deleteCarNoByParams(List<Integer> ids);

jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java

@@ -25,7 +25,7 @@ public interface IMemberPlateNumberRelationService
      * @param memberLicensePlateNumberRelation 用户车牌对应关系
      * @return 用户车牌对应关系集合
      */
-    public List<MemberPlateNumberRelation> selectMemberLicensePlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation);
+    public List<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation);
 
     /**
      * 新增用户车牌对应关系

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java

@@ -4,14 +4,12 @@ import com.google.common.collect.Lists;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.MemberBasicInfo;
+import com.jsowell.pile.domain.MemberPlateNumberRelation;
 import com.jsowell.pile.domain.MemberWalletInfo;
 import com.jsowell.pile.domain.MemberWalletLog;
 import com.jsowell.pile.dto.BindingCarNoDTO;
 import com.jsowell.pile.dto.MemberRegisterAndLoginDTO;
-import com.jsowell.pile.mapper.MemberBasicInfoMapper;
+import com.jsowell.pile.mapper.*;
-import com.jsowell.pile.mapper.MemberWalletInfoMapper;
-import com.jsowell.pile.mapper.MemberWalletLogMapper;
-import com.jsowell.pile.mapper.PileBasicInfoMapper;
 import com.jsowell.pile.service.IMemberBasicInfoService;
 import com.jsowell.pile.service.IPileBasicInfoService;
 import com.jsowell.pile.vo.uniapp.MemberVO;
@@ -25,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 会员基础信息Service业务层处理
@@ -46,6 +45,9 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 
 	@Autowired
 	private IPileBasicInfoService pileBasicInfoService;
+
+	@Autowired
+	private MemberPlateNumberRelationMapper memberPlateNumberRelationMapper;
 	/**
 	 * 查询会员基础信息
 	 *
@@ -235,6 +237,13 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 	public MemberVO queryMemberInfoByMemberId(String memberId) {
 		// 加缓存
 		MemberVO vo = memberBasicInfoMapper.queryMemberInfoByMemberId(memberId);
+		MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation();
+		memberPlateNumberRelation.setMemberId(memberId);
+		List<MemberPlateNumberRelation> list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
+		List<String> plateNumberList = list.stream()
+				.map(MemberPlateNumberRelation::getLicensePlateNumber)
+				.collect(Collectors.toList());
+		vo.setPlateNumberList(plateNumberList);
 		return vo;
 	}
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.jsowell.pile.mapper.MemberLicensePlateNumberRelationMapper;
+import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper;
 import com.jsowell.pile.domain.MemberPlateNumberRelation;
 import com.jsowell.pile.service.IMemberPlateNumberRelationService;
 
@@ -17,7 +17,7 @@ import com.jsowell.pile.service.IMemberPlateNumberRelationService;
 @Service
 public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberRelationService {
     @Autowired
-    private MemberLicensePlateNumberRelationMapper memberLicensePlateNumberRelationMapper;
+    private MemberPlateNumberRelationMapper memberLicensePlateNumberRelationMapper;
 
     /**
      * 查询用户车牌对应关系
@@ -37,8 +37,8 @@ public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberR
      * @return 用户车牌对应关系
      */
     @Override
-    public List<MemberPlateNumberRelation> selectMemberLicensePlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation) {
+    public List<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberLicensePlateNumberRelation) {
-        return memberLicensePlateNumberRelationMapper.selectMemberLicensePlateNumberRelationList(memberLicensePlateNumberRelation);
+        return memberLicensePlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberLicensePlateNumberRelation);
     }
 
     /**

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 用户信息VO
@@ -53,4 +54,9 @@ public class MemberVO {
      */
     private BigDecimal totalAccountAmount;
 
+    /**
+     * 车牌号
+     */
+    private List<String> plateNumberList;
+
 }

jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsowell.pile.mapper.MemberLicensePlateNumberRelationMapper">
+<mapper namespace="com.jsowell.pile.mapper.MemberPlateNumberRelationMapper">
 
     <resultMap type="com.jsowell.pile.domain.MemberPlateNumberRelation" id="MemberLicensePlateNumberRelationResult">
         <result property="id"    column="id"    />
@@ -22,7 +22,7 @@
         id, member_id, phone_number, license_plate_number, create_time, del_flag
     </sql>
 
-    <select id="selectMemberLicensePlateNumberRelationList" parameterType="com.jsowell.pile.domain.MemberPlateNumberRelation" resultMap="MemberLicensePlateNumberRelationResult">
+    <select id="selectMemberPlateNumberRelationList" parameterType="com.jsowell.pile.domain.MemberPlateNumberRelation" resultMap="MemberLicensePlateNumberRelationResult">
         select
             <include refid="Base_Column_List"/>
         from member_plate_number_relation

jsowell-ui/src/views/member/info/detail.vue

@@ -24,6 +24,9 @@
                 <el-descriptions-item label="昵称">
                   {{memberInfo.nickName}}
                 </el-descriptions-item>
+                <el-descriptions-item label="已绑车牌" v-for="plateNumber in plateNumberList">
+                  {{plateNumber}}
+                </el-descriptions-item>
                 <el-descriptions-item label="本金余额">
                   {{memberInfo.principalBalance}}
                 </el-descriptions-item>
@@ -252,6 +255,7 @@ export default {
       memberId: this.$route.params.memberId,
       // 会员信息
       memberInfo: {},
+      plateNumberList: [],
       // 会员个人桩列表
       personalPileInfoList: [],
       personalPileTotal: 0,
@@ -302,6 +306,7 @@ export default {
       getInfo(this.memberId).then(response => {
         console.log("getMemberInfo==", response);
         this.memberInfo = response.data;
+        this.plateNumberList = response.data.plateNumberList;
       });
     },
     // 查询会员个人桩列表