ats配置调整

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/AtsServiceType.java

@@ -5,6 +5,7 @@ import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
 import cn.com.taiji.core.model.comm.protocol.ats.anXin.model.AnXinServiceCmd;
+import cn.com.taiji.core.model.comm.protocol.ats.ocr.OcrServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ats.weiXin.WeiXinServiceCmd;
 import lombok.Getter;
 
@@ -15,6 +16,7 @@ import java.util.regex.Pattern;
 public enum AtsServiceType implements SignServiceType {
     WEIXIN("微信", "^WEIXIN_\\S+\\.json$", WeiXinServiceCmd.values()),
     ANXINSIGN("安心签","^ANXINSIGN_\\S+\\.json$", AnXinServiceCmd.values()),
+    OCR("ocr","^OCR\\S+\\.json$", OcrServiceCmd.values()),
     ;
 
     @Getter

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

@@ -2,7 +2,7 @@ package cn.com.taiji.core.model.comm.protocol.ias;
 
 import cn.com.taiji.core.model.comm.protocol.SignServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
-import cn.com.taiji.core.model.comm.protocol.inss.InssServiceType;
+
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,7 +11,7 @@ import java.util.List;
 public enum IasServiceSystem implements SignServiceSystem {
     ISSUES("ias", "发行售后接口", "/ias/api/json", "/ias/common/binapi/") {
         public List<SignServiceType> listAllServices() {
-            return Arrays.asList(InssServiceType.values());
+            return Arrays.asList(IasServiceType.values());
         }
     };
 

zhywpt-service-ats/build.gradle

@@ -41,6 +41,7 @@ dependencies {
 
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis'
     implementation 'com.squareup.okhttp3:okhttp:3.14.9'
+    implementation group: 'net.coobird', name: 'thumbnailator', version: '0.4.20'
 }
 
 bootJar {

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/AbstractAtsServiceHandler.java

@@ -1,13 +0,0 @@
-package cn.com.taiji.ats.manager;
-
-import cn.com.taiji.core.manager.comm.AbstractCommServiceHandler;
-import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
-import cn.com.taiji.core.model.comm.protocol.ats.AtsServiceType;
-
-public abstract class AbstractAtsServiceHandler<C extends SignServiceCommand>
-		extends AbstractCommServiceHandler<AtsServiceType> {
-
-	protected AbstractAtsServiceHandler(AtsServiceType serviceType) {
-		super(serviceType);
-	}
-}

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

@@ -1,17 +1,16 @@
 package cn.com.taiji.ats.manager;
 
-import javax.annotation.PostConstruct;
-
+import cn.com.taiji.ats.manager.handler.AnXinServiceHandler;
+import cn.com.taiji.ats.manager.handler.OcrServiceHandler;
+import cn.com.taiji.ats.manager.handler.WinXinServiceHandler;
+import cn.com.taiji.core.manager.comm.AbstractCommHandleManager;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
 import cn.com.taiji.core.model.comm.protocol.ats.AtsServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.ats.AtsServiceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.taiji.core.manager.comm.AbstractCommHandleManager;
-import cn.com.taiji.core.model.comm.protocol.sample.SampleServiceSystem;
-import cn.com.taiji.core.model.comm.protocol.sample.SampleServiceType;
-import cn.com.taiji.ats.manager.handler.WinXinServiceHandler;
+import javax.annotation.PostConstruct;
 
 /**
  *
@@ -24,6 +23,10 @@ import cn.com.taiji.ats.manager.handler.WinXinServiceHandler;
 public class MyCommHandleManager extends AbstractCommHandleManager {
     @Autowired
     private WinXinServiceHandler winXinServiceHandler;
+    @Autowired
+    private AnXinServiceHandler anXinServiceHandler;
+    @Autowired
+    private OcrServiceHandler ocrServiceHandler;
 
     public MyCommHandleManager() {
         super(AtsServiceSystem.ATS);
@@ -35,6 +38,8 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
     @PostConstruct
     public void init() {
         registerJsonService(winXinServiceHandler);
+        registerJsonService(anXinServiceHandler);
+        registerJsonService(ocrServiceHandler);
     }
 
     @Override

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/anXin/AnXinServiceImpl.java

@@ -20,7 +20,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Base64;
 
 @Service

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/anXin/AnXinServiceHandler.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/handler/AnXinServiceHandler.java

@@ -1,6 +1,7 @@
-package cn.com.taiji.ats.manager.anXin;
+package cn.com.taiji.ats.manager.handler;
 
-import cn.com.taiji.ats.manager.AbstractAtsServiceHandler;
+import cn.com.taiji.ats.manager.anXin.AnXinBusinessManager;
+import cn.com.taiji.ats.manager.handler.AbstractAtsServiceHandler;
 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;

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

@@ -1,13 +0,0 @@
-package cn.com.taiji.ias.manager;
-
-import cn.com.taiji.core.manager.comm.AbstractCommServiceHandler;
-import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
-import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
-
-public abstract class AbstractIasServiceHandler<C extends SignServiceCommand>
-		extends AbstractCommServiceHandler<IasServiceType> {
-
-	protected AbstractIasServiceHandler(IasServiceType serviceType) {
-		super(serviceType);
-	}
-}

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

@@ -1,47 +1,41 @@
-//package cn.com.taiji.ias.manager;
-//
-//import javax.annotation.PostConstruct;
-//
-//import cn.com.taiji.core.model.comm.protocol.SignJsonRequest;
-//import cn.com.taiji.core.model.comm.protocol.SignServiceType;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import com.zgglyun.common.model.AbstractCommRequest;
-//import com.zgglyun.common.model.AbstractHttpRequestInfo;
-//
-//import cn.com.taiji.core.manager.comm.AbstractCommHandleManager;
-//import cn.com.taiji.core.model.comm.protocol.sample.SampleServiceSystem;
-//import cn.com.taiji.core.model.comm.protocol.sample.SampleServiceType;
-//import cn.com.taiji.ias.manager.handler.SampleServiceHandler;
-//
-///**
-// *
-// * @author Peream <br>
-// *         Create Time：2019年7月28日 下午3:35:29<br>
-// * @since 1.0
-// * @version 1.0
-// */
-//@Service
-//public class MyCommHandleManager extends AbstractCommHandleManager {
-//    @Autowired
-//    private SampleServiceHandler sampleServiceHandler;
-//
-//    public MyCommHandleManager() {
-//        super(SampleServiceSystem.SAMPLE);
-//    }
-//
-//
-//
-//
-//    @PostConstruct
-//    public void init() {
-//        registerJsonService(sampleServiceHandler);
-//    }
-//
-//    @Override
-//    protected SignServiceType getServiceType(String ifCode) {
-//        return SampleServiceType.fromIfCode(ifCode);
-//    }
-//
-//}
+package cn.com.taiji.ias.manager;
+
+import cn.com.taiji.core.manager.comm.AbstractCommHandleManager;
+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.bill.BillServiceHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+
+/**
+ *
+ * @author Peream <br>
+ *         Create Time：2019年7月28日 下午3:35:29<br>
+ * @since 1.0
+ * @version 1.0
+ */
+@Service
+public class MyCommHandleManager extends AbstractCommHandleManager {
+    @Autowired
+    private BillServiceHandler billServiceHandler;
+
+    public MyCommHandleManager() {
+        super(IasServiceSystem.ISSUES);
+    }
+
+
+
+
+    @PostConstruct
+    public void init() {
+        registerJsonService(billServiceHandler);
+    }
+
+    @Override
+    protected IasServiceType getServiceType(String ifCode) {
+        return IasServiceType.fromIfCode(ifCode);
+    }
+
+}

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

@@ -7,7 +7,7 @@ import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import cn.com.taiji.core.model.comm.protocol.SignJsonRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
 import cn.com.taiji.core.model.comm.protocol.ias.bill.*;
-import cn.com.taiji.ias.manager.AbstractIasServiceHandler;
+import cn.com.taiji.ias.manager.handler.AbstractIasServiceHandler;
 import com.zgglyun.common.model.AbstractHttpRequestInfo;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;