autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-04 18:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 鉴权卡启动充电

Browse Source
This commit is contained in:
Lemon
2023-03-30 10:54:02 +08:00
parent a161952d7e
commit 04123a80a5
7 changed files with 79 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -278,10 +278,7 @@ public class MemberService {
.build();
checkVerificationCode(registerAndLoginDTO);
// 判断当前鉴权卡是否被绑定过
PileAuthCard authCard = PileAuthCard.builder()
.logicCard(dto.getLogicCard())
.build();
PileAuthCard pileAuthCardInfo = pileAuthCardService.selectPileAuthCardInfo(authCard);
PileAuthCard pileAuthCardInfo = pileAuthCardService.selectCardInfoByLogicCard(dto.getLogicCard());
if (pileAuthCardInfo == null){
// 为空说明没查到此卡信息
throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARD_HAS_NO_INFO);
@@ -294,10 +291,12 @@ public class MemberService {
// 密钥不一致，不能绑定
throw new BusinessException(ReturnCodeEnum.CODE_SECRET_KEY_NOT_SAME);
}
authCard.setMemberId(dto.getMemberId());
authCard.setStatus("1"); // 1-正常使用
authCard.setCreateBy(dto.getMemberId());
authCard.setId(pileAuthCardInfo.getId());
PileAuthCard authCard = PileAuthCard.builder()
.memberId(dto.getMemberId())
.status("1") // 1-正常使用
.createBy(dto.getMemberId())
.id(pileAuthCardInfo.getId())
.build();
return pileAuthCardService.updatePileAuthCard(authCard);
}

12
jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java
View File

@@ -128,10 +128,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
if (StringUtils.equals("01", startMode)) {
// 刷卡启动充电
// 根据传过来的物理卡号查询数据库中此卡信息
PileAuthCard pileAuthCard = PileAuthCard.builder()
.logicCard(physicsCard)
.build();
PileAuthCard pileAuthCardInfo = pileAuthCardService.selectPileAuthCardInfo(pileAuthCard);
PileAuthCard pileAuthCardInfo = pileAuthCardService.selectCardInfoByLogicCard(physicsCard);
if (pileAuthCardInfo == null) {
// 未查到此卡信息
throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARD_HAS_NO_INFO);
@@ -202,8 +199,11 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
pileTransactionService.doCreateOrder(createOrderTransactionDTO);
// 将卡状态改为启动锁定
pileAuthCard.setId(pileAuthCardInfo.getId());
pileAuthCard.setStatus("2");
PileAuthCard pileAuthCard = PileAuthCard.builder()
.id(pileAuthCardInfo.getId())
.logicCard(physicsCard)
.status("2")
.build();
pileAuthCardService.updatePileAuthCard(pileAuthCard);
}
} catch (BusinessException e){

12
jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
View File

@@ -546,15 +546,15 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
}
if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
// 根据物理卡号查出所属用户
PileAuthCard pileAuthCard = PileAuthCard.builder()
.logicCard(data.getLogicCard())
.build();
PileAuthCard cardInfo = pileAuthCardService.selectPileAuthCardInfo(pileAuthCard);
PileAuthCard cardInfo = pileAuthCardService.selectCardInfoByLogicCard(data.getLogicCard());
if (cardInfo != null) {
orderBasicInfo.setMemberId(cardInfo.getMemberId());
// 将此卡状态改为正常
pileAuthCard.setId(cardInfo.getId());
pileAuthCard.setStatus("1");
PileAuthCard pileAuthCard = PileAuthCard.builder()
.logicCard(data.getLogicCard())
.id(cardInfo.getId())
.status("1")
.build();
pileAuthCardService.updatePileAuthCard(pileAuthCard);
}

9
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java
View File

@@ -5,6 +5,7 @@ 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.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
/**
@@ -87,4 +88,12 @@ public interface PileAuthCardMapper {
public int deletePileAuthCardByIds(Long[] ids);
int unBindingCard(PileAuthCard pileAuthCard);
/**
* 根据逻辑卡号查询某状态的鉴权卡信息
* @param status
* @param logicCard
* @return
*/
PileAuthCard selectSomeStatusCardInfo(@Param("status") String status, @Param("logicCard") String logicCard);
}

15
jsowell-pile/src/main/java/com/jsowell/pile/service/IPileAuthCardService.java
View File

@@ -96,4 +96,19 @@ public interface IPileAuthCardService {
int deactivateCard(Long id);
int unBindingCard(PileAuthCard pileAuthCard);
/**
* 根据逻辑卡号查询某状态的鉴权卡信息
* @param status
* @param logicCard
* @return
*/
PileAuthCard selectSomeStatusCardInfo(String status, String logicCard);
/**
* 通过逻辑卡号查询卡信息
* @param logicCard
* @return
*/
PileAuthCard selectCardInfoByLogicCard(String logicCard);
}

21
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java
View File

@@ -180,4 +180,25 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
public int unBindingCard(PileAuthCard pileAuthCard) {
return pileAuthCardMapper.unBindingCard(pileAuthCard);
}
/**
* 根据逻辑卡号查询某状态的鉴权卡信息
* @param status
* @param logicCard
* @return
*/
@Override
public PileAuthCard selectSomeStatusCardInfo(String status, String logicCard) {
return pileAuthCardMapper.selectSomeStatusCardInfo(status, logicCard);
}
/**
* 通过逻辑卡号查询卡信息
* @param logicCard
* @return
*/
@Override
public PileAuthCard selectCardInfoByLogicCard(String logicCard) {
return selectSomeStatusCardInfo(null, logicCard);
}
}

15
jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml
View File

@@ -144,6 +144,21 @@
and logic_card = #{logicCard,jdbcType=VARCHAR}
</update>
<select id="selectSomeStatusCardInfo" resultType="com.jsowell.pile.domain.PileAuthCard">
select
<include refid="Base_Column_List"/>
from
pile_auth_card
where 1 = 1
<if test="status != null and status != ''">
and status = #{status,jdbcType=VARCHAR}
</if>
<if test="logicCard != null and logicCard != ''">
and logic_card = #{logicCard,jdbcType=VARCHAR}
</if>
limit 1
</select>
<select id="getPileAuthCardInfoList" resultType="com.jsowell.pile.vo.web.PileAuthCardVO">
select
t1.id,