blk添加日志

gly-base-core/src/main/java/cn/com/taiji/core/entity/log/BlkInterfaceLog.java

@@ -0,0 +1,17 @@
+package cn.com.taiji.core.entity.log;
+
+import cn.com.taiji.core.entity.AbstractInterfaceLog;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Getter
+@Setter
+@Accessors(chain = true)
+@Entity
+@Table(name = "log_blk_interface")
+public class BlkInterfaceLog extends AbstractInterfaceLog {
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/portal/ChangeAccountInfoRequest.java

@@ -41,11 +41,10 @@ public class ChangeAccountInfoRequest extends AbstractPortalRequest<ChangeAccoun
 
     private LocalDate expireDate;// 有效期截止日期;
 
-    @NotBlank(message = "地址不能为空")
     private String address;// 地址;
 
-    @NotBlank(message = "Token不能为空")
-    private String accessToken;//token
+    @NotBlank(message = "账号id不能为空")
+    private String accountId;//账号id
 
     @NotNull(message = "来源不能为空")
     private SourceType loginSource;

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/log/BlkInterfaceLogRepo.java

@@ -0,0 +1,8 @@
+package cn.com.taiji.core.repo.jpa.log;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.log.BlkInterfaceLog;
+import cn.com.taiji.core.entity.log.PortalInterfaceLog;
+
+public interface BlkInterfaceLogRepo extends AbstractJpaRepo<BlkInterfaceLog, String> {
+}

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/portal/PortalManagerImpl.java

@@ -90,6 +90,8 @@ public class PortalManagerImpl extends AbstractCommManager implements PortalMana
 
     @Override
     public ChangeAccountInfoResponse changeInfo(AccountInfoChangeInfoRequestDTO dto) throws ManagerException {
-        return jsonPostRepeat(copyProperties(dto, new ChangeAccountInfoRequest()));
+        ChangeAccountInfoRequest request = copyProperties(dto, new ChangeAccountInfoRequest());
+        request.setAccountId(findAccountInfoByToken(dto.getAccessToken()).getAccount());
+        return jsonPostRepeat(request);
     }
 }

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardInManager.java

@@ -0,0 +1,80 @@
+package cn.com.taiji.bls.manager.blk;
+
+import cn.com.taiji.bls.tools.SourceTargetMapper;
+import cn.com.taiji.common.manager.AbstractManager;
+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.dict.basic.CardBlackType;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.log.BlkInterfaceLog;
+import cn.com.taiji.core.entity.log.PortalInterfaceLog;
+import cn.com.taiji.core.manager.comm.LogManager;
+import cn.com.taiji.core.model.comm.protocol.bls.*;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
+import cn.com.taiji.core.repo.jpa.basic.*;
+import cn.com.taiji.core.repo.jpa.log.BlkInterfaceLogRepo;
+import cn.com.taiji.core.repo.request.bls.BlackCardHisPageRequest;
+import cn.com.taiji.core.repo.request.bls.BlackCardPageRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class BlackCardInManager extends AbstractManager implements LogManager<CardInRequest, AbstractBlsResponse, BlkInterfaceLog> {
+
+    @Autowired
+    private QtkBlackCardRepo blackCardRepo;
+    @Autowired
+    private BlkInterfaceLogRepo logRepo;
+
+    @Transactional(rollbackFor = Exception.class)
+    public AbstractBlsResponse serviceHandle(CardInRequest request) throws ServiceHandleException {
+        try {
+            long begin = System.currentTimeMillis();
+            //发送 todo 这里调部中心接口处先不处理
+//        CardBlackUploadRequest request = new CardBlackUploadRequest();
+//        request.setStatus(1);//1-下黑
+//        request.setCreationTime(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date()));
+//        request.setCardId(req.getCardId());
+//        request.setType(req.getType());
+//        CardBlackUploadResponse cardBlackUploadResponse = blackUpload(request, 1);//1-下黑
+            //下黑
+            //todo 根据调接口返回的内容进行判断并做持久化操作 这里先处理正常返回的情况做持久化操作
+//        if(cardBlackUploadResponse...){ }
+
+            QtkBlackCard blackCard = copyProperties(request, new QtkBlackCard());
+            LocalDateTime now = LocalDateTime.now();
+            blackCard.setIssuerId("520101");//固定的
+            blackCard.setStatus(1);
+            blackCard.setCreateTime(now);
+            blackCard.setCreationTime(now);
+            blackCard.setType(CardBlackType.fromCode(request.getType()));
+            blackCard.setSourceIn(SourceType.findByCode(request.getSourceIn()));
+            blackCard.setAgencyId(request.getOrgCode());//AbstractSignTypeRequest类里加了个orgCode，中台接口转发到接口系统会自动带上值，值实际为agentId
+            blackCardRepo.save(blackCard);
+            //返回
+            //todo 判断后返回 成功-失败
+
+            AbstractBlsResponse blsResponse = new AbstractBlsResponse();
+            blsResponse.setUploadStatus(1);
+            return onSuccess(request, blsResponse, BlkInterfaceLog.class, System.currentTimeMillis() - begin);
+        } catch (Exception e) {
+            logger.error("异常",e);
+            throw exception(request, BlkInterfaceLog.class, e.getMessage());
+        }
+    }
+
+
+    @Override
+    public void doSaveLog(CardInRequest request, AbstractBlsResponse response, BlkInterfaceLog log) {
+        logger.info("enter do save log");
+        logRepo.persist(log);
+    }
+}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardManager.java

@@ -1,11 +0,0 @@
-package cn.com.taiji.bls.manager.blk;
-
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.bls.*;
-
-public interface BlackCardManager {
-    AbstractBlsResponse cardIn(CardInRequest req) throws ServiceHandleException;
-    AbstractBlsResponse cardOut(CardOutRequest req) throws ServiceHandleException;
-    CardQueryResponse cardQuery(CardQueryRequest req) throws ServiceHandleException;
-
-}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardManagerImpl.java

