Parcourir la source

Merge remote-tracking branch 'origin/master'

master
梁超 il y a 2 mois
Parent
révision
d6c742dabf

+ 1
- 1
gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/province/GetHandleRecordsLocalRequest.java Voir le fichier

private String listno; private String listno;


public GetHandleRecordsLocalRequest() { public GetHandleRecordsLocalRequest() {
super(ProvinceCmd.QUERY_HANDLE_RECORD);
super(ProvinceCmd.QUERYHANDLERECORD);
} }
} }

+ 1
- 1
gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/province/GetOriginListRequest.java Voir le fichier

private LocalDate end; private LocalDate end;


public GetOriginListRequest() { public GetOriginListRequest() {
super(ProvinceCmd.GET_ORIGIN_LIST);
super(ProvinceCmd.GETORIGINLIST);
} }
} }

+ 1
- 1
gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/province/OrderPushRequest.java Voir le fichier

public class OrderPushRequest extends AbstractSignTypeRequest<OrderPushResponse> { public class OrderPushRequest extends AbstractSignTypeRequest<OrderPushResponse> {


public OrderPushRequest() { public OrderPushRequest() {
super(ProvinceCmd.ORDER_PUSH);
super(ProvinceCmd.ORDERPUSH);
} }


List<OrderPushReqModel> orderPushReqModels; List<OrderPushReqModel> orderPushReqModels;

+ 1
- 1
gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/province/OrderSaveRequest.java Voir le fichier

private List<OrderSaveReqModel> orderSaveModels; private List<OrderSaveReqModel> orderSaveModels;


public OrderSaveRequest() { public OrderSaveRequest() {
super(ProvinceCmd.ORDER_SAVE);
super(ProvinceCmd.ORDERSAVE);
} }
} }

+ 5
- 5
gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/province/ProvinceCmd.java Voir le fichier

