qiubinghui
/
zhywpt-issuer
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

卡、签下黑反白调整

master
huminghao 4 dagar sedan
förälder
31b908e003
incheckning
6d072a95fd
8 ändrade filer med 69 tillägg och 75 borttagningar
Delad Vy Visa Diff Statistik
  1. 1
    1
      gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkBlackCardRepo.java
  2. 1
    1
      gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkBlackObuRepo.java
  3. 18
    18
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/bls/BlackCardManagerImpl.java
  4. 18
    18
      zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/bls/BlackObuManagerImpl.java
  5. 12
    11
      zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardInManager.java
  6. 7
    11
      zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardOutManager.java
  7. 5
    4
      zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuInManager.java
  8. 7
    11
      zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuOutManager.java

+ 1
- 1
gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkBlackCardRepo.java Visa fil

@@ -14,7 +14,7 @@ public interface QtkBlackCardRepo extends AbstractJpaRepo<QtkBlackCard, String>
public List<QtkBlackCard> listCardBlackByStatus(String cardId, int status);

@Query("from QtkBlackCard where cardId=?1 and type = ?2 order by creationTime desc")
List<QtkBlackCard> queryByCardIdAndType(String cardId, CardBlackType type);
QtkBlackCard findByCardIdAndType(String cardId, CardBlackType type);

@Query(nativeQuery = true,
value = "select c.agency_id as agencyId,count(*) as count,d.PRODUCT_ID as productId,d.PRODUCT_NAME as productName,d.VEHICLE_CLASS as vehicleClass,d.CHANNEL_ID as channelId,case when c.DEBIT_TYPE = 1 then 3 else case when substr(c.CARD_ID,9,2) = '23' then 2 else 1 end end As cardtype from QTK_BLACK_CARD b, qtk_cardinfo c ,ISSUE_ORDERINFO d where b.card_id = c.card_id and b.CARD_ID=d.CARD_ID and substr(CREATION_TIME,0,10) = ?1 group by c.agency_id ,case when c.DEBIT_TYPE = 1 then 3 else case when substr(c.CARD_ID,9,2) = '23' then 2 else 1 end end,d.PRODUCT_ID,d.PRODUCT_NAME,d.VEHICLE_CLASS,d.CHANNEL_ID ")

+ 1
- 1
gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkBlackObuRepo.java Visa fil

@@ -14,6 +14,6 @@ public interface QtkBlackObuRepo extends AbstractJpaRepo<QtkBlackObu, String>{
public List<QtkBlackObu> listObuBlackByStatus(String obuId, Integer status);

@Query(" from QtkBlackObu where obuId = ?1 and type = ?2 order by creationTime desc")
List<QtkBlackObu> queryByObuIdAndType(String obuId, ObuBlackType type);
QtkBlackObu findByObuIdAndType(String obuId, ObuBlackType type);

}

+ 18
- 18
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/bls/BlackCardManagerImpl.java Visa fil

