Merge remote-tracking branch 'origin/master'

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

@@ -21,6 +21,6 @@ public class GetHandleRecordsLocalRequest extends AbstractSignTypeRequest<GetHan
     private String listno;
 
     public GetHandleRecordsLocalRequest() {
-        super(ProvinceCmd.QUERY_HANDLE_RECORD);
+        super(ProvinceCmd.QUERYHANDLERECORD);
     }
 }

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

@@ -25,6 +25,6 @@ public class GetOriginListRequest extends AbstractSignTypeRequest<GetOriginListR
     private LocalDate end;
 
     public GetOriginListRequest() {
-        super(ProvinceCmd.GET_ORIGIN_LIST);
+        super(ProvinceCmd.GETORIGINLIST);
     }
 }

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

@@ -19,7 +19,7 @@ import java.util.List;
 public class OrderPushRequest extends AbstractSignTypeRequest<OrderPushResponse> {
 
     public OrderPushRequest() {
-        super(ProvinceCmd.ORDER_PUSH);
+        super(ProvinceCmd.ORDERPUSH);
     }
 
     List<OrderPushReqModel> orderPushReqModels;

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

@@ -21,6 +21,6 @@ public class OrderSaveRequest extends AbstractSignTypeRequest<OrderSaveResponse>
     private List<OrderSaveReqModel> orderSaveModels;
 
     public OrderSaveRequest() {
-        super(ProvinceCmd.ORDER_SAVE);
+        super(ProvinceCmd.ORDERSAVE);
     }
 }

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

@@ -13,11 +13,11 @@ import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
  * @version: 1.0
  */
 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;

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

@@ -18,7 +18,7 @@ import java.time.LocalDate;
 public class QueryNewRefundRequest extends AbstractSignTypeRequest<QueryNewRefundResponse> {
 
     public QueryNewRefundRequest() {
-        super(ProvinceCmd.QUERY_NEW_REFUND);
+        super(ProvinceCmd.QUERYNEWREFUND);
     }
 
     /** 工单类型 */

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

@@ -5,6 +5,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.IasServiceSystem;
 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.PortalServiceHandler;
+import cn.com.taiji.ias.manager.handler.ProvinceHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,18 +24,19 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
     private BillServiceHandler billServiceHandler;
     @Autowired
     private PortalServiceHandler portalServiceHandler;
+    @Autowired
+    private ProvinceHandler provinceHandler;
 
     public MyCommHandleManager() {
         super(IasServiceSystem.ISSUES);
     }
 
 
-
-
     @PostConstruct
     public void init() {
         registerJsonService(billServiceHandler);
         registerJsonService(portalServiceHandler);
+        registerJsonService(provinceHandler);
     }
 
     @Override

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/HltManagerImpl.java

@@ -5,13 +5,11 @@ import java.util.UUID;
 
 import cn.com.taiji.core.entity.msgw.MsgwSmsKeyConfig;
 import cn.com.taiji.core.repo.jpa.msgw.MsgwSmsKeyConfigRepo;
+import com.alibaba.fastjson.JSON;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson2.JSON;
-
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.StringTools;
 import cn.com.taiji.core.model.comm.protocol.ias.message.HltSendShortRequest;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/ProvinceHandler.java

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

zhywpt-service-ias/src/test/java/cn/com/taiji/oqs/client/province/TestProvinceHandler.java

@@ -243,4 +243,19 @@ public class TestProvinceHandler extends AbstractCommManager {
         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("。。");
+    }
+
 }