@@ -1,152 +0,0 @@
-package cn.com.taiji.bls.manager.blk;
-
-import cn.com.taiji.bls.tools.SourceTargetMapper;
-import cn.com.taiji.common.manager.AbstractManager;
-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.dict.basic.CardBlackType;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.core.entity.log.PortalInterfaceLog;
-import cn.com.taiji.core.manager.comm.LogManager;
-import cn.com.taiji.core.model.comm.protocol.bls.*;
-import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
-import cn.com.taiji.core.repo.jpa.basic.*;
-import cn.com.taiji.core.repo.request.bls.BlackCardHisPageRequest;
-import cn.com.taiji.core.repo.request.bls.BlackCardPageRequest;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class BlackCardManagerImpl extends AbstractManager implements BlackCardManager {
-
-    @Autowired
-    private QtkBlackCardRepo blackCardRepo;
-    @Autowired
-    private QtkBlackCardHisRepo blackCardHisRepo;
-    @Autowired
-    private QtkCardInfoRepo cardInfoRepo;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public AbstractBlsResponse cardIn(CardInRequest req) throws ServiceHandleException {
-        //发送 todo 这里调部中心接口处先不处理
-//        CardBlackUploadRequest request = new CardBlackUploadRequest();
-//        request.setStatus(1);//1-下黑
-//        request.setCreationTime(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss").format(new Date()));
-//        request.setCardId(req.getCardId());
-//        request.setType(req.getType());
-//        CardBlackUploadResponse cardBlackUploadResponse = blackUpload(request, 1);//1-下黑
-        //下黑
-        //todo 根据调接口返回的内容进行判断并做持久化操作 这里先处理正常返回的情况做持久化操作
-//        if(cardBlackUploadResponse...){ }
-
-        QtkBlackCard blackCard = copyProperties(req, new QtkBlackCard());
-        LocalDateTime now = LocalDateTime.now();
-        blackCard.setIssuerId("520101");//固定的
-        blackCard.setStatus(1);
-        blackCard.setCreateTime(now);
-        blackCard.setCreationTime(now);
-        blackCard.setType(CardBlackType.fromCode(req.getType()));
-        blackCard.setSourceIn(SourceType.findByCode(req.getSourceIn()));
-        blackCard.setAgencyId(req.getOrgCode());//AbstractSignTypeRequest类里加了个orgCode，中台接口转发到接口系统会自动带上值，值实际为agentId
-        blackCardRepo.save(blackCard);
-        //返回
-        //todo 判断后返回 成功-失败
-
-        AbstractBlsResponse blsResponse = new AbstractBlsResponse();
-        blsResponse.setUploadStatus(1);
-        return blsResponse;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public AbstractBlsResponse cardOut(CardOutRequest req) throws ServiceHandleException {
-        List<QtkBlackCard> blackCardList = blackCardRepo.queryByCardIdAndType(req.getCardId(), CardBlackType.fromCode(req.getType()));
-        if (CollectionTools.isEmpty(blackCardList)){
-            throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该类型卡号黑名单！");
-        }
-        //发送 todo 这里调部中心接口处先不处理
-
-        //todo 根据调接口返回的内容进行判断并做持久化操作 这里先处理正常返回的情况做持久化操作
-
-        QtkBlackCard blackCard = blackCardList.get(0);
-        LocalDateTime now = LocalDateTime.now();
-        QtkBlackCardHis blackCardHis = copyProperties(blackCard, new QtkBlackCardHis(), "id","createTime");
-        blackCardHis.setStatus(2);//2-反白
-        blackCardHis.setCreateTime(now);
-        blackCardHis.setReleaseTime(now);
-        blackCardHis.setReasonIn(blackCard.getReason());
-        blackCardHis.setReasonOut(req.getReason());
-        blackCardHis.setStaffIdIn(blackCard.getStaffId());
-        blackCardHis.setStaffIdOut(req.getStaffId());
-        blackCardHis.setReasonOut(req.getReason());
-        blackCardHis.setSourceIn(blackCard.getSourceIn());
-        blackCardHis.setSourceOut(SourceType.findByCode(req.getSourceIn()));
-        blackCardHisRepo.save(blackCardHis);
-        //删除下黑数据
-        blackCardRepo.deleteAll(blackCardList);
-        AbstractBlsResponse blsResponse = new AbstractBlsResponse();
-        blsResponse.setUploadStatus(1);
-        return blsResponse;
-    }
-
-    @Override
-    public CardQueryResponse cardQuery(CardQueryRequest req) throws ServiceHandleException {
-        BlackCardPageRequest blackCardPageRequest = copyProperties(req, new BlackCardPageRequest());
-        BlackCardHisPageRequest blackCardHisPageRequest = copyProperties(req, new BlackCardHisPageRequest());
-        
-        if (!StringUtils.isEmpty(req.getVehicleId())){
-            List<String> cardIdList = cardInfoRepo.queryByVehicleId(req.getVehicleId());
-            if (CollectionTools.isEmpty(cardIdList)){
-                blackCardPageRequest.setCardIdList(cardIdList);
-                blackCardHisPageRequest.setCardIdList(cardIdList);
-            }
-        }
-        List<QtkBlackCard> cardBlackList = blackCardRepo.list(blackCardPageRequest);
-        List<QtkBlackCardHis> cardblackHisList = blackCardHisRepo.list(blackCardHisPageRequest);
-        List<CardQueryModel> modelList = addModelList(cardBlackList, cardblackHisList);
-        CardQueryResponse response = new CardQueryResponse();
-        response.setResults(modelList);
-        return response;
-    }
-
-
-//    private AbstractBlsResponse blackUpload(CardBlackUploadRequest request, Integer status) throws ServiceHandleException {
-////        CardBlackUploadResponse response = ygzUploader.syncDoCardBlackUpload(request, DataSourceEnum.DSI_INTERFACE);
-//        return response;
-//    }
-
-
-    private List<CardQueryModel> addModelList(List<QtkBlackCard> cardBlackList, List<QtkBlackCardHis> cardblackHisList){
-        List<CardQueryModel> modelList = null;
-        if (!CollectionTools.isEmpty(cardblackHisList)){
-            modelList = SourceTargetMapper.INSTANCE.toCardModelList(cardblackHisList);//进行复制
-        }
-        if (!CollectionTools.isEmpty(cardBlackList)){
-            for (QtkBlackCard blackCard : cardBlackList) {
-                CardQueryModel model = new CardQueryModel();
-                model.setType(blackCard.getType());
-                model.setCardId(blackCard.getCardId());
-                model.setStatus(blackCard.getStatus());
-                model.setCreateTime(blackCard.getCreationTime());
-                model.setReasonIn(blackCard.getReason());
-                model.setStaffIdIn(blackCard.getStaffId());
-                model.setSolution(blackCard.getSolution());
-                model.setSourceIn(blackCard.getSourceIn());
-                model.setAgencyId(blackCard.getAgencyId());
-                modelList.add(model);
-            }
-        }
-        return modelList;
-    }
-
-
-}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardOutManager.java

@@ -0,0 +1,82 @@
+package cn.com.taiji.bls.manager.blk;
+
+import cn.com.taiji.bls.tools.SourceTargetMapper;
+import cn.com.taiji.common.manager.AbstractManager;
+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.dict.basic.CardBlackType;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.log.BlkInterfaceLog;
+import cn.com.taiji.core.manager.comm.LogManager;
+import cn.com.taiji.core.model.comm.protocol.bls.*;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
+import cn.com.taiji.core.repo.jpa.basic.QtkBlackCardHisRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkBlackCardRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
+import cn.com.taiji.core.repo.jpa.log.BlkInterfaceLogRepo;
+import cn.com.taiji.core.repo.request.bls.BlackCardHisPageRequest;
+import cn.com.taiji.core.repo.request.bls.BlackCardPageRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class BlackCardOutManager extends AbstractManager implements LogManager<CardOutRequest, AbstractBlsResponse, BlkInterfaceLog> {
+
+    @Autowired
+    private QtkBlackCardRepo blackCardRepo;
+    @Autowired
+    private QtkBlackCardHisRepo blackCardHisRepo;
+    @Autowired
+    private BlkInterfaceLogRepo logRepo;
+
+    @Transactional(rollbackFor = Exception.class)
+    public AbstractBlsResponse serviceHandle(CardOutRequest req) throws ServiceHandleException {
+        try {
+            long begin = System.currentTimeMillis();
+            List<QtkBlackCard> blackCardList = blackCardRepo.queryByCardIdAndType(req.getCardId(), CardBlackType.fromCode(req.getType()));
+            if (CollectionTools.isEmpty(blackCardList)){
+                throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该类型卡号黑名单！");
+            }
+            //发送 todo 这里调部中心接口处先不处理
+
+            //todo 根据调接口返回的内容进行判断并做持久化操作 这里先处理正常返回的情况做持久化操作
+
+            QtkBlackCard blackCard = blackCardList.get(0);
+            LocalDateTime now = LocalDateTime.now();
+            QtkBlackCardHis blackCardHis = copyProperties(blackCard, new QtkBlackCardHis(), "id","createTime");
+            blackCardHis.setStatus(2);//2-反白
+            blackCardHis.setCreateTime(now);
+            blackCardHis.setReleaseTime(now);
+            blackCardHis.setReasonIn(blackCard.getReason());
+            blackCardHis.setReasonOut(req.getReason());
+            blackCardHis.setStaffIdIn(blackCard.getStaffId());
+            blackCardHis.setStaffIdOut(req.getStaffId());
+            blackCardHis.setReasonOut(req.getReason());
+            blackCardHis.setSourceIn(blackCard.getSourceIn());
+            blackCardHis.setSourceOut(SourceType.findByCode(req.getSourceIn()));
+            blackCardHisRepo.save(blackCardHis);
+            //删除下黑数据
+            blackCardRepo.deleteAll(blackCardList);
+            AbstractBlsResponse blsResponse = new AbstractBlsResponse();
+            blsResponse.setUploadStatus(1);
+            return onSuccess(req, blsResponse, BlkInterfaceLog.class, System.currentTimeMillis() - begin);
+        } catch (ServiceHandleException e) {
+            logger.error("异常",e);
+            throw exception(req, BlkInterfaceLog.class, e.getMessage());
+        }
+    }
+
+
+    @Override
+    public void doSaveLog(CardOutRequest request, AbstractBlsResponse response, BlkInterfaceLog log) {
+        logger.info("enter do save log");
+        logRepo.persist(log);
+    }
+}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackCardQueryManager.java

@@ -0,0 +1,101 @@
+package cn.com.taiji.bls.manager.blk;
+
+import cn.com.taiji.bls.tools.SourceTargetMapper;
+import cn.com.taiji.common.manager.AbstractManager;
+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.dict.basic.CardBlackType;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.log.BlkInterfaceLog;
+import cn.com.taiji.core.manager.comm.LogManager;
+import cn.com.taiji.core.model.comm.protocol.bls.*;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
+import cn.com.taiji.core.repo.jpa.basic.QtkBlackCardHisRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkBlackCardRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
+import cn.com.taiji.core.repo.jpa.log.BlkInterfaceLogRepo;
+import cn.com.taiji.core.repo.request.bls.BlackCardHisPageRequest;
+import cn.com.taiji.core.repo.request.bls.BlackCardPageRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class BlackCardQueryManager extends AbstractManager implements LogManager<CardQueryRequest, CardQueryResponse, BlkInterfaceLog> {
+
+    @Autowired
+    private QtkBlackCardRepo blackCardRepo;
+    @Autowired
+    private QtkBlackCardHisRepo blackCardHisRepo;
+    @Autowired
+    private QtkCardInfoRepo cardInfoRepo;
+    @Autowired
+    private BlkInterfaceLogRepo logRepo;
+
+    public CardQueryResponse serviceHandle(CardQueryRequest req) throws ServiceHandleException {
+        try {
+            long begin = System.currentTimeMillis();
+            BlackCardPageRequest blackCardPageRequest = copyProperties(req, new BlackCardPageRequest());
+            BlackCardHisPageRequest blackCardHisPageRequest = copyProperties(req, new BlackCardHisPageRequest());
+
+            if (!StringUtils.isEmpty(req.getVehicleId())){
+                List<String> cardIdList = cardInfoRepo.queryByVehicleId(req.getVehicleId());
+                if (CollectionTools.isEmpty(cardIdList)){
+                    blackCardPageRequest.setCardIdList(cardIdList);
+                    blackCardHisPageRequest.setCardIdList(cardIdList);
+                }
+            }
+            List<QtkBlackCard> cardBlackList = blackCardRepo.list(blackCardPageRequest);
+            List<QtkBlackCardHis> cardblackHisList = blackCardHisRepo.list(blackCardHisPageRequest);
+            List<CardQueryModel> modelList = addModelList(cardBlackList, cardblackHisList);
+            CardQueryResponse response = new CardQueryResponse();
+            response.setResults(modelList);
+            return onSuccess(req, response, BlkInterfaceLog.class, System.currentTimeMillis() - begin);
+        } catch (Exception e) {
+            logger.error("异常",e);
+            throw exception(req, BlkInterfaceLog.class, e.getMessage());
+        }
+    }
+
+
+//    private AbstractBlsResponse blackUpload(CardBlackUploadRequest request, Integer status) throws ServiceHandleException {
+////        CardBlackUploadResponse response = ygzUploader.syncDoCardBlackUpload(request, DataSourceEnum.DSI_INTERFACE);
+//        return response;
+//    }
+
+
+    private List<CardQueryModel> addModelList(List<QtkBlackCard> cardBlackList, List<QtkBlackCardHis> cardblackHisList){
+        List<CardQueryModel> modelList = null;
+        if (!CollectionTools.isEmpty(cardblackHisList)){
+            modelList = SourceTargetMapper.INSTANCE.toCardModelList(cardblackHisList);//进行复制
+        }
+        if (!CollectionTools.isEmpty(cardBlackList)){
+            for (QtkBlackCard blackCard : cardBlackList) {
+                CardQueryModel model = new CardQueryModel();
+                model.setType(blackCard.getType());
+                model.setCardId(blackCard.getCardId());
+                model.setStatus(blackCard.getStatus());
+                model.setCreateTime(blackCard.getCreationTime());
+                model.setReasonIn(blackCard.getReason());
+                model.setStaffIdIn(blackCard.getStaffId());
+                model.setSolution(blackCard.getSolution());
+                model.setSourceIn(blackCard.getSourceIn());
+                model.setAgencyId(blackCard.getAgencyId());
+                modelList.add(model);
+            }
+        }
+        return modelList;
+    }
+
+    @Override
+    public void doSaveLog(CardQueryRequest request, CardQueryResponse response, BlkInterfaceLog log) {
+        logger.info("enter do save log");
+        logRepo.persist(log);
+    }
+}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuInManager.java

@@ -0,0 +1,64 @@
+package cn.com.taiji.bls.manager.blk;
+
+import cn.com.taiji.common.manager.AbstractManager;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.core.entity.basic.QtkBlackObu;
+import cn.com.taiji.core.entity.dict.basic.ObuBlackType;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.log.BlkInterfaceLog;
+import cn.com.taiji.core.manager.comm.LogManager;
+import cn.com.taiji.core.model.comm.protocol.bls.*;
+import cn.com.taiji.core.repo.jpa.basic.*;
+import cn.com.taiji.core.repo.jpa.log.BlkInterfaceLogRepo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+
+
+@Service("blackObuManager")
+public class BlackObuInManager extends AbstractManager implements LogManager<ObuInRequest, AbstractBlsResponse, BlkInterfaceLog> {
+
+    @Autowired
+    private QtkBlackObuRepo blackObuRepo;
+    @Autowired
+    private BlkInterfaceLogRepo logRepo;
+
+    @Transactional(rollbackFor = Exception.class)
+    public AbstractBlsResponse serviceHandle(ObuInRequest req) throws ServiceHandleException {
+        try {
+            long begin = System.currentTimeMillis();
+            //发送 todo 这里调部中心接口处先不处理
+
+            //下黑
+            //todo 根据调接口返回的内容进行判断并做持久化操作 这里先处理正常返回的情况做持久化操作
+
+            QtkBlackObu blackObu = copyProperties(req, new QtkBlackObu());
+            LocalDateTime now = LocalDateTime.now();
+            blackObu.setIssuerId("520101");//固定的
+            blackObu.setType(ObuBlackType.fromCode(req.getType()));
+            blackObu.setStatus(1);
+            blackObu.setCreateTime(now);
+            blackObu.setCreationTime(now);
+            blackObu.setType(ObuBlackType.fromCode(req.getType()));
+            blackObu.setSourceIn(SourceType.findByCode(req.getSourceIn()));
+            blackObu.setAgencyId(req.getOrgCode());//AbstractSignTypeRequest类里加了个orgCode，中台接口转发到接口系统会自动带上值，值实际为agentId
+            blackObuRepo.save(blackObu);
+            //返回
+            //todo 判断后返回 成功-失败
+            AbstractBlsResponse blsResponse = new AbstractBlsResponse();
+            blsResponse.setUploadStatus(1);
+            return onSuccess(req, blsResponse, BlkInterfaceLog.class, System.currentTimeMillis() - begin);
+        } catch (Exception e) {
+            logger.error("异常",e);
+            throw exception(req, BlkInterfaceLog.class, e.getMessage());
+        }
+    }
+
+    @Override
+    public void doSaveLog(ObuInRequest request, AbstractBlsResponse response, BlkInterfaceLog log) {
+        logger.info("enter do save log");
+        logRepo.persist(log);
+    }
+}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuManager.java

@@ -1,13 +0,0 @@
-package cn.com.taiji.bls.manager.blk;
-
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.bls.*;
-
-
-public interface BlackObuManager {
-
-    AbstractBlsResponse obuIn(ObuInRequest req) throws ServiceHandleException;
-    AbstractBlsResponse obuOut(ObuOutRequest req) throws ServiceHandleException;
-    ObuQueryResponse obuQuery(ObuQueryRequest req) throws ServiceHandleException;
-
-}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuManagerImpl.java

@@ -1,136 +0,0 @@
-package cn.com.taiji.bls.manager.blk;
-
-import cn.com.taiji.bls.tools.SourceTargetMapper;
-import cn.com.taiji.common.manager.AbstractManager;
-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.dict.basic.ObuBlackType;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.core.model.comm.protocol.bls.*;
-import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
-import cn.com.taiji.core.repo.jpa.basic.*;
-import cn.com.taiji.core.repo.request.bls.BlackObuHisPageRequest;
-import cn.com.taiji.core.repo.request.bls.BlackObuPageRequest;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-
-@Service("blackObuManager")
-public class BlackObuManagerImpl extends AbstractManager implements BlackObuManager {
-
-    @Autowired
-    private QtkBlackObuRepo blackObuRepo;
-    @Autowired
-    private QtkBlackObuHisRepo blackObuHisRepo;
-    @Autowired
-    private QtkObuInfoRepo obuInfoRepo;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public AbstractBlsResponse obuIn(ObuInRequest req) throws ServiceHandleException {
-        //发送 todo 这里调部中心接口处先不处理
-
-        //下黑
-        //todo 根据调接口返回的内容进行判断并做持久化操作 这里先处理正常返回的情况做持久化操作
-
-        QtkBlackObu blackObu = copyProperties(req, new QtkBlackObu());
-        LocalDateTime now = LocalDateTime.now();
-        blackObu.setIssuerId("520101");//固定的
-        blackObu.setType(ObuBlackType.fromCode(req.getType()));
-        blackObu.setStatus(1);
-        blackObu.setCreateTime(now);
-        blackObu.setCreationTime(now);
-        blackObu.setType(ObuBlackType.fromCode(req.getType()));
-        blackObu.setSourceIn(SourceType.findByCode(req.getSourceIn()));
-        blackObu.setAgencyId(req.getOrgCode());//AbstractSignTypeRequest类里加了个orgCode，中台接口转发到接口系统会自动带上值，值实际为agentId
-        blackObuRepo.save(blackObu);
-        //返回
-        //todo 判断后返回 成功-失败
-        AbstractBlsResponse blsResponse = new AbstractBlsResponse();
-        blsResponse.setUploadStatus(1);
-        return blsResponse;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public AbstractBlsResponse obuOut(ObuOutRequest req) throws ServiceHandleException {
-        List<QtkBlackObu> blackObuList = blackObuRepo.queryByObuIdAndType(req.getObuId(), ObuBlackType.fromCode(req.getType()));
-        if (CollectionTools.isEmpty(blackObuList)){
-            throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该类型签号黑名单！");
-        }
-        //发送 todo 这里调部中心接口处先不处理
-
-        //todo 根据调接口返回的内容进行判断并做持久化操作 这里先处理正常返回的情况做持久化操作
-
-        QtkBlackObu blackObu = blackObuList.get(0);
-        LocalDateTime now = LocalDateTime.now();
-        QtkBlackObuHis blackObuHis = copyProperties(blackObu, new QtkBlackObuHis(), "id","createTime");
-        blackObuHis.setStatus(2);//2-反白
-        blackObuHis.setCreateTime(now);
-        blackObuHis.setReleaseTime(now);
-        blackObuHis.setReasonIn(blackObu.getReason());
-        blackObuHis.setReasonOut(req.getReason());
-        blackObuHis.setStaffIdIn(blackObu.getStaffId());
-        blackObuHis.setStaffIdOut(req.getStaffId());
-        blackObuHis.setReasonOut(req.getReason());
-        blackObuHis.setSourceIn(blackObu.getSourceIn());
-        blackObuHis.setSourceOut(SourceType.findByCode(req.getSourceIn()));
-        blackObuHisRepo.save(blackObuHis);
-        //删除下黑数据
-        blackObuRepo.deleteAll(blackObuList);
-        AbstractBlsResponse blsResponse = new AbstractBlsResponse();
-        blsResponse.setUploadStatus(1);
-        return blsResponse;
-    }
-
-    @Override
-    public ObuQueryResponse obuQuery(ObuQueryRequest req) throws ServiceHandleException {
-        BlackObuPageRequest blackObuPageRequest = copyProperties(req, new BlackObuPageRequest());
-        BlackObuHisPageRequest blackObuHisPageRequest = copyProperties(req, new BlackObuHisPageRequest());
-
-        if (!StringUtils.isEmpty(req.getVehicleId())){
-            List<String> obuIdList = obuInfoRepo.queryByVehicleId(req.getVehicleId());
-            if (CollectionTools.isEmpty(obuIdList)){
-                blackObuPageRequest.setObuIdList(obuIdList);
-                blackObuHisPageRequest.setObuIdList(obuIdList);
-            }
-        }
-        List<QtkBlackObu> obuBlackList = blackObuRepo.list(blackObuPageRequest);
-        List<QtkBlackObuHis> obublackHisList = blackObuHisRepo.list(blackObuHisPageRequest);
-        List<ObuQueryModel> modelList = addModelList(obuBlackList, obublackHisList);
-        ObuQueryResponse response = new ObuQueryResponse();
-        response.setResults(modelList);
-        return response;
-    }
-
-
-    private List<ObuQueryModel> addModelList(List<QtkBlackObu> obuBlackList, List<QtkBlackObuHis> obublackHisList){
-        List<ObuQueryModel> modelList = null;
-        if (!CollectionTools.isEmpty(obublackHisList)){
-            modelList = SourceTargetMapper.INSTANCE.toObuModelList(obublackHisList);//进行复制
-        }
-        if (!CollectionTools.isEmpty(obuBlackList)){
-            for (QtkBlackObu blackObu : obuBlackList) {
-                ObuQueryModel model = new ObuQueryModel();
-                model.setType(blackObu.getType());
-                model.setObuId(blackObu.getObuId());
-                model.setStatus(blackObu.getStatus());
-                model.setCreateTime(blackObu.getCreationTime());
-                model.setReasonIn(blackObu.getReason());
-                model.setStaffIdIn(blackObu.getStaffId());
-                model.setSolution(blackObu.getSolution());
-                model.setSourceIn(blackObu.getSourceIn());
-                model.setAgencyId(blackObu.getAgencyId());
-                modelList.add(model);
-            }
-        }
-        return modelList;
-    }
-}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuOutManager.java

@@ -0,0 +1,78 @@
+package cn.com.taiji.bls.manager.blk;
+
+import cn.com.taiji.common.manager.AbstractManager;
+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.dict.basic.ObuBlackType;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import cn.com.taiji.core.entity.log.BlkInterfaceLog;
+import cn.com.taiji.core.manager.comm.LogManager;
+import cn.com.taiji.core.model.comm.protocol.bls.*;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
+import cn.com.taiji.core.repo.jpa.basic.QtkBlackObuHisRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkBlackObuRepo;
+import cn.com.taiji.core.repo.jpa.log.BlkInterfaceLogRepo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+@Service("blackObuManager")
+public class BlackObuOutManager extends AbstractManager implements LogManager<ObuOutRequest, AbstractBlsResponse, BlkInterfaceLog> {
+
+    @Autowired
+    private QtkBlackObuRepo blackObuRepo;
+    @Autowired
+    private QtkBlackObuHisRepo blackObuHisRepo;
+    @Autowired
+    private BlkInterfaceLogRepo logRepo;
+
+    @Transactional(rollbackFor = Exception.class)
+    public AbstractBlsResponse serviceHandle(ObuOutRequest req) throws ServiceHandleException {
+        try {
+            long begin = System.currentTimeMillis();
+            List<QtkBlackObu> blackObuList = blackObuRepo.queryByObuIdAndType(req.getObuId(), ObuBlackType.fromCode(req.getType()));
+            if (CollectionTools.isEmpty(blackObuList)){
+                throw GlyServiceError.NO_DATA_ERR.toHandleException("未查询到该类型签号黑名单！");
+            }
+            //发送 todo 这里调部中心接口处先不处理
+
+            //todo 根据调接口返回的内容进行判断并做持久化操作 这里先处理正常返回的情况做持久化操作
+
+            QtkBlackObu blackObu = blackObuList.get(0);
+            LocalDateTime now = LocalDateTime.now();
+            QtkBlackObuHis blackObuHis = copyProperties(blackObu, new QtkBlackObuHis(), "id","createTime");
+            blackObuHis.setStatus(2);//2-反白
+            blackObuHis.setCreateTime(now);
+            blackObuHis.setReleaseTime(now);
+            blackObuHis.setReasonIn(blackObu.getReason());
+            blackObuHis.setReasonOut(req.getReason());
+            blackObuHis.setStaffIdIn(blackObu.getStaffId());
+            blackObuHis.setStaffIdOut(req.getStaffId());
+            blackObuHis.setReasonOut(req.getReason());
+            blackObuHis.setSourceIn(blackObu.getSourceIn());
+            blackObuHis.setSourceOut(SourceType.findByCode(req.getSourceIn()));
+            blackObuHisRepo.save(blackObuHis);
+            //删除下黑数据
+            blackObuRepo.deleteAll(blackObuList);
+            AbstractBlsResponse blsResponse = new AbstractBlsResponse();
+            blsResponse.setUploadStatus(1);
+            return onSuccess(req, blsResponse, BlkInterfaceLog.class, System.currentTimeMillis() - begin);
+        } catch (ServiceHandleException e) {
+            logger.error("异常",e);
+            throw exception(req, BlkInterfaceLog.class, e.getMessage());
+        }
+    }
+
+
+    @Override
+    public void doSaveLog(ObuOutRequest request, AbstractBlsResponse response, BlkInterfaceLog log) {
+        logger.info("enter do save log");
+        logRepo.persist(log);
+    }
+}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuQueryManager.java

@@ -0,0 +1,90 @@
+package cn.com.taiji.bls.manager.blk;
+
+import cn.com.taiji.bls.tools.SourceTargetMapper;
+import cn.com.taiji.common.manager.AbstractManager;
+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.log.BlkInterfaceLog;
+import cn.com.taiji.core.manager.comm.LogManager;
+import cn.com.taiji.core.model.comm.protocol.bls.*;
+import cn.com.taiji.core.repo.jpa.basic.QtkBlackObuHisRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkBlackObuRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
+import cn.com.taiji.core.repo.jpa.log.BlkInterfaceLogRepo;
+import cn.com.taiji.core.repo.request.bls.BlackObuHisPageRequest;
+import cn.com.taiji.core.repo.request.bls.BlackObuPageRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+
+@Service("blackObuManager")
+public class BlackObuQueryManager extends AbstractManager implements LogManager<ObuQueryRequest, ObuQueryResponse, BlkInterfaceLog> {
+
+    @Autowired
+    private QtkBlackObuRepo blackObuRepo;
+    @Autowired
+    private QtkBlackObuHisRepo blackObuHisRepo;
+    @Autowired
+    private QtkObuInfoRepo obuInfoRepo;
+    @Autowired
+    private BlkInterfaceLogRepo logRepo;
+
+    public ObuQueryResponse serviceHandle(ObuQueryRequest req) throws ServiceHandleException {
+        try {
+            long begin = System.currentTimeMillis();
+            BlackObuPageRequest blackObuPageRequest = copyProperties(req, new BlackObuPageRequest());
+            BlackObuHisPageRequest blackObuHisPageRequest = copyProperties(req, new BlackObuHisPageRequest());
+
+            if (!StringUtils.isEmpty(req.getVehicleId())){
+                List<String> obuIdList = obuInfoRepo.queryByVehicleId(req.getVehicleId());
+                if (CollectionTools.isEmpty(obuIdList)){
+                    blackObuPageRequest.setObuIdList(obuIdList);
+                    blackObuHisPageRequest.setObuIdList(obuIdList);
+                }
+            }
+            List<QtkBlackObu> obuBlackList = blackObuRepo.list(blackObuPageRequest);
+            List<QtkBlackObuHis> obublackHisList = blackObuHisRepo.list(blackObuHisPageRequest);
+            List<ObuQueryModel> modelList = addModelList(obuBlackList, obublackHisList);
+            ObuQueryResponse response = new ObuQueryResponse();
+            response.setResults(modelList);
+            return onSuccess(req, response, BlkInterfaceLog.class, System.currentTimeMillis() - begin);
+        } catch (Exception e) {
+            logger.error("异常",e);
+            throw exception(req, BlkInterfaceLog.class, e.getMessage());
+        }
+    }
+
+
+    private List<ObuQueryModel> addModelList(List<QtkBlackObu> obuBlackList, List<QtkBlackObuHis> obublackHisList){
+        List<ObuQueryModel> modelList = null;
+        if (!CollectionTools.isEmpty(obublackHisList)){
+            modelList = SourceTargetMapper.INSTANCE.toObuModelList(obublackHisList);//进行复制
+        }
+        if (!CollectionTools.isEmpty(obuBlackList)){
+            for (QtkBlackObu blackObu : obuBlackList) {
+                ObuQueryModel model = new ObuQueryModel();
+                model.setType(blackObu.getType());
+                model.setObuId(blackObu.getObuId());
+                model.setStatus(blackObu.getStatus());
+                model.setCreateTime(blackObu.getCreationTime());
+                model.setReasonIn(blackObu.getReason());
+                model.setStaffIdIn(blackObu.getStaffId());
+                model.setSolution(blackObu.getSolution());
+                model.setSourceIn(blackObu.getSourceIn());
+                model.setAgencyId(blackObu.getAgencyId());
+                modelList.add(model);
+            }
+        }
+        return modelList;
+    }
+
+    @Override
+    public void doSaveLog(ObuQueryRequest request, ObuQueryResponse response, BlkInterfaceLog log) {
+        logger.info("enter do save log");
+        logRepo.persist(log);
+    }
+}

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/handler/BlkServiceHandler.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.bls.manager.handler;
 
-import cn.com.taiji.bls.manager.blk.BlackCardManager;
-import cn.com.taiji.bls.manager.blk.BlackObuManager;
+import cn.com.taiji.bls.manager.blk.*;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.file.FileProtocolSystemError;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
@@ -22,31 +21,40 @@ import org.springframework.stereotype.Service;
 @Service
 public class BlkServiceHandler extends AbstractBlsServiceHandler<BlsServiceCmd> {
 
-    public BlkServiceHandler() {
-        super(BlsServiceType.BLK);
-    }
+
+    @Autowired
+    private BlackCardInManager blackCardInManager;
+    @Autowired
+    private BlackCardOutManager blackCardOutManager;
     @Autowired
-    private BlackCardManager blackCardManager;
+    private BlackCardQueryManager blackCardQueryManager;
     @Autowired
-    private BlackObuManager blackObuManager;
+    private BlackObuInManager blackObuInManager;
+    @Autowired
+    private BlackObuOutManager blackObuOutManager;
+    @Autowired
+    private BlackObuQueryManager blackObuQueryManager;
 
+    public BlkServiceHandler() {
+        super(BlsServiceType.BLK);
+    }
     @Override
     protected <T extends AbstractSignTypeRequest<?>> AbstractSignTypeResponse handleInternal(T request,
         SignJsonRequest jsonReq, AbstractHttpRequestInfo reqInfo) throws ServiceHandleException {
         BlsServiceCmd cmd = BlsServiceCmd.fromIfCode(jsonReq.getIfCode());
         switch (cmd) {
             case CARDIN:
-                return blackCardManager.cardIn((CardInRequest) request);
+                return blackCardInManager.serviceHandle((CardInRequest) request);
             case CARDOUT:
-                return blackCardManager.cardOut((CardOutRequest) request);
+                return blackCardOutManager.serviceHandle((CardOutRequest) request);
             case CARDQUERY:
-                return blackCardManager.cardQuery((CardQueryRequest) request);
+                return blackCardQueryManager.serviceHandle((CardQueryRequest) request);
             case OBUIN:
-                return blackObuManager.obuIn((ObuInRequest) request);
+                return blackObuInManager.serviceHandle((ObuInRequest) request);
             case OBUOUT:
-                return blackObuManager.obuOut((ObuOutRequest) request);
+                return blackObuOutManager.serviceHandle((ObuOutRequest) request);
             case OBUQUERY:
-                return blackObuManager.obuQuery((ObuQueryRequest) request);
+                return blackObuQueryManager.serviceHandle((ObuQueryRequest) request);
             default:
                 throw FileProtocolSystemError.NOT_SUPPORT.toHandleException(jsonReq.getIfCode());
         }

zhywpt-service-bls/src/test/java/cn/com/taiji/oqs/client/bls/TestBlackCardManager.java → zhywpt-service-bls/src/test/java/cn/com/taiji/oqs/client/bls/TestBlackCardInManager.java

@@ -2,7 +2,9 @@ package cn.com.taiji.oqs.client.bls;
 
 import cn.com.taiji.bls.Application;
 import cn.com.taiji.bls.manager.AbstractCommManager;
-import cn.com.taiji.bls.manager.blk.BlackCardManager;
+import cn.com.taiji.bls.manager.blk.BlackCardInManager;
+import cn.com.taiji.bls.manager.blk.BlackCardOutManager;
+import cn.com.taiji.bls.manager.blk.BlackCardQueryManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.bls.*;
@@ -18,10 +20,14 @@ import org.springframework.boot.test.context.SpringBootTest;
  * @version: 1.0
  */
 @SpringBootTest(classes = Application.class)
-public class TestBlackCardManager extends AbstractCommManager {
+public class TestBlackCardInManager extends AbstractCommManager {
 
     @Autowired
-    private BlackCardManager blackCardManager;
+    private BlackCardInManager blackCardInManager;
+    @Autowired
+    private BlackCardOutManager blackCardOutManager;
+    @Autowired
+    private BlackCardQueryManager blackCardQueryManager;
 
     @Test
     public void cardInTest() {
@@ -34,7 +40,7 @@ public class TestBlackCardManager extends AbstractCommManager {
         cardInRequest.setStaffId("52010106004");//11位手机号
         cardInRequest.setOrgCode("52010106004");
         try {
-            AbstractBlsResponse blsResponse = blackCardManager.cardIn(cardInRequest);
+            AbstractBlsResponse blsResponse = blackCardInManager.serviceHandle(cardInRequest);
         } catch (ServiceHandleException e) {
             logger.error(e.getMessage(), e);
         }
@@ -51,7 +57,7 @@ public class TestBlackCardManager extends AbstractCommManager {
         cardOutRequest.setSourceIn("431bfdc8b9c645e0b293b85d6ce1925b");
         cardOutRequest.setStaffId("52010106004");
         try {
-            blackCardManager.cardOut(cardOutRequest);
+            blackCardOutManager.serviceHandle(cardOutRequest);
         } catch (ServiceHandleException e) {
             logger.info(e.getMessage(), e);
         }
@@ -63,7 +69,7 @@ public class TestBlackCardManager extends AbstractCommManager {
     public void cardQuery(){
         CardQueryRequest cardQueryRequest = new CardQueryRequest();
         try {
-            CardQueryResponse response = blackCardManager.cardQuery(cardQueryRequest);
+            CardQueryResponse response = blackCardQueryManager.serviceHandle(cardQueryRequest);
         } catch (ServiceHandleException e) {
             logger.error(e.getMessage(), e);
         }

zhywpt-service-bls/src/test/java/cn/com/taiji/oqs/client/bls/TestBlackObuManager.java

@@ -2,8 +2,9 @@ package cn.com.taiji.oqs.client.bls;
 
 import cn.com.taiji.bls.Application;
 import cn.com.taiji.bls.manager.AbstractCommManager;
-import cn.com.taiji.bls.manager.blk.BlackCardManager;
-import cn.com.taiji.bls.manager.blk.BlackObuManager;
+import cn.com.taiji.bls.manager.blk.BlackObuInManager;
+import cn.com.taiji.bls.manager.blk.BlackObuOutManager;
+import cn.com.taiji.bls.manager.blk.BlackObuQueryManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.model.comm.protocol.bls.*;
@@ -22,7 +23,11 @@ import org.springframework.boot.test.context.SpringBootTest;
 public class TestBlackObuManager extends AbstractCommManager {
 
     @Autowired
-    private BlackObuManager blackObuManager;
+    private BlackObuInManager blackObuInManager;
+    @Autowired
+    private BlackObuOutManager blackObuOutManager;
+    @Autowired
+    private BlackObuQueryManager blackObuQueryManager;
 
     @Test
     public void cardInTest() {
@@ -35,7 +40,7 @@ public class TestBlackObuManager extends AbstractCommManager {
         obuInRequest.setStaffId("52010106004");//11位手机号
         obuInRequest.setOrgCode("52010106004");
         try {
-            AbstractBlsResponse blsResponse = blackObuManager.obuIn(obuInRequest);
+            AbstractBlsResponse blsResponse = blackObuInManager.serviceHandle(obuInRequest);
         } catch (ServiceHandleException e) {
             logger.error(e.getMessage(), e);
         }
@@ -52,7 +57,7 @@ public class TestBlackObuManager extends AbstractCommManager {
         obuOutRequest.setSourceIn("431bfdc8b9c645e0b293b85d6ce1925b");
         obuOutRequest.setStaffId("52010106004");
         try {
-            blackObuManager.obuOut(obuOutRequest);
+            blackObuOutManager.serviceHandle(obuOutRequest);
         } catch (ServiceHandleException e) {
             logger.info(e.getMessage(), e);
         }
@@ -64,7 +69,7 @@ public class TestBlackObuManager extends AbstractCommManager {
     public void ObuQuery(){
         ObuQueryRequest obuQueryRequest = new ObuQueryRequest();
         try {
-            ObuQueryResponse response = blackObuManager.obuQuery(obuQueryRequest);
+            ObuQueryResponse response = blackObuQueryManager.serviceHandle(obuQueryRequest);
             System.out.println(response);
         } catch (ServiceHandleException e) {
             logger.error(e.getMessage(), e);

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/portal/ChangeAccountInfoManager.java

@@ -36,8 +36,7 @@ public class ChangeAccountInfoManager extends AbstractLoginManager implements Lo
             long begin = System.currentTimeMillis();
             if (!Lists.newArrayList(SourceType.ALI, SourceType.WECHAT).contains(request.getLoginSource()))
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("仅向小程序用户开放此功能");
-            String account = findAccountInfoByToken(request.getAccessToken()).getAccount();
-            AccountInfo accountInfo = accountInfoRepo.findByAccount(account);
+            AccountInfo accountInfo = accountInfoRepo.findByAccount(request.getAccountId());
             if (accountInfo == null)
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("账号信息不存在");
             BeanTools.copyProperties(request, accountInfo);