@@ -91,13 +91,13 @@ public class BlackCardManagerImpl extends AbstractCommManager implements BlackCa
@Override
public BlackCardInResponseDTO cardIn(BlackCardInRequestDTO req) throws ManagerException {
blackReasonValidate(req);
QtkCardInfo cardInfo = cardInfoRepo.findByCardId(req.getCardId());
if (cardInfo == null) {
throw new ManagerException("未查询到该卡号信息！");
}
if (cardInfo.getCardStatus() != CardStatus.ZC){
throw new ManagerException("正常状态的卡号才能进行下黑！");
}
// QtkCardInfo cardInfo = cardInfoRepo.findByCardId(req.getCardId());
// if (cardInfo == null) {
// throw new ManagerException("未查询到该卡号信息！");
// }
// if (cardInfo.getCardStatus() != CardStatus.ZC){
// throw new ManagerException("正常状态的卡号才能进行下黑！");
// }
CardInRequest cardInRequest = copyProperties(req, new CardInRequest());
cardInRequest.setType(req.getType().getCode());
cardInRequest.setSourceIn(req.getOrderSource().name());
@@ -128,10 +128,10 @@ public class BlackCardManagerImpl extends AbstractCommManager implements BlackCa

@Override
public BlackCardOutResponseDTO cardOut(BlackCardOutRequestDTO req) throws ManagerException {
QtkCardInfo cardInfo = cardInfoRepo.findByCardId(req.getCardId());
if (cardInfo == null) {
throw new ManagerException("未查询到该卡号信息！");
}
// QtkCardInfo cardInfo = cardInfoRepo.findByCardId(req.getCardId());
// if (cardInfo == null) {
// throw new ManagerException("未查询到该卡号信息！");
// }
CardOutRequest cardOutRequest = copyProperties(req, new CardOutRequest());
cardOutRequest.setType(req.getType().getCode());
cardOutRequest.setSourceIn(req.getOrderSource().name());
@@ -153,17 +153,17 @@ public class BlackCardManagerImpl extends AbstractCommManager implements BlackCa
StringBuffer errorMsg = new StringBuffer();
//校验excel的数据
importModelValid(blackCardImportModel, errorMsg);
QtkCardInfo cardInfo = cardInfoRepo.findByCardId(blackCardImportModel.getCardId());
if (cardInfo == null) {
errorMsg.append("未查询到该卡号信息！");
}
// QtkCardInfo cardInfo = cardInfoRepo.findByCardId(blackCardImportModel.getCardId());
// if (cardInfo == null) {
// errorMsg.append("未查询到该卡号信息！");
// }
BlackCardImportErrorModel importErrorModel = new BlackCardImportErrorModel();
if (errorMsg.length() == 0){

if (blackCardImportModel.getStatus() == 1){
if (cardInfo.getCardStatus() != CardStatus.ZC){
errorMsg.append("正常状态的卡号才能进行下黑！");
}
// if (cardInfo.getCardStatus() != CardStatus.ZC){
// errorMsg.append("正常状态的卡号才能进行下黑！");
// }
if (errorMsg.length() == 0){
CardInRequest cardInRequest = copyProperties(blackCardImportModel, new CardInRequest());
cardInRequest.setSourceIn(req.getOrderSource().name());

+ 18
- 18
zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/bls/BlackObuManagerImpl.java Visa fil

@@ -90,13 +90,13 @@ public class BlackObuManagerImpl extends AbstractCommManager implements BlackObu
@Override
public BlackObuInResponseDTO obuIn(BlackObuInRequestDTO req) throws ManagerException {
blackReasonValidate(req);
QtkObuInfo obuInfo = obuInfoRepo.findByObuId(req.getObuId());
if (obuInfo == null) {
throw new ManagerException("未查询到该签号信息！");
}
if (obuInfo.getObuStatus() != ObuStatus.ZC){
throw new ManagerException("正常状态的签号才能进行下黑！");
}
// QtkObuInfo obuInfo = obuInfoRepo.findByObuId(req.getObuId());
// if (obuInfo == null) {
// throw new ManagerException("未查询到该签号信息！");
// }
// if (obuInfo.getObuStatus() != ObuStatus.ZC){
// throw new ManagerException("正常状态的签号才能进行下黑！");
// }
ObuInRequest obuInRequest = copyProperties(req, new ObuInRequest());
obuInRequest.setType(req.getType().getCode());
obuInRequest.setSourceIn(req.getOrderSource().name());
@@ -123,10 +123,10 @@ public class BlackObuManagerImpl extends AbstractCommManager implements BlackObu

@Override
public BlackObuOutResponseDTO obuOut(BlackObuOutRequestDTO req) throws ManagerException {
QtkObuInfo obuInfo = obuInfoRepo.findByObuId(req.getObuId());
if (obuInfo == null) {
throw new ManagerException("未查询到该签号信息！");
}
// QtkObuInfo obuInfo = obuInfoRepo.findByObuId(req.getObuId());
// if (obuInfo == null) {
// throw new ManagerException("未查询到该签号信息！");
// }
ObuOutRequest obuOutRequest = copyProperties(req, new ObuOutRequest());
obuOutRequest.setType(req.getType().getCode());
obuOutRequest.setSourceIn(req.getOrderSource().name());
@@ -148,17 +148,17 @@ public class BlackObuManagerImpl extends AbstractCommManager implements BlackObu
StringBuffer errorMsg = new StringBuffer();
//校验excel的数据
importModelValid(blackObuImportModel, errorMsg);
QtkObuInfo obuInfo = obuInfoRepo.findByObuId(blackObuImportModel.getObuId());
if (obuInfo == null) {
errorMsg.append("未查询到该签号信息！");
}
// QtkObuInfo obuInfo = obuInfoRepo.findByObuId(blackObuImportModel.getObuId());
// if (obuInfo == null) {
// errorMsg.append("未查询到该签号信息！");
// }

BlackObuImportErrorModel importErrorModel = new BlackObuImportErrorModel();
if (errorMsg.length() == 0){
if (blackObuImportModel.getStatus() == 1){
if (obuInfo.getObuStatus() != ObuStatus.ZC){
errorMsg.append("正常状态的签号才能进行下黑！");
}
// if (obuInfo.getObuStatus() != ObuStatus.ZC){
// errorMsg.append("正常状态的签号才能进行下黑！");
// }
if (errorMsg.length() == 0){
ObuInRequest obuInRequest = copyProperties(blackObuImportModel, new ObuInRequest());
obuInRequest.setSourceIn(req.getOrderSource().name());

+ 12
- 11
zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardInManager.java Visa fil

@@ -4,7 +4,6 @@ import cn.com.taiji.bls.manager.AbstractCommManager;
import cn.com.taiji.bls.manager.globe.GlobalTransactionManager;
import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.manager.net.http.ServiceHandleException;
import cn.com.taiji.common.pub.CollectionTools;
import cn.com.taiji.core.entity.basic.QtkBlackCard;
import cn.com.taiji.core.entity.basic.QtkBlackCardHis;
import cn.com.taiji.core.entity.basic.QtkCardInfo;
@@ -57,24 +56,23 @@ public class BlackCardInManager extends AbstractCommManager implements LogManage
throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("请求参数orgCode必填！");
}
blackReasonValidate(request);
QtkCardInfo cardInfo = cardInfoRepo.findByCardId(request.getCardId());
if (cardInfo == null) {
throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("未查询到该卡号信息！");
}
if (cardInfo.getCardStatus() != CardStatus.ZC){
throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("正常状态的卡号才能进行下黑！");
}
// QtkCardInfo cardInfo = cardInfoRepo.findByCardId(request.getCardId());
// if (cardInfo == null) {
// throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("未查询到该卡号信息！");
// }
// if (cardInfo.getCardStatus() != CardStatus.ZC){
// throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("正常状态的卡号才能进行下黑！");
// }
QtkBlackCard blackCard = null;
//发送,调部中心接口
YgzCardBlackUploadResponse uploadResponse = cardBlackUpload(request.getCardId(), 1, request.getType());
//下黑
if (uploadResponse.getUploadStatus() == 1 || uploadResponse.getUploadStatus() == 2) {//这里msg的内容一定是：已在部黑名单中,无需再次上传！
List<QtkBlackCard> blackCardList = blackCardRepo.queryByCardIdAndType(request.getCardId(), CardBlackType.fromCode(request.getType()));
blackCard = blackCardRepo.findByCardIdAndType(request.getCardId(), CardBlackType.fromCode(request.getType()));
//可能已在部黑名单中，但本地无数据，本地无数据则新增一条
if (CollectionTools.isEmpty(blackCardList)) {
if (blackCard == null) {
blackCard = addBlackCard(request,blackDate);
}else {
blackCard = CollectionTools.extractOne(blackCardList);
blackDate = blackCard.getCreateTime();
}
//更新qtkCardInfo
@@ -123,6 +121,9 @@ public class BlackCardInManager extends AbstractCommManager implements LogManage
if (cardInfo == null){
return;
}
if(cardInfo.getCardStatus() == CardStatus.WKZX || cardInfo.getCardStatus() == CardStatus.YKZX){
return;
}
CardBlackType cardBlackType = CardBlackType.fromCode(request.getType());
CardStatus cardStatus = CardStatus.fromCardBlackType(cardBlackType);
if (cardStatus == null){

+ 7
- 11
zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardOutManager.java Visa fil

@@ -2,9 +2,7 @@ package cn.com.taiji.bls.manager.blk;

import cn.com.taiji.bls.manager.AbstractCommManager;
import cn.com.taiji.bls.manager.globe.GlobalTransactionManager;
import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.manager.net.http.ServiceHandleException;
import cn.com.taiji.common.pub.CollectionTools;
import cn.com.taiji.core.entity.basic.QtkBlackCard;
import cn.com.taiji.core.entity.basic.QtkBlackCardHis;
import cn.com.taiji.core.entity.basic.QtkCardInfo;
@@ -28,7 +26,6 @@ import org.springframework.util.StringUtils;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;

@Service
public class BlackCardOutManager extends AbstractCommManager implements LogManager<CardOutRequest, AbstractBlsResponse, BlsInterfaceLog> {
@@ -50,12 +47,12 @@ public class BlackCardOutManager extends AbstractCommManager implements LogManag
public AbstractBlsResponse serviceHandle(CardOutRequest req) throws ServiceHandleException {
try {
long begin = System.currentTimeMillis();
QtkCardInfo cardInfo = cardInfoRepo.findByCardId(req.getCardId());
if (cardInfo == null) {
throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该卡号信息！");
}
List<QtkBlackCard> blackCardList = blackCardRepo.queryByCardIdAndType(req.getCardId(), CardBlackType.fromCode(req.getType()));
if (CollectionTools.isEmpty(blackCardList)){
// QtkCardInfo cardInfo = cardInfoRepo.findByCardId(req.getCardId());
// if (cardInfo == null) {
// throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该卡号信息！");
// }
QtkBlackCard blackCard = blackCardRepo.findByCardIdAndType(req.getCardId(), CardBlackType.fromCode(req.getType()));
if (blackCard == null){
throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该类型卡号黑名单！");
}
LocalDateTime outDate = LocalDateTime.now();
@@ -63,7 +60,6 @@ public class BlackCardOutManager extends AbstractCommManager implements LogManag
//发送,调部中心接口
YgzCardBlackUploadResponse uploadResponse = blackCardInManager.cardBlackUpload(req.getCardId(), 2, req.getType());
if (uploadResponse.getUploadStatus() == 1 || uploadResponse.getUploadStatus() == 2){
QtkBlackCard blackCard = blackCardList.get(0);
blackCardHis = copyProperties(blackCard, new QtkBlackCardHis(), "id","createTime");
blackCardHis.setStatus(2);//2-反白
blackCardHis.setCreateTime(outDate);
@@ -77,7 +73,7 @@ public class BlackCardOutManager extends AbstractCommManager implements LogManag
blackCardHis.setSourceOut(SourceType.valueOf(req.getSourceIn()));
blackCardHisRepo.save(blackCardHis);
//删除下黑数据
blackCardRepo.deleteAll(blackCardList);
blackCardRepo.delete(blackCard);
//更新qtkCardInfo
updateCardInfo(req,outDate);
}else {

+ 5
- 4
zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuInManager.java Visa fil

@@ -4,7 +4,6 @@ import cn.com.taiji.bls.manager.AbstractCommManager;
import cn.com.taiji.bls.manager.globe.GlobalTransactionManager;
import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.manager.net.http.ServiceHandleException;
import cn.com.taiji.common.pub.CollectionTools;
import cn.com.taiji.core.entity.basic.QtkBlackObu;
import cn.com.taiji.core.entity.basic.QtkBlackObuHis;
import cn.com.taiji.core.entity.basic.QtkObuInfo;
@@ -66,12 +65,11 @@ public class BlackObuInManager extends AbstractCommManager implements LogManager
//发送,调部中心接口
YgzObuBlackUploadResponse uploadResponse = obuBlackUpload(req.getObuId(), 1, req.getType());
if (uploadResponse.getUploadStatus() == 1 || uploadResponse.getUploadStatus() == 2) {//这里msg的内容一定是：已在部黑名单中,无需再次上传！
List<QtkBlackObu> blackObuList = blackObuRepo.queryByObuIdAndType(req.getObuId(), ObuBlackType.fromCode(req.getType()));
blackObu = blackObuRepo.findByObuIdAndType(req.getObuId(), ObuBlackType.fromCode(req.getType()));
//可能已在部黑名单中，但本地无数据，本地无数据则新增一条
if (CollectionTools.isEmpty(blackObuList)) {
if (blackObu == null) {
blackObu = addBlackObu(req,blackDate);
}else {
blackObu = CollectionTools.extractOne(blackObuList);
blackDate = blackObu.getCreateTime();
}
//更新qtkObuInfo
@@ -117,6 +115,9 @@ public class BlackObuInManager extends AbstractCommManager implements LogManager
if (obuInfo == null){
return;
}
if(obuInfo.getObuStatus() == ObuStatus.YQZX || obuInfo.getObuStatus() == ObuStatus.WQZX){
return;
}
ObuBlackType obuBlackType = ObuBlackType.fromCode(request.getType());
ObuStatus obuStatus = ObuStatus.fromObuBlackType(obuBlackType);
if (obuStatus == null){

+ 7
- 11
zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuOutManager.java Visa fil

@@ -2,9 +2,7 @@ package cn.com.taiji.bls.manager.blk;

import cn.com.taiji.bls.manager.AbstractCommManager;
import cn.com.taiji.bls.manager.globe.GlobalTransactionManager;
import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.manager.net.http.ServiceHandleException;
import cn.com.taiji.common.pub.CollectionTools;
import cn.com.taiji.core.entity.basic.QtkBlackObu;
import cn.com.taiji.core.entity.basic.QtkBlackObuHis;
import cn.com.taiji.core.entity.basic.QtkObuInfo;
@@ -28,7 +26,6 @@ import org.springframework.util.StringUtils;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;


@Service
@@ -52,19 +49,18 @@ public class BlackObuOutManager extends AbstractCommManager implements LogManage
try {
long begin = System.currentTimeMillis();
LocalDateTime outDate = LocalDateTime.now();
QtkObuInfo obuInfo = obuInfoRepo.findByObuId(req.getObuId());
if (obuInfo == null) {
throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该签号信息！");
}
List<QtkBlackObu> blackObuList = blackObuRepo.queryByObuIdAndType(req.getObuId(), ObuBlackType.fromCode(req.getType()));
if (CollectionTools.isEmpty(blackObuList)){
// QtkObuInfo obuInfo = obuInfoRepo.findByObuId(req.getObuId());
// if (obuInfo == null) {
// throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该签号信息！");
// }
QtkBlackObu blackObu = blackObuRepo.findByObuIdAndType(req.getObuId(), ObuBlackType.fromCode(req.getType()));
if (blackObu == null){
throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该类型签号黑名单！");
}
QtkBlackObuHis blackObuHis = null;
//发送,调部中心接口
YgzObuBlackUploadResponse uploadResponse = blackObuInManager.obuBlackUpload(req.getObuId(), 2, req.getType());
if (uploadResponse.getUploadStatus() == 1 || uploadResponse.getUploadStatus() == 2){
QtkBlackObu blackObu = blackObuList.get(0);
blackObuHis = copyProperties(blackObu, new QtkBlackObuHis(), "id","createTime");
blackObuHis.setStatus(2);//2-反白
blackObuHis.setCreateTime(outDate);
@@ -78,7 +74,7 @@ public class BlackObuOutManager extends AbstractCommManager implements LogManage
blackObuHis.setSourceOut(SourceType.valueOf(req.getSourceIn()));
blackObuHisRepo.save(blackObuHis);
//删除下黑数据
blackObuRepo.deleteAll(blackObuList);
blackObuRepo.delete(blackObu);
//
updateObuInfo(req,outDate);
}else {

Write Förhandsgranska
Laddar…
Avbryt
Spara