* @version: 1.0 * @version: 1.0
*/ */
public enum ProvinceCmd implements SignServiceCommand { public enum ProvinceCmd implements SignServiceCommand {
GET_ORIGIN_LIST("省中心出口流水查询", GetOriginListRequest.class),
ORDER_PUSH("省中心工单创建", OrderPushRequest.class),
QUERY_NEW_REFUND("省中心工单查询", QueryNewRefundRequest.class),
QUERY_HANDLE_RECORD("省中心工单处理记录查询", GetHandleRecordsLocalRequest.class),
ORDER_SAVE("省中心工单更新", OrderSaveRequest.class),
GETORIGINLIST("省中心出口流水查询", GetOriginListRequest.class),
ORDERPUSH("省中心工单创建", OrderPushRequest.class),
QUERYNEWREFUND("省中心工单查询", QueryNewRefundRequest.class),
QUERYHANDLERECORD("省中心工单处理记录查询", GetHandleRecordsLocalRequest.class),
ORDERSAVE("省中心工单更新", OrderSaveRequest.class),
; ;


private final String value; private final String value;

+ 1
- 1
gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/province/QueryNewRefundRequest.java Voir le fichier

public class QueryNewRefundRequest extends AbstractSignTypeRequest<QueryNewRefundResponse> { public class QueryNewRefundRequest extends AbstractSignTypeRequest<QueryNewRefundResponse> {


public QueryNewRefundRequest() { public QueryNewRefundRequest() {
super(ProvinceCmd.QUERY_NEW_REFUND);
super(ProvinceCmd.QUERYNEWREFUND);
} }


/** 工单类型 */ /** 工单类型 */

+ 4
- 2
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/MyCommHandleManager.java Voir le fichier

import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType; import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
import cn.com.taiji.ias.manager.handler.BillServiceHandler; import cn.com.taiji.ias.manager.handler.BillServiceHandler;
import cn.com.taiji.ias.manager.handler.PortalServiceHandler; import cn.com.taiji.ias.manager.handler.PortalServiceHandler;
import cn.com.taiji.ias.manager.handler.ProvinceHandler;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


private BillServiceHandler billServiceHandler; private BillServiceHandler billServiceHandler;
@Autowired @Autowired
private PortalServiceHandler portalServiceHandler; private PortalServiceHandler portalServiceHandler;
@Autowired
private ProvinceHandler provinceHandler;


public MyCommHandleManager() { public MyCommHandleManager() {
super(IasServiceSystem.ISSUES); super(IasServiceSystem.ISSUES);
} }






@PostConstruct @PostConstruct
public void init() { public void init() {
registerJsonService(billServiceHandler); registerJsonService(billServiceHandler);
registerJsonService(portalServiceHandler); registerJsonService(portalServiceHandler);
registerJsonService(provinceHandler);
} }


@Override @Override

+ 1
- 3
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/HltManagerImpl.java Voir le fichier



import cn.com.taiji.core.entity.msgw.MsgwSmsKeyConfig; import cn.com.taiji.core.entity.msgw.MsgwSmsKeyConfig;
import cn.com.taiji.core.repo.jpa.msgw.MsgwSmsKeyConfigRepo; import cn.com.taiji.core.repo.jpa.msgw.MsgwSmsKeyConfigRepo;
import com.alibaba.fastjson.JSON;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

import com.alibaba.fastjson2.JSON;

import cn.com.taiji.common.manager.net.http.ServiceHandleException; import cn.com.taiji.common.manager.net.http.ServiceHandleException;
import cn.com.taiji.common.pub.StringTools; import cn.com.taiji.common.pub.StringTools;
import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest; import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;

+ 5
- 5
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/ProvinceHandler.java Voir le fichier

SignJsonRequest jsonReq, AbstractHttpRequestInfo reqInfo) throws ServiceHandleException { SignJsonRequest jsonReq, AbstractHttpRequestInfo reqInfo) throws ServiceHandleException {
ProvinceCmd cmd = ProvinceCmd.fromIfCode(jsonReq.getIfCode()); ProvinceCmd cmd = ProvinceCmd.fromIfCode(jsonReq.getIfCode());
switch (cmd) { switch (cmd) {
case GET_ORIGIN_LIST:
case GETORIGINLIST:
return getOriginListManager.serviceHandle((GetOriginListRequest) request); return getOriginListManager.serviceHandle((GetOriginListRequest) request);
case ORDER_PUSH:
case ORDERPUSH:
return orderPushManager.serviceHandle((OrderPushRequest) request); return orderPushManager.serviceHandle((OrderPushRequest) request);
case QUERY_NEW_REFUND:
case QUERYNEWREFUND:
return queryNewRefundManager.serviceHandle((QueryNewRefundRequest) request); return queryNewRefundManager.serviceHandle((QueryNewRefundRequest) request);
case QUERY_HANDLE_RECORD:
case QUERYHANDLERECORD:
return queryHandleRefundManager.serviceHandle((GetHandleRecordsLocalRequest) request); return queryHandleRefundManager.serviceHandle((GetHandleRecordsLocalRequest) request);
case ORDER_SAVE:
case ORDERSAVE:
return orderSaveManager.serviceHandle((OrderSaveRequest)request); return orderSaveManager.serviceHandle((OrderSaveRequest)request);
default: default:
throw FileProtocolSystemError.NOT_SUPPORT.toHandleException(jsonReq.getIfCode()); throw FileProtocolSystemError.NOT_SUPPORT.toHandleException(jsonReq.getIfCode());

+ 15
- 0
zhywpt-service-ias/src/test/java/cn/com/taiji/oqs/client/province/TestProvinceHandler.java Voir le fichier

System.out.println(parse); System.out.println(parse);
} }


@Test
public void getOriginListManagerJsonRepeatTest(){
GetOriginListRequest req = new GetOriginListRequest();
req.setExVehPlate("贵BXE005");
req.setStart(LocalDate.parse("2024-04-02"));
req.setEnd(LocalDate.parse("2024-04-03"));
try {
GetOriginListResponse getOriginListResponse = jsonPostRepeat(req);
System.out.println(getOriginListResponse);
} catch (ServiceHandleException e) {
throw new RuntimeException(e);
}
logger.info("。。");
}

} }

Chargement…
Annuler
Enregistrer