调整

zhywpt-service-ats/build.gradle

@@ -30,6 +30,8 @@ dependencies {
     // 微信SDK
     implementation 'com.github.binarywang:weixin-java-pay:4.7.4.B'
     implementation 'com.github.wechatpay-apiv3:wechatpay-java:0.2.12'
+    // 极光推送
+    implementation group: 'cn.jpush.api', name: 'jpush-client', version: '3.6.6'
 
     implementation fileTree(dir: 'lib', include: ['*.jar'])
     implementation 'com.squareup.okhttp3:okhttp:3.14.9'

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

@@ -0,0 +1,13 @@
+package cn.com.taiji.ats.manager.jpush;
+
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageResponse;
+
+
+public interface JpushAllAppManager {
+    JpushAllRidNotificationMessageResponse jpushAllRidNotificationMessageHandler(JpushAllRidNotificationMessageRequest request) throws ServiceHandleException;
+
+
+
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/jpush/JpushAllAppManagerImpl.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/jpush/JpushAllAppManagerImpl.java

@@ -1,24 +1,17 @@
-package cn.com.taiji.ias.manager.handler.jpush;
-
-import static cn.com.taiji.ias.api.TokenHelper.logger;
+package cn.com.taiji.ats.manager.jpush;
 
+import cn.com.taiji.ats.api.TokenHelper;
+import cn.com.taiji.ats.model.jpush.JpushManager;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
+import cn.com.taiji.core.entity.dict.msgw.MessageJPushType;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.taiji.ias.manager.clientConfig.JpushManager;
 import cn.com.taiji.common.manager.ManagerException;
 
-/**
- * @Author ChenChao
- * @Date 2024/10/6 9:39
- * @Description 旧系统com.qtk.push.manager.handler.clientConfig.channel.jpush路径下
- *  * 多个handler放在一起组成一个manager
- */
-
 @Service
 public class JpushAllAppManagerImpl implements JpushAllAppManager{
 
@@ -36,17 +29,18 @@ public class JpushAllAppManagerImpl implements JpushAllAppManager{
     public JpushAllRidNotificationMessageResponse jpushAllRidNotificationMessageHandler(JpushAllRidNotificationMessageRequest request) throws ServiceHandleException {
         String suffix = "JPUSHALLRIDNM";
         JpushAllRidNotificationMessageResponse response = null;
-        logger.info("------- 极光推送-指定的registrationId列表-通知栏通知和自定义消息 START -------");
-        logger.info("接收的request：{}", request.toJson());
+        TokenHelper.logger.info("------- 极光推送-指定的registrationId列表-通知栏通知和自定义消息 START -------");
+        TokenHelper.logger.info("接收的request：{}", request.toJson());
         //1、入参校验
         request.valid();
         try {
-                response = jpushManager.sendToAllRidNotificationMessage(request, apikeyPrefix+suffix);
+            // todo 这里区分类型？
+            response = jpushManager.sendToAllRidNotificationMessage(request, apikeyPrefix+suffix);
         } catch (Exception e) {
-            logger.error("", e);
+            TokenHelper.logger.error("", e);
             throw GlyServiceError.RESPONSE_ERROR.toHandleException("极光推动发送消息失败！");
         } finally {
-            logger.info("------- 极光推送-指定的registrationId列表-通知栏通知和自定义消息 END -------");
+            TokenHelper.logger.info("------- 极光推送-指定的registrationId列表-通知栏通知和自定义消息 END -------");
         }
         return response;
     }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/messageChannelClients/MyJpushClient.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/jpush/messageChannelClients/MyJpushClient.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.clientConfig.messageChannelClients;
+package cn.com.taiji.ats.manager.jpush.messageChannelClients;
 
 import java.util.List;
 import java.util.Objects;

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

@@ -0,0 +1,47 @@
+package cn.com.taiji.ats.manager;
+
+import cn.com.taiji.ats.manager.jpush.JpushAllAppManager;
+import cn.com.taiji.ats.model.jpush.JpushManager;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushServiceCmd;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zgglyun.common.model.AbstractHttpRequestInfo;
+
+import cn.com.taiji.ats.manager.handler.AbstractAtsServiceHandler;
+import cn.com.taiji.ats.manager.ocr.BusinessLicenseOcrManager;
+import cn.com.taiji.ats.manager.ocr.IdCardOcrManager;
+import cn.com.taiji.ats.manager.ocr.VehicleLicenseOcrManager;
+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;
+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.ats.AtsServiceType;
+import cn.com.taiji.core.model.comm.protocol.ats.ocr.BusinessLicenseOcrRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.ocr.IdCardOcrRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.ocr.OcrServiceCmd;
+import cn.com.taiji.core.model.comm.protocol.ats.ocr.VehicleLicenseOcrRequest;
+
+@Service
+public class jpushServiceHandler extends AbstractAtsServiceHandler<OcrServiceCmd> {
+    public jpushServiceHandler() {
+        super(AtsServiceType.JPUSH);
+    }
+
+    @Autowired
+    private JpushAllAppManager jpushAllAppManager;
+
+    @Override
+    protected <T extends AbstractSignTypeRequest<?>> AbstractSignTypeResponse handleInternal(T request, SignJsonRequest jsonReq, AbstractHttpRequestInfo reqInfo) throws ServiceHandleException {
+        JpushServiceCmd cmd = JpushServiceCmd.fromIfCode(jsonReq.getIfCode());
+        switch (cmd) {
+            case JPUSHALLRIDNOTIFICATION:
+                return jpushAllAppManager.jpushAllRidNotificationMessageHandler((JpushAllRidNotificationMessageRequest) request);
+            default:
+                throw FileProtocolSystemError.NOT_SUPPORT.toHandleException(jsonReq.getIfCode());
+        }
+    }
+
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/JpushManager.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/jpush/JpushManager.java

@@ -1,9 +1,8 @@
-package cn.com.taiji.ias.manager.clientConfig;
+package cn.com.taiji.ats.model.jpush;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
-
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageResponse;
 
 
 public interface JpushManager {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/clientConfig/JpushManagerImpl.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/jpush/JpushManagerImpl.java

@@ -1,14 +1,14 @@
-package cn.com.taiji.ias.manager.clientConfig;
+package cn.com.taiji.ats.model.jpush;
 
-import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.message.JpushAllRidNotificationMessageResponse;
+import cn.com.taiji.ats.manager.jpush.messageChannelClients.MyJpushClient;
+import cn.com.taiji.ats.manager.tools.ThreadPoolTools;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.jpush.JpushAllRidNotificationMessageResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.taiji.ias.manager.clientConfig.messageChannelClients.MyJpushClient;
-import cn.com.taiji.ias.manager.tools.ThreadPoolTools;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.CommonAbstract;