diff --git a/logs/app.2026-01-24.log b/logs/app.2026-01-24.log new file mode 100644 index 0000000..70c06ea --- /dev/null +++ b/logs/app.2026-01-24.log @@ -0,0 +1,159 @@ +2026-01-24 20:14:00.683 [main] INFO com.example.sso.SsoApplication - Starting SsoApplication on DESKTOP-VGD74VB with PID 5748 (C:\Users\22966\Desktop\testfadda\target\classes started by 22966 in C:\Users\22966\Desktop\testfadda) +2026-01-24 20:14:00.686 [main] INFO com.example.sso.SsoApplication - No active profile set, falling back to default profiles: default +2026-01-24 20:14:02.704 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'asyncConfig' of type [com.example.sso.config.AsyncConfig$$EnhancerBySpringCGLIB$$232c0e04] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2026-01-24 20:14:02.953 [main] INFO o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8888 (http) +2026-01-24 20:14:02.960 [main] INFO o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8888"] +2026-01-24 20:14:02.960 [main] INFO o.a.catalina.core.StandardService - Starting service [Tomcat] +2026-01-24 20:14:02.960 [main] INFO o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.27] +2026-01-24 20:14:03.054 [main] INFO o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext +2026-01-24 20:14:03.054 [main] INFO o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 2298 ms +2026-01-24 20:14:03.270 [main] INFO o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService +2026-01-24 20:14:03.272 [main] INFO o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'getAsyncExecutor' +2026-01-24 20:14:03.566 [main] INFO o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler' +2026-01-24 20:14:03.619 [main] INFO o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8888"] +2026-01-24 20:14:03.650 [main] INFO o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8888 (http) with context path '' +2026-01-24 20:14:03.656 [main] INFO com.example.sso.SsoApplication - Started SsoApplication in 3.654 seconds (JVM running for 4.578) +2026-01-24 20:14:04.193 [scheduling-1] ERROR o.s.s.s.TaskUtils$LoggingErrorHandler - Unexpected error occurred in scheduled task +java.lang.NoClassDefFoundError: javax/xml/bind/DatatypeConverter + at com.example.sso.util.FddCryptUtil.sha256Hex(FddCryptUtil.java:36) + at com.example.sso.util.FddCryptUtil.sign(FddCryptUtil.java:50) + at com.example.sso.util.HttpUtil.sendPost(HttpUtil.java:137) + at com.example.sso.util.FDaDaUtil.getToken(FDaDaUtil.java:156) + at com.example.sso.util.FDaDaUtil.infor(FDaDaUtil.java:49) + at com.example.sso.schedule.NowDown.main1(NowDown.java:54) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.springframework.scheduling.support.ScheduledMethodRunnable.run(ScheduledMethodRunnable.java:84) + at org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:54) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.runAndReset(FutureTask.java:305) + at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:305) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +Caused by: java.lang.ClassNotFoundException: javax.xml.bind.DatatypeConverter + at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:581) + at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178) + at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:527) + ... 18 common frames omitted +2026-01-24 20:15:03.735 [scheduling-1] ERROR o.s.s.s.TaskUtils$LoggingErrorHandler - Unexpected error occurred in scheduled task +java.lang.NoClassDefFoundError: javax/xml/bind/DatatypeConverter + at com.example.sso.util.FddCryptUtil.sha256Hex(FddCryptUtil.java:36) + at com.example.sso.util.FddCryptUtil.sign(FddCryptUtil.java:50) + at com.example.sso.util.HttpUtil.sendPost(HttpUtil.java:137) + at com.example.sso.util.FDaDaUtil.getToken(FDaDaUtil.java:156) + at com.example.sso.util.FDaDaUtil.infor(FDaDaUtil.java:49) + at com.example.sso.schedule.NowDown.main1(NowDown.java:54) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.springframework.scheduling.support.ScheduledMethodRunnable.run(ScheduledMethodRunnable.java:84) + at org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:54) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.runAndReset(FutureTask.java:305) + at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:305) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2026-01-24 20:16:03.713 [scheduling-1] ERROR o.s.s.s.TaskUtils$LoggingErrorHandler - Unexpected error occurred in scheduled task +java.lang.NoClassDefFoundError: javax/xml/bind/DatatypeConverter + at com.example.sso.util.FddCryptUtil.sha256Hex(FddCryptUtil.java:36) + at com.example.sso.util.FddCryptUtil.sign(FddCryptUtil.java:50) + at com.example.sso.util.HttpUtil.sendPost(HttpUtil.java:137) + at com.example.sso.util.FDaDaUtil.getToken(FDaDaUtil.java:156) + at com.example.sso.util.FDaDaUtil.infor(FDaDaUtil.java:49) + at com.example.sso.schedule.NowDown.main1(NowDown.java:54) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.springframework.scheduling.support.ScheduledMethodRunnable.run(ScheduledMethodRunnable.java:84) + at org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:54) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.runAndReset(FutureTask.java:305) + at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:305) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2026-01-24 20:17:03.709 [scheduling-1] ERROR o.s.s.s.TaskUtils$LoggingErrorHandler - Unexpected error occurred in scheduled task +java.lang.NoClassDefFoundError: javax/xml/bind/DatatypeConverter + at com.example.sso.util.FddCryptUtil.sha256Hex(FddCryptUtil.java:36) + at com.example.sso.util.FddCryptUtil.sign(FddCryptUtil.java:50) + at com.example.sso.util.HttpUtil.sendPost(HttpUtil.java:137) + at com.example.sso.util.FDaDaUtil.getToken(FDaDaUtil.java:156) + at com.example.sso.util.FDaDaUtil.infor(FDaDaUtil.java:49) + at com.example.sso.schedule.NowDown.main1(NowDown.java:54) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.springframework.scheduling.support.ScheduledMethodRunnable.run(ScheduledMethodRunnable.java:84) + at org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:54) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.runAndReset(FutureTask.java:305) + at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:305) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2026-01-24 20:18:03.720 [scheduling-1] ERROR o.s.s.s.TaskUtils$LoggingErrorHandler - Unexpected error occurred in scheduled task +java.lang.NoClassDefFoundError: javax/xml/bind/DatatypeConverter + at com.example.sso.util.FddCryptUtil.sha256Hex(FddCryptUtil.java:36) + at com.example.sso.util.FddCryptUtil.sign(FddCryptUtil.java:50) + at com.example.sso.util.HttpUtil.sendPost(HttpUtil.java:137) + at com.example.sso.util.FDaDaUtil.getToken(FDaDaUtil.java:156) + at com.example.sso.util.FDaDaUtil.infor(FDaDaUtil.java:49) + at com.example.sso.schedule.NowDown.main1(NowDown.java:54) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.springframework.scheduling.support.ScheduledMethodRunnable.run(ScheduledMethodRunnable.java:84) + at org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:54) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.runAndReset(FutureTask.java:305) + at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:305) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2026-01-24 20:19:03.765 [scheduling-1] ERROR o.s.s.s.TaskUtils$LoggingErrorHandler - Unexpected error occurred in scheduled task +java.lang.NoClassDefFoundError: javax/xml/bind/DatatypeConverter + at com.example.sso.util.FddCryptUtil.sha256Hex(FddCryptUtil.java:36) + at com.example.sso.util.FddCryptUtil.sign(FddCryptUtil.java:50) + at com.example.sso.util.HttpUtil.sendPost(HttpUtil.java:137) + at com.example.sso.util.FDaDaUtil.getToken(FDaDaUtil.java:156) + at com.example.sso.util.FDaDaUtil.infor(FDaDaUtil.java:49) + at com.example.sso.schedule.NowDown.main1(NowDown.java:54) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.base/java.lang.reflect.Method.invoke(Method.java:566) + at org.springframework.scheduling.support.ScheduledMethodRunnable.run(ScheduledMethodRunnable.java:84) + at org.springframework.scheduling.support.DelegatingErrorHandlingRunnable.run(DelegatingErrorHandlingRunnable.java:54) + at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) + at java.base/java.util.concurrent.FutureTask.runAndReset(FutureTask.java:305) + at java.base/java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:305) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) + at java.base/java.lang.Thread.run(Thread.java:829) +2026-01-24 20:19:17.331 [SpringContextShutdownHook] INFO o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler' +2026-01-24 20:19:17.332 [SpringContextShutdownHook] INFO o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'getAsyncExecutor' +2026-01-24 20:19:29.787 [main] INFO com.example.sso.SsoApplication - Starting SsoApplication on DESKTOP-VGD74VB with PID 67184 (C:\Users\22966\Desktop\testfadda\target\classes started by 22966 in C:\Users\22966\Desktop\testfadda) +2026-01-24 20:19:29.792 [main] INFO com.example.sso.SsoApplication - No active profile set, falling back to default profiles: default +2026-01-24 20:19:31.646 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'asyncConfig' of type [com.example.sso.config.AsyncConfig$$EnhancerBySpringCGLIB$$593fd458] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2026-01-24 20:19:31.832 [main] INFO o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8888 (http) +2026-01-24 20:19:31.838 [main] INFO o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8888"] +2026-01-24 20:19:31.838 [main] INFO o.a.catalina.core.StandardService - Starting service [Tomcat] +2026-01-24 20:19:31.838 [main] INFO o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.27] +2026-01-24 20:19:31.911 [main] INFO o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext +2026-01-24 20:19:31.912 [main] INFO o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 2063 ms +2026-01-24 20:19:32.110 [main] INFO o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService +2026-01-24 20:19:32.111 [main] INFO o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'getAsyncExecutor' +2026-01-24 20:19:32.391 [main] INFO o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler' +2026-01-24 20:19:32.424 [main] INFO o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8888"] +2026-01-24 20:19:32.483 [main] INFO o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8888 (http) with context path '' +2026-01-24 20:19:32.486 [main] INFO com.example.sso.SsoApplication - Started SsoApplication in 3.335 seconds (JVM running for 4.131) +2026-01-24 20:19:47.052 [SpringContextShutdownHook] INFO o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler' +2026-01-24 20:19:47.053 [SpringContextShutdownHook] INFO o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'getAsyncExecutor' diff --git a/logs/app.2026-01-25.log b/logs/app.2026-01-25.log new file mode 100644 index 0000000..ec1788b --- /dev/null +++ b/logs/app.2026-01-25.log @@ -0,0 +1,17 @@ +2026-01-25 13:03:14.030 [main] INFO com.example.sso.SsoApplication - Starting SsoApplication on DESKTOP-VGD74VB with PID 13992 (C:\Users\22966\Desktop\testfadda\target\classes started by 22966 in C:\Users\22966\Desktop\testfadda) +2026-01-25 13:03:14.036 [main] INFO com.example.sso.SsoApplication - No active profile set, falling back to default profiles: default +2026-01-25 13:03:15.051 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'asyncConfig' of type [com.example.sso.config.AsyncConfig$$EnhancerBySpringCGLIB$$73938863] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2026-01-25 13:03:15.193 [main] INFO o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8082 (http) +2026-01-25 13:03:15.198 [main] INFO o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8082"] +2026-01-25 13:03:15.199 [main] INFO o.a.catalina.core.StandardService - Starting service [Tomcat] +2026-01-25 13:03:15.199 [main] INFO o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.27] +2026-01-25 13:03:15.243 [main] INFO o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext +2026-01-25 13:03:15.243 [main] INFO o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 1167 ms +2026-01-25 13:03:15.410 [main] INFO o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService +2026-01-25 13:03:15.411 [main] INFO o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'getAsyncExecutor' +2026-01-25 13:03:15.562 [main] INFO o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler' +2026-01-25 13:03:15.580 [main] INFO o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8082"] +2026-01-25 13:03:15.631 [main] INFO o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8082 (http) with context path '' +2026-01-25 13:03:15.633 [main] INFO com.example.sso.SsoApplication - Started SsoApplication in 2.188 seconds (JVM running for 2.868) +2026-01-25 13:06:13.683 [SpringContextShutdownHook] INFO o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler' +2026-01-25 13:06:13.686 [SpringContextShutdownHook] INFO o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'getAsyncExecutor' diff --git a/logs/app.log b/logs/app.log new file mode 100644 index 0000000..9069777 --- /dev/null +++ b/logs/app.log @@ -0,0 +1,17 @@ +2026-01-26 09:46:00.244 [main] INFO com.example.sso.SsoApplication - Starting SsoApplication on 夜愿 with PID 28436 (D:\taxi\TaxiGit\fadada\target\classes started by 李嘉卓 in D:\taxi\TaxiGit\fadada) +2026-01-26 09:46:00.266 [main] INFO com.example.sso.SsoApplication - No active profile set, falling back to default profiles: default +2026-01-26 09:46:03.061 [main] INFO o.s.c.s.PostProcessorRegistrationDelegate$BeanPostProcessorChecker - Bean 'asyncConfig' of type [com.example.sso.config.AsyncConfig$$EnhancerBySpringCGLIB$$38a99043] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2026-01-26 09:46:03.190 [main] INFO o.s.b.w.e.tomcat.TomcatWebServer - Tomcat initialized with port(s): 8082 (http) +2026-01-26 09:46:03.195 [main] INFO o.a.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8082"] +2026-01-26 09:46:03.195 [main] INFO o.a.catalina.core.StandardService - Starting service [Tomcat] +2026-01-26 09:46:03.195 [main] INFO o.a.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.27] +2026-01-26 09:46:03.233 [main] INFO o.a.c.c.C.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext +2026-01-26 09:46:03.233 [main] INFO o.s.web.context.ContextLoader - Root WebApplicationContext: initialization completed in 2944 ms +2026-01-26 09:46:03.349 [main] INFO o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService +2026-01-26 09:46:03.349 [main] INFO o.s.s.c.ThreadPoolTaskExecutor - Initializing ExecutorService 'getAsyncExecutor' +2026-01-26 09:46:03.469 [main] INFO o.s.s.c.ThreadPoolTaskScheduler - Initializing ExecutorService 'taskScheduler' +2026-01-26 09:46:03.481 [main] INFO o.a.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8082"] +2026-01-26 09:46:03.493 [main] INFO o.s.b.w.e.tomcat.TomcatWebServer - Tomcat started on port(s): 8082 (http) with context path '' +2026-01-26 09:46:03.519 [main] INFO com.example.sso.SsoApplication - Started SsoApplication in 3.522 seconds (JVM running for 4.38) +2026-01-26 09:46:06.398 [SpringContextShutdownHook] INFO o.s.s.c.ThreadPoolTaskScheduler - Shutting down ExecutorService 'taskScheduler' +2026-01-26 09:46:06.399 [SpringContextShutdownHook] INFO o.s.s.c.ThreadPoolTaskExecutor - Shutting down ExecutorService 'getAsyncExecutor' diff --git a/src/main/java/com/example/sso/controller/AnQuanTongChou.java b/src/main/java/com/example/sso/controller/AnQuanTongChou.java index d51705e..2e8a489 100644 --- a/src/main/java/com/example/sso/controller/AnQuanTongChou.java +++ b/src/main/java/com/example/sso/controller/AnQuanTongChou.java @@ -3,7 +3,9 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.log4j.Log4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -183,6 +185,9 @@ public class AnQuanTongChou { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("安全统筹参统协议完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"安全统筹参统协议",flowContractno, TimeUtils.timss(),signtask); + + logger.info("写进去了"); return "完成"; } diff --git a/src/main/java/com/example/sso/controller/FddController.java b/src/main/java/com/example/sso/controller/FddController.java index 9fa117b..51bcbec 100644 --- a/src/main/java/com/example/sso/controller/FddController.java +++ b/src/main/java/com/example/sso/controller/FddController.java @@ -3,8 +3,10 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.Dou; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.log4j.Log4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -209,7 +211,7 @@ public class FddController { String flowDepartment = data.getString("flow_department");//所属部门-辅助 String flowPlan = data.getString("flow_plan");//单班/双班 String flowTopic = data.getString("flow_topic"); //标题 - String flowAgentn = data.getString("flow_agentn");//代签人姓名-辅助 + // String flowAgentn = data.getString("flow_agentn");//代签人姓名-辅助 String flowAgentph = data.getString("flow_agentph");//代签人电话-辅助 String flowAgentid = data.getString("flow_agentid");//代签人身份证号-辅助 String flowLcontract = data.getString("flow_lcontract");//劳动合同打印请求-辅助 @@ -614,6 +616,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"汽车租赁合同",flowContractno, TimeUtils.timss(),signtask); + } if ( flow_zlht.equals("汽车租赁合同方案二")) { @@ -979,6 +983,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -1090,38 +1096,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1294,6 +1274,9 @@ public class FddController { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同",flowContractno, TimeUtils.timss(),signtask); + + } @@ -1404,40 +1387,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1613,6 +1568,9 @@ public class FddController { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动双班完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同",flowContractno, TimeUtils.timss(),signtask); + + } if (flowLcontract.equals("劳动合同") && flowPlan.equals("双班")) { logger.info("修改版本"); @@ -1717,38 +1675,11 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1922,6 +1853,9 @@ public class FddController { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同",flowContractno, TimeUtils.timss(),signtask); + + } @@ -2033,38 +1967,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -2337,6 +2245,9 @@ public class FddController { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同",flowContractno, TimeUtils.timss(),signtask); + + } /* @@ -2444,38 +2355,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -2747,6 +2632,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包双完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同",flowContractno, TimeUtils.timss(),signtask); + } if (flowWcontract.equals("承包合同") && flowPlan.equals("双班")) { @@ -2850,38 +2737,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -3153,6 +3014,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同",flowContractno, TimeUtils.timss(),signtask); + } @@ -3261,38 +3124,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -3443,6 +3280,9 @@ public class FddController { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("EU300趸交完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + + } /* @@ -3552,38 +3392,11 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -3732,6 +3545,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("预收承包金补交协议完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补交协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -3840,38 +3655,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -4077,6 +3866,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同补充协议电车完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -4186,38 +3977,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -4423,6 +4188,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info(" 承包合同补充协议（电车）(双班)完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } if (flowAgreement.equals("承包合同补充协议（电车）") && flowPlan.equals("双班")) { @@ -4526,38 +4293,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -4763,6 +4504,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同补充协议电车完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -4876,38 +4619,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -5119,6 +4836,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包金合同补充协议（岗补社补参保350）完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -5230,38 +4949,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -5477,6 +5170,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包金合同补充协议（岗补社补参保300）完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -5586,38 +5281,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -5868,6 +5537,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同补充协议（参保350）完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -5977,38 +5648,11 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -6247,6 +5891,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info(" 承包合同补充协议（参保300）完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -6356,38 +6002,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -6561,6 +6181,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同补充协议（燃油车趸交）完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -6669,38 +6291,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -6911,6 +6507,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info(" 承包合同补充协议（燃油车）完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } @@ -7021,38 +6619,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -7200,6 +6772,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动合同变更书完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同变更书",flowContractno, TimeUtils.timss(),signtask); + } @@ -7309,38 +6883,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -7488,6 +7036,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动合同变更书完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同变更",flowContractno, TimeUtils.timss(),signtask); + } @@ -7593,38 +7143,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -7772,6 +7296,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动合同变更书完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同变更",flowContractno, TimeUtils.timss(),signtask); + } @@ -7880,38 +7406,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -8087,6 +7587,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同变更书完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同变更",flowContractno, TimeUtils.timss(),signtask); + } @@ -8194,38 +7696,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -8419,6 +7895,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同变更书完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同变更",flowContractno, TimeUtils.timss(),signtask); + } if (flowWcontract.equals("承包合同变更书") && flowPlan.equals("双班")) { @@ -8522,38 +8000,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -8729,6 +8181,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同变更书完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同变更",flowContractno, TimeUtils.timss(),signtask); + } @@ -8836,38 +8290,12 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -9032,6 +8460,9 @@ public class FddController { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同补充协议（岗补社补)完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + + } @@ -9099,6 +8530,8 @@ public class FddController { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("服务协议完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"营运安全服务承诺书",flowContractno, TimeUtils.timss(),signtask); + } @@ -9211,38 +8644,11 @@ public class FddController { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -9419,6 +8825,8 @@ public class FddController { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("返聘协议完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"返聘协议",flowContractno, TimeUtils.timss(),signtask); + } diff --git a/src/main/java/com/example/sso/controller/FddControllerDp.java b/src/main/java/com/example/sso/controller/FddControllerDp.java index e839a31..40b1289 100644 --- a/src/main/java/com/example/sso/controller/FddControllerDp.java +++ b/src/main/java/com/example/sso/controller/FddControllerDp.java @@ -3,8 +3,10 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.Dou; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.log4j.Log4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -498,6 +500,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"汽车租赁合同",flowContractno, TimeUtils.timss(),signtask); + } if (flowDp != null && flowIswhole.equals("非趸交") && plan_name.equals("方案二")) { @@ -924,6 +928,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"汽车租赁合同",flowContractno, TimeUtils.timss(),signtask); + } @@ -1347,6 +1353,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"汽车租赁合同趸交",flowContractno, TimeUtils.timss(),signtask); + } @@ -1609,6 +1617,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } /* @@ -2041,6 +2051,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP日租2500完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } if (flowDp != null && flowIswhole.equals("日租2500") && plan_name.equals("方案二")) { //创建签署任务 @@ -2467,6 +2479,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP日租2500完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"汽车租赁合同日租",flowContractno, TimeUtils.timss(),signtask); + } /* @@ -2899,6 +2913,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP日租6000完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } if (flowDp != null && flowIswhole.equals("日租6000") && plan_name.equals("方案二")) { //创建签署任务 @@ -3327,6 +3343,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP日租6000完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"汽车租赁合同日租",flowContractno, TimeUtils.timss(),signtask); + } @@ -3762,6 +3780,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP日租完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"补充协议",flowContractno, TimeUtils.timss(),signtask); + } if (flowDp != null && flowIswhole.equals("日租") && plan_name.equals("方案二")) { logger.info("参数++++++" ); @@ -4191,6 +4211,8 @@ public class FddControllerDp { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP日租完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"汽车租赁合同日租",flowContractno, TimeUtils.timss(),signtask); + } diff --git a/src/main/java/com/example/sso/controller/FddControllerDpZuLin.java b/src/main/java/com/example/sso/controller/FddControllerDpZuLin.java index 61589dc..95dcd8c 100644 --- a/src/main/java/com/example/sso/controller/FddControllerDpZuLin.java +++ b/src/main/java/com/example/sso/controller/FddControllerDpZuLin.java @@ -3,7 +3,9 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.log4j.Log4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -300,6 +302,8 @@ public class FddControllerDpZuLin { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP租赁完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"DP租赁合同续签书",flowHtid, TimeUtils.timss(),signtask); + } if (plan_name.equals("方案二")){ //创建签署任务 @@ -567,6 +571,9 @@ public class FddControllerDpZuLin { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("DP租赁完成" + signtask); + + AddInfo.add(signTaskId,flowName,flowPbid,flowPbphoneno,"补充协议",flowHtid, TimeUtils.timss(),signtask); + } // diff --git a/src/main/java/com/example/sso/controller/FddControllerJiaShiYuanFuWu.java b/src/main/java/com/example/sso/controller/FddControllerJiaShiYuanFuWu.java index a151653..017ef0f 100644 --- a/src/main/java/com/example/sso/controller/FddControllerJiaShiYuanFuWu.java +++ b/src/main/java/com/example/sso/controller/FddControllerJiaShiYuanFuWu.java @@ -4,8 +4,10 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.PostMapping; @@ -130,6 +132,9 @@ public class FddControllerJiaShiYuanFuWu { String signtask = FDaDaUtil.signtask(signTaskIds); log.info("服务协议完成" + signtask); + AddInfo.add(signTaskId,flow_jname,flow_jid,flow_jphoneno,"银建出租车（北京）安全生产责任书-驾驶员",flow_contractno, TimeUtils.timss(),signtask); + + } diff --git a/src/main/java/com/example/sso/controller/FddControllerLianYingFang.java b/src/main/java/com/example/sso/controller/FddControllerLianYingFang.java index ceed597..cd9ad69 100644 --- a/src/main/java/com/example/sso/controller/FddControllerLianYingFang.java +++ b/src/main/java/com/example/sso/controller/FddControllerLianYingFang.java @@ -3,7 +3,9 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.log4j.Log4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -385,6 +387,7 @@ public class FddControllerLianYingFang { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("联营方完成" + signtask); + AddInfo.add(signTaskId,fullname1,social_code1,address1,"补充协议",contract_id, TimeUtils.timss(),signtask); } @@ -727,6 +730,10 @@ public class FddControllerLianYingFang { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("联营方完成" + signtask); + AddInfo.add(signTaskId,fullname1,social_code1,address1,"补充协议",contract_id, TimeUtils.timss(),signtask); + + + } @@ -964,6 +971,9 @@ public class FddControllerLianYingFang { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("合同解除通知书完成" + signtask); + AddInfo.add(signTaskId,fullname1,social_code1,address1,"补充协议",contract_id, TimeUtils.timss(),signtask); + + } @@ -1306,6 +1316,9 @@ public class FddControllerLianYingFang { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("联营方完成" + signtask); + AddInfo.add(signTaskId,fullname1,social_code1,address1,"补充协议",contract_id, TimeUtils.timss(),signtask); + + } @@ -2237,6 +2250,9 @@ public class FddControllerLianYingFang { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("联合运营合作合同完成" + signtask); + AddInfo.add(signTaskId,fullname1,social_code1,address1,"联合运营合作合同趸交",contract_id, TimeUtils.timss(),signtask); + + } @@ -2939,6 +2955,9 @@ public class FddControllerLianYingFang { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("联合运营合作合同完成" + signtask); + AddInfo.add(signTaskId,fullname1,social_code1,address1,"联合运营合作合同",contract_id, TimeUtils.timss(),signtask); + + } @@ -3762,6 +3781,9 @@ public class FddControllerLianYingFang { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("变更联合运营合作合同完成" + signtask); + AddInfo.add(signTaskId,fullname1,social_code1,address1,"变更联合运营合作合同",contract_id, TimeUtils.timss(),signtask); + + } diff --git a/src/main/java/com/example/sso/controller/FddControllerTuiZui.java b/src/main/java/com/example/sso/controller/FddControllerTuiZui.java index 0cea775..c6b9496 100644 --- a/src/main/java/com/example/sso/controller/FddControllerTuiZui.java +++ b/src/main/java/com/example/sso/controller/FddControllerTuiZui.java @@ -3,7 +3,9 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.log4j.Log4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -158,7 +160,7 @@ public class FddControllerTuiZui { String flowDepartment = data.getString("flow_department");//所属部门-辅助 String flowPlan = data.getString("flow_plan");//单班/双班 String flowTopic = data.getString("flow_topic"); //标题 - String flowAgentn = data.getString("flow_agentn");//代签人姓名-辅助 + // String flowAgentn = data.getString("flow_agentn");//代签人姓名-辅助 String flowAgentph = data.getString("flow_agentph");//代签人电话-辅助 String flowAgentid = data.getString("flow_agentid");//代签人身份证号-辅助 String flowLcontract = data.getString("flow_lcontract");//劳动合同打印请求-辅助 @@ -286,38 +288,12 @@ public class FddControllerTuiZui { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -391,6 +367,8 @@ public class FddControllerTuiZui { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动劳动解除完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同解除",flowContractno, TimeUtils.timss(),signtask); + } @@ -499,38 +477,12 @@ public class FddControllerTuiZui { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -600,6 +552,9 @@ public class FddControllerTuiZui { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("返聘协议完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"返聘劳动协议解除书",flowContractno, TimeUtils.timss(),signtask); + + } @@ -709,38 +664,12 @@ public class FddControllerTuiZui { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -814,6 +743,8 @@ public class FddControllerTuiZui { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动解除双完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同解除",flowContractno, TimeUtils.timss(),signtask); + } @@ -918,38 +849,12 @@ public class FddControllerTuiZui { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1024,6 +929,9 @@ public class FddControllerTuiZui { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动劳动解除完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同解除",flowContractno, TimeUtils.timss(),signtask); + + } @@ -1133,38 +1041,12 @@ public class FddControllerTuiZui { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1238,6 +1120,8 @@ public class FddControllerTuiZui { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("运营任务承包合同解除完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"运营任务承包合同解除",flowContractno, TimeUtils.timss(),signtask); + } @@ -1347,38 +1231,12 @@ public class FddControllerTuiZui { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1453,6 +1311,9 @@ public class FddControllerTuiZui { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("运营任务承包合同解除完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"运营任务承包合同解除",flowContractno, TimeUtils.timss(),signtask); + + } if (flowTerminatecontract.equals("签署") && flowPlan.equals("双班") && !flowEpcontract.equals("纸质合同")) { @@ -1556,38 +1417,11 @@ public class FddControllerTuiZui { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1662,6 +1496,9 @@ public class FddControllerTuiZui { String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("运营任务承包合同解除完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"运营任务承包合同解除",flowContractno, TimeUtils.timss(),signtask); + + } diff --git a/src/main/java/com/example/sso/controller/FddControllerXuQina.java b/src/main/java/com/example/sso/controller/FddControllerXuQina.java index dd27106..fb1d327 100644 --- a/src/main/java/com/example/sso/controller/FddControllerXuQina.java +++ b/src/main/java/com/example/sso/controller/FddControllerXuQina.java @@ -3,8 +3,10 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.Dou; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.log4j.Log4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -151,7 +153,7 @@ public class FddControllerXuQina { String flowDepartment = data.getString("flow_department");//所属部门-辅助 String flowPlan = data.getString("flow_plan");//单班/双班 String flowTopic = data.getString("flow_topic"); //标题 - String flowAgentn = data.getString("flow_agentn");//代签人姓名-辅助 + // String flowAgentn = data.getString("flow_agentn");//代签人姓名-辅助 String flowAgentph = data.getString("flow_agentph");//代签人电话-辅助 String flowAgentid = data.getString("flow_agentid");//代签人身份证号-辅助 String flowLcontract = data.getString("flow_laborrenew");//劳动合同打印请求-辅助 @@ -266,38 +268,12 @@ public class FddControllerXuQina { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -399,6 +375,8 @@ public class FddControllerXuQina { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("劳动合同续签完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同续签",flowContractno, TimeUtils.timss(),signtask); + } @@ -508,38 +486,11 @@ public class FddControllerXuQina { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -641,6 +592,8 @@ public class FddControllerXuQina { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同续签完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同续签",flowContractno, TimeUtils.timss(),signtask); + } @@ -749,38 +702,12 @@ public class FddControllerXuQina { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -930,6 +857,8 @@ public class FddControllerXuQina { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("EU300趸交完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"EU300趸交",flowContractno, TimeUtils.timss(),signtask); + } @@ -1041,38 +970,12 @@ public class FddControllerXuQina { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1278,6 +1181,8 @@ public class FddControllerXuQina { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同补充协议电车完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同补充协议电车",flowContractno, TimeUtils.timss(),signtask); + } /* @@ -1384,38 +1289,12 @@ public class FddControllerXuQina { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - if (flowAgentn != null) { - actorsproxylist.put("identNameForMatch", flowAgentn); - } - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); + jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1621,6 +1500,8 @@ public class FddControllerXuQina { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("承包合同补充协议（参保300）完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"承包合同补充协议（参保300）",flowContractno, TimeUtils.timss(),signtask); + } @@ -1732,38 +1613,12 @@ public class FddControllerXuQina { actors.put("signConfigInfo", signConfigInfos); - //代理人 - JSONObject actorsproxy = new JSONObject(); - //代理人详细信息 - JSONObject actorsproxylist = new JSONObject(); - actorsproxylist.put("actorId", "代理人"); - actorsproxylist.put("actorType", "person"); - if (flowAgentn != null) { - actorsproxylist.put("actorName", flowAgentn); - } - JSONArray actorsproxylistpermissions = new JSONArray(); - actorsproxylistpermissions.add("sign"); - actorsproxylist.put("identNameForMatch", flowAgentn); - - actorsproxylist.put("certType", "id_card"); - if (flowAgentid != null) { - actorsproxylist.put("certNoForMatch", flowAgentid); - } - if (flowAgentph != null) { - actorsproxylist.put("notifyAddress", flowAgentph); - } - JSONArray notifyTypeactorsproxylist = new JSONArray(); - notifyTypeactorsproxylist.add("start"); - notifyTypeactorsproxylist.add("finish"); - actorsproxylist.put("notifyType", notifyTypeactorsproxylist); - actorsproxylist.put("permissions", actorsproxylistpermissions); - actorsproxy.put("actor", actorsproxylist); jsonArray.add(actor); jsonArray.add(actors); - jsonArray.add(actorsproxy); + initiator.put("actors", jsonArray); String jsonString = initiator.toJSONString(); @@ -1940,6 +1795,8 @@ public class FddControllerXuQina { System.out.println("控件填写完成======================================="); String signtask = FDaDaUtil.signtask(signTaskIds); logger.info("返聘协议完成" + signtask); + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"返聘协议",flowContractno, TimeUtils.timss(),signtask); + } diff --git a/src/main/java/com/example/sso/controller/TiHuanCheController.java b/src/main/java/com/example/sso/controller/TiHuanCheController.java index 6022a83..8ecbb8c 100644 --- a/src/main/java/com/example/sso/controller/TiHuanCheController.java +++ b/src/main/java/com/example/sso/controller/TiHuanCheController.java @@ -3,7 +3,9 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.log4j.Log4j; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; @@ -279,6 +281,8 @@ public class TiHuanCheController { String signtask = FDaDaUtil.signtask(signTaskIds); log.info("替换车完成" + signtask); + AddInfo.add(signTaskId,th_xm,th_sfhm,th_sjh,"替用车使用协议解除书",th_htbh, TimeUtils.timss(),signtask); + return ""; } diff --git a/src/main/java/com/example/sso/controller/TiHuanCheJieChuController.java b/src/main/java/com/example/sso/controller/TiHuanCheJieChuController.java index d34da12..9609c17 100644 --- a/src/main/java/com/example/sso/controller/TiHuanCheJieChuController.java +++ b/src/main/java/com/example/sso/controller/TiHuanCheJieChuController.java @@ -3,7 +3,9 @@ package com.example.sso.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.PostMapping; @@ -247,6 +249,10 @@ public class TiHuanCheJieChuController { String signtask = FDaDaUtil.signtask(signTaskIds); log.info("替换车解除完成" + signtask); + AddInfo.add(signTaskId,gh_xm,gh_sfhm,gh_sjh,"补充协议",gh_htbh, TimeUtils.timss(),signtask); + + + return ""; } diff --git a/src/main/java/com/example/sso/dao/AddInfo.java b/src/main/java/com/example/sso/dao/AddInfo.java new file mode 100644 index 0000000..35abcca --- /dev/null +++ b/src/main/java/com/example/sso/dao/AddInfo.java @@ -0,0 +1,57 @@ +package com.example.sso.dao; + +import com.alibaba.fastjson.JSONObject; +import com.example.sso.util.V5utils; + +public class AddInfo { + public static void add(String lx_taskida ,String lx_xma,String lx_sfhma,String lx_sjha,String lx_htlxa,String lx_htbha,String lx_qsfqsja,String lx_fqzta) { + JSONObject jsonObject2 = new JSONObject(); + jsonObject2.put("app_id", "694d0c4e4997401c0bb65edb"); + jsonObject2.put("entry_id", "696a05f72b2ce8cf4109252e"); + jsonObject2.put("is_start_workflow", true); + jsonObject2.put("is_start_trigger", true); + JSONObject data = new JSONObject(); + + JSONObject lx_taskid = new JSONObject(); + lx_taskid.put("value",lx_taskida); + data.put("lx_taskid",lx_taskid); + + JSONObject lx_xm = new JSONObject(); + lx_xm.put("value",lx_xma); + data.put("lx_xm",lx_xm); + + JSONObject lx_sfhm = new JSONObject(); + lx_sfhm.put("value",lx_sfhma); + data.put("lx_sfhm",lx_sfhm); + + JSONObject lx_sjh = new JSONObject(); + lx_sjh.put("value",lx_sjha); + data.put("lx_sjh",lx_sjh); + + JSONObject lx_htlx = new JSONObject(); + lx_htlx.put("value",lx_htlxa); + data.put("lx_htlx",lx_htlx); + + JSONObject lx_htbh = new JSONObject(); + lx_htbh.put("value",lx_htbha); + data.put("lx_htbh",lx_htbh); + + JSONObject lx_qsfqsj = new JSONObject(); + lx_qsfqsj.put("value",lx_qsfqsja); + data.put("lx_qsfqsj",lx_qsfqsj); + + JSONObject lx_fqzt = new JSONObject(); + lx_fqzt.put("value",lx_fqzta); + data.put("lx_fqzt",lx_fqzt); + + + + + + + jsonObject2.put("data",data); + String jsonString1 = jsonObject2.toJSONString(); + String add = V5utils.add(jsonString1); + + } +} diff --git a/src/main/java/com/example/sso/dao/GetUrl.java b/src/main/java/com/example/sso/dao/GetUrl.java index a19306d..9dd8235 100644 --- a/src/main/java/com/example/sso/dao/GetUrl.java +++ b/src/main/java/com/example/sso/dao/GetUrl.java @@ -6,7 +6,7 @@ import com.example.sso.util.FDaDaUtil; public class GetUrl { public static void main(String[] args) throws Exception { JSONObject jsonObject = new JSONObject(); - jsonObject.put("clientCorpId","i"); + jsonObject.put("clientCorpId","j"); String jsonString = jsonObject.toJSONString(); String fddurl = FDaDaUtil.fddurl(jsonString); diff --git a/src/main/java/com/example/sso/dao/Updatas.java b/src/main/java/com/example/sso/dao/Updatas.java new file mode 100644 index 0000000..c85e9c6 --- /dev/null +++ b/src/main/java/com/example/sso/dao/Updatas.java @@ -0,0 +1,22 @@ +package com.example.sso.dao; + +import com.alibaba.fastjson.JSONObject; +import com.example.sso.util.V5utils; + +public class Updatas { + + public static void upid (String id, String ids) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("app_id","694d0c4e4997401c0bb65edb"); + jsonObject.put("entry_id","696a05f72b2ce8cf4109252e"); + jsonObject.put("data_id",id); + JSONObject data = new JSONObject(); + JSONObject task_id = new JSONObject(); + task_id.put("value",ids); + data.put("lx_lxzt",task_id); + jsonObject.put("data",data); + String jsonString = jsonObject.toJSONString(); + V5utils.updata(jsonString); + + } +} diff --git a/src/main/java/com/example/sso/schedule/NowDown.java b/src/main/java/com/example/sso/schedule/NowDown.java new file mode 100644 index 0000000..adf2a61 --- /dev/null +++ b/src/main/java/com/example/sso/schedule/NowDown.java @@ -0,0 +1,171 @@ +package com.example.sso.schedule; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; + +import com.example.sso.dao.Updatas; +import com.example.sso.util.APIUtils; +import com.example.sso.util.DownUtil; +import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.V5utils; +import org.springframework.boot.autoconfigure.web.ServerProperties; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Map; +@Component +public class NowDown { + @Scheduled(fixedRate = 60000) + public void main1() throws Exception { + String saveDir = "/home/fadada/file/"; + JSONObject jsonObject = new JSONObject(); + jsonObject.put("app_id", "694d0c4e4997401c0bb65edb"); + jsonObject.put("entry_id", "696a05f72b2ce8cf4109252e"); + jsonObject.put("limit", 10000); + + String jsonString = jsonObject.toJSONString(); + + + String select = V5utils.list(jsonString); + JSONObject jsonObject2 = JSON.parseObject(select); + JSONArray jsonArray2 = jsonObject2.getJSONArray("data"); + System.out.println(jsonArray2); + + for (Object o : jsonArray2) { + + try { + JSONObject TEST = (JSONObject) o; + String id = TEST.getString("lx_taskid"); + String lx_xm = TEST.getString("lx_xm"); + String lx_sfhm = TEST.getString("lx_sfhm"); + String lx_sjh = TEST.getString("lx_sjh"); + String lx_htlx = TEST.getString("lx_htlx"); + String lx_htbh = TEST.getString("lx_htbh"); + String lx_qsfqsj = TEST.getString("lx_qsfqsj"); + String lx_fqzt = TEST.getString("lx_fqzt"); + String lx_lxzt = TEST.getString("lx_lxzt"); + + + String id1 = TEST.getString("_id"); + JSONObject jsonObject3 = new JSONObject(); + jsonObject3.put("signTaskId", id); + String jsonString1 = jsonObject3.toJSONString(); + String infor = FDaDaUtil.infor(jsonString1); + JSONObject jsonObject31 = JSON.parseObject(infor); + String s = jsonObject31.getJSONObject("data").getString("signTaskStatus"); + if (s.equals("task_finished")) { + String urls = DownUtil.urls(id); + FDaDaUtil.fileUrl(urls, id, saveDir); + + //新增简道云 + + JSONObject get_upload_token = new JSONObject(); + + get_upload_token.put("app_id","694d0c4e4997401c0bb65edb"); + get_upload_token.put("entry_id","696a02202b2ce8cf4108e7e8"); + get_upload_token.put("transaction_id","A"); + String jsonString2 = get_upload_token.toJSONString(); + String uploadToken = V5utils.get_upload_token(jsonString2); + JSONObject jsonObject1 = JSON.parseObject(uploadToken); + JSONArray tokenAndUrlList = jsonObject1.getJSONArray("token_and_url_list"); + Object o1 = tokenAndUrlList.get(0); + JSONObject TT = (JSONObject) o1; + String token = TT.getString("token"); + + String keys = APIUtils.keys(id, token); + + + JSONObject jsonObject4 = new JSONObject(); + jsonObject4.put("app_id", "694d0c4e4997401c0bb65edb"); + jsonObject4.put("entry_id", "696a02202b2ce8cf4108e7e8"); + jsonObject4.put("transaction_id", "A"); + jsonObject4.put("is_start_workflow", true); + jsonObject4.put("is_start_trigger", true); + JSONObject data = new JSONObject(); + + JSONObject fj_htlx = new JSONObject(); + fj_htlx.put("value",lx_htlx); + data.put("fj_htlx",fj_htlx); + + JSONObject fj_htbh = new JSONObject(); + fj_htbh.put("value",lx_htbh); + data.put("fj_htbh",fj_htbh); + + JSONObject fj_xm = new JSONObject(); + fj_xm.put("value",lx_xm); + data.put("fj_xm",fj_xm); + + JSONObject fj_htzt = new JSONObject(); + fj_htzt.put("value",jsonObject31.getJSONObject("data").getString("signTaskSubject")); + data.put("fj_htzt",fj_htzt); + + JSONArray jsonArray1 = new JSONArray(); + jsonArray1.add(keys); + + JSONObject fj_htfj = new JSONObject(); + fj_htfj.put("value",jsonArray1); + data.put("fj_htfj",fj_htfj); + + JSONObject fj_taskid = new JSONObject(); + fj_taskid.put("value",id); + data.put("fj_taskid",fj_taskid); + + JSONObject fj_qsfqsj = new JSONObject(); + fj_qsfqsj.put("value",lx_qsfqsj); + data.put("fj_qsfqsj",fj_qsfqsj); + + JSONObject fj_qswcsj = new JSONObject(); + fj_qswcsj.put("value",jsonObject31.getJSONObject("data").getString("finishTime")); + data.put("fj_qswcsj",fj_qswcsj); + + JSONObject fj_sfzh = new JSONObject(); + fj_sfzh.put("value",lx_sfhm); + data.put("fj_sfzh",fj_sfzh); + + + + + + + + + + + + + + + + jsonObject4.put("data",data); + String jsonString111111 = jsonObject4.toJSONString(); + V5utils.add(jsonString111111); + + + + + + JSONObject jsonObject11 = new JSONObject(); + jsonObject11.put("app_id", "694d0c4e4997401c0bb65edb"); + jsonObject11.put("entry_id", "696a05f72b2ce8cf4109252e"); + jsonObject11.put("data_id", id1); + + String jsonString111 = jsonObject11.toJSONString(); + String delete = V5utils.delete(jsonString111); + + + System.out.println(delete); + + }else { + Updatas.upid(id1,s); + } + } catch (Exception e) { + continue; + } + System.out.println(""); + + } + + + } +} diff --git a/src/main/java/com/example/sso/test/A.java b/src/main/java/com/example/sso/test/A.java index f30ca8a..5037221 100644 --- a/src/main/java/com/example/sso/test/A.java +++ b/src/main/java/com/example/sso/test/A.java @@ -5,10 +5,13 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.example.sso.dao.Totle; import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.V5utils; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import javax.jws.soap.SOAPBinding; + @Slf4j @Component @@ -53,4 +56,23 @@ public class A { log.info(string); } + + + public static void main(String[] args) throws Exception { + JSONObject get_upload_token = new JSONObject(); + + get_upload_token.put("app_id","694d0c4e4997401c0bb65edb"); + get_upload_token.put("entry_id","696a02202b2ce8cf4108e7e8"); + get_upload_token.put("transaction_id","A"); + String jsonString2 = get_upload_token.toJSONString(); + String uploadToken = V5utils.get_upload_token(jsonString2); + JSONObject jsonObject1 = JSON.parseObject(uploadToken); + JSONArray tokenAndUrlList = jsonObject1.getJSONArray("token_and_url_list"); + Object o1 = tokenAndUrlList.get(0); + JSONObject TT = (JSONObject) o1; + String string = TT.getString("token"); + System.out.println(string); + } } + + diff --git a/src/main/java/com/example/sso/test/G.java b/src/main/java/com/example/sso/test/G.java index 1cdd5be..5306ad3 100644 --- a/src/main/java/com/example/sso/test/G.java +++ b/src/main/java/com/example/sso/test/G.java @@ -1,5 +1,6 @@ package com.example.sso.test; +import com.example.sso.dao.AddInfo; import com.fasc.open.api.utils.crypt.FddCryptUtil; import java.time.LocalDateTime; @@ -16,13 +17,10 @@ public class G { //时间戳 public static void main(String[] args) { - // 创建指定的日期时间对象 (2025年10月20日22点) - LocalDateTime specifiedDateTime = LocalDateTime.of(2025, 10, 22, 22, 0); - // 将本地日期时间与系统默认时区结合，然后转换为时间戳（毫秒） - long timestamp = specifiedDateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli(); - System.out.println("时间戳 (毫秒): " + timestamp); // 输出：1761562800000 + + AddInfo.add("s","s","","","s","s","s",""); } diff --git a/src/main/java/com/example/sso/test/XinBanCeShi.java b/src/main/java/com/example/sso/test/XinBanCeShi.java new file mode 100644 index 0000000..47419bb --- /dev/null +++ b/src/main/java/com/example/sso/test/XinBanCeShi.java @@ -0,0 +1,379 @@ +package com.example.sso.test; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.example.sso.dao.AddInfo; +import com.example.sso.util.FDaDaUtil; +import com.example.sso.util.TimeUtils; +import lombok.extern.log4j.Log4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Async; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@Log4j +@Async +public class XinBanCeShi { + Logger logger = LoggerFactory.getLogger(getClass()); + + @PostMapping("/tuizu2") + public String qianzhang(@RequestBody JSONObject signature) throws Exception { + logger.info(signature.toJSONString()); + + JSONObject data = signature.getJSONObject("data"); + //字段 + String flow_pbphoneno = data.getString("flow_pbphoneno"); //乙方联系电话 + String flow2ndphoneno = data.getString("flow_2ndphoneno");//对班手机号 + String flowPbid = data.getString("flow_pbid"); //乙方身份证号 + String flow2ndpbid = data.getString("flow_2ndpbid");//对班身份号码 + + String flowName = data.getString("flow_name"); //乙方姓名 + String flow2ndname = data.getString("flow_2ndname");//对班姓名 + + /* String province = data.getJSONObject("flow_pbaddress").getString("province");//乙方户籍地址 JSON + String city = data.getJSONObject("flow_pbaddress").getString("city"); + String district = data.getJSONObject("flow_pbaddress").getString("district"); + String detail = data.getJSONObject("flow_pbaddress").getString("detail"); + String flowpbaddress = province + city + district + detail;*/ + + /* String province9 = data.getJSONObject("flow_2ndpbaddress").getString("province");//对班户口簿住址 + String city9 = data.getJSONObject("flow_2ndpbaddress").getString("city"); + String district9 = data.getJSONObject("flow_2ndpbaddress").getString("district"); + String detail9 = data.getJSONObject("flow_2ndpbaddress").getString("detail"); + String flowpbaddress1 = province9 + city9 + district9 + detail9;*/ + + // String flowPresentaddress = data.getString("flow_presentaddress"); + /* String city1 = data.getJSONObject("flow_presentaddress").getString("city"); //乙方现居住地址 JSON + String district1 = data.getJSONObject("flow_presentaddress").getString("district"); + String detail1 = data.getJSONObject("flow_presentaddress").getString("detail"); + String province1 = data.getJSONObject("flow_presentaddress").getString("province"); + String flowPresentaddress = province1+city1 + district1 + detail1;*/ + + /* String city8 = data.getJSONObject("flow_2ndpreaddress").getString("city"); //乙方现居住地址 JSON + String district8 = data.getJSONObject("flow_2ndpreaddress").getString("district"); + String detail8 = data.getJSONObject("flow_2ndpreaddress").getString("detail"); + String province8 = data.getJSONObject("flow_2ndpreaddress").getString("province"); + String flowPresentaddress1 = province8+city8 + district8 + detail8 ;*/ + + String flowLsdate = data.getString("flow_lsdate"); //劳动合同开始日期 + String flow2ndlsdate = data.getString("flow_2ndlsdate");//对班劳动合同开始日期 + String flowLedate = data.getString("flow_ledate"); //劳动合同终止日期 + String flow2ndledate = data.getString("flow_2ndledate");//对班劳动合同终止日期 + String flowContractno = data.getString("flow_contractno"); //合同编号 + String flow2ndcontractno = data.getString("flow_2ndcontractno");//合同编号对班 + String flowQcno = data.getString("flow_qcno");//乙方从业资格证号 + String flow2ndqcno = data.getString("flow_2ndqcno");//乙方从业资格证号对班 + String flowPlateno = data.getString("flow_plateno");//车牌号 + String flowBmodel = data.getString("flow_shortname"); //品牌型号 + String flowEngineno = data.getString("flow_engineno"); //车辆识别代号 + String flowSdisplay = data.getString("flow_sdisplay"); //人数 + String flowWcsdate = data.getString("flow_wcsdate"); //承包合同开始日期 + String flowWcedate = data.getString("flow_wcedate"); //承包合同终止日期 + Integer flowContractfee = data.getInteger("flow_contractfee"); //承包金 + Integer flow2ndcontractfee = data.getInteger("flow_2ndcontractfee");//承包金对班 + String flowEmcontact = data.getString("flow_emcontact"); //紧急联系人姓名 + String flow2ndemcontact = data.getString("flow_2ndemcontact");//紧急联系人姓名对班 + String flowEmcontactid = data.getString("flow_emcontactid"); //紧急联系人身份证号 + String flow2ndemcontactid = data.getString("flow_2ndemcontactid");//紧急联系人身份证号对班 + String flowRelation = data.getString("flow_relation"); //关系 + String flow2ndrelation = data.getString("flow_2ndrelation");//关系对班 + String flowEcphone = data.getString("flow_ecphone"); //紧急联系人电话 + String flow2ndecphone = data.getString("flow_2ndecphone");//紧急联系人电话对班 +// String flowEcadress = data.getString("flow_ecadress"); + /*String city2 = data.getJSONObject("flow_ecadress").getString("city"); //紧急联系人住址 JSON + String district2 = data.getJSONObject("flow_ecadress").getString("district"); + String detail2 = data.getJSONObject("flow_ecadress").getString("detail"); + String province2 = data.getJSONObject("flow_ecadress").getString("province"); + String flowEcadress = province2+city2 + district2 + detail2;*/ + + /* String city5 = data.getJSONObject("flow_2ndecaddress").getString("city"); //紧急联系人住址 JSON 对班 + String district5 = data.getJSONObject("flow_2ndecaddress").getString("district"); + String detail5 = data.getJSONObject("flow_2ndecaddress").getString("detail"); + String province5 = data.getJSONObject("flow_2ndecaddress").getString("province"); + String flowEcadress1 = province5+city5 + district5 + detail5;*/ + + String flowRegdate = data.getString("flow_regdate"); //注册登记日期 + Integer flowReceived = data.getInteger("flow_received"); //实收金额 + Integer flowUnpaid = data.getInteger("flow_unpaid"); //未缴金额 + Integer flow1stmonth = data.getInteger("flow_1stmonth"); //第一个月金额 + Integer flow2ndmonth = data.getInteger("flow_2ndmonth"); //第二个月金额 + Integer flow3rdmonth = data.getInteger("flow_3rdmonth"); //第三个月金额 + Integer flow4thmonth = data.getInteger("flow_4thmonth"); //第四个月金额 + Integer flow5thmonth = data.getInteger("flow_5thmonth"); //第五个月金额 + + Integer flowSubsidy = data.getInteger("flow_subsidy");//岗位补贴 + Integer flow2ndsubsidy = data.getInteger("flow_2ndsubsidy");//岗位补贴对班 + Integer flowDsdfexpense = data.getInteger("flow_dsdfexpense");//代收代付费用 + Integer flow2nddsdfexp = data.getInteger("flow_2nddsdfexp");//代收代付费用对班 + Integer flowSocialpf = data.getInteger("flow_socialpf");//社保个人费额 + Integer flow2ndsocialpf = data.getInteger("flow_2ndsocialpf");//社保个人费额对班 + Integer flowNetpayable = data.getInteger("flow_netpayable");//应交净额 + Integer flow2ndnetpayable = data.getInteger("flow_2ndnetpayable");//应交净额对班 + Integer flowFyjcxdiscount = data.getInteger("flow_fyjcxdiscount");//非银建参险优惠 + Integer flow2ndfyjcxdisc = data.getInteger("flow_2ndfyjcxdisc");//非银建参险优惠对班 + Integer flowTempsubsidy = data.getInteger("flow_tempsubsidy");//临时性补贴金额 + String flowFyjcxremark = data.getString("flow_fyjcxremark");//非银建参险备注1 + String flowTempsubsidy1 = data.getString("flow_tempsubsidy1");//临时性补贴1 + Integer flow1stmpayment = data.getInteger("flow_1stmpayment");//首月承包金 + Integer flow2nd1mpayment = data.getInteger("flow_2nd1mpayment");//首月承包金对班 + String flowOperationdp = data.getString("flow_operationdp");//营运日期打印 + String flowCbenddp = data.getString("flow_cbenddp");//参保终止日期打印 + String flowAfteredp = data.getString("flow_afteredp");//参保终止后一日打印 + Integer flowCbtempsub = data.getInteger("flow_cbtempsub");//临时性补贴金额（含参保） + Integer flowDjnetcfee = data.getInteger("flow_djnetcfee");//趸交净承包金 + Integer flowDjtotalfee = data.getInteger("flow_djtotalfee");//趸交总金额 + Integer flowTotalfuel = data.getInteger("flow_totalfuel");//燃料补贴合计 + Integer flowFuelnetpayable = data.getInteger("flow_fuelnetpayable");//应交净额-燃油车 + Integer flowTempfuelsub = data.getInteger("flow_tempfuelsub");//临时性补贴金额-燃油 + String flowFyjcxremark2 = data.getString("flow_fyjcxremark2");//非银建参险备注2 + Integer flowStandardfee = data.getInteger("flow_standardfee");//应收预收承包金标准 + Integer flow2ndstandardfee = data.getInteger("flow_2ndstandardfee");//应收预收承包金标准对班 + String flowBranch = data.getString("flow_branch");//分司 + String flowNewlsdate = data.getString("flow_newlsdate");//新劳动开始日期打印 + String flowNewledate = data.getString("flow_newledate");//新劳动终止日期打印 + String flowLsdate1 = data.getString("flow_lsdate");//劳动开始日期打印 + String flowReletdate = data.getString("flow_reletdate");//续租日期打印 + String flowNewosdate = data.getString("flow_newosdate");//新运营开始日期打印 + String flowNewoedate = data.getString("flow_newoedate");//新运营终止日期打印 + String flowOsdate = data.getString("flow_osdate");//运营开始日期打印 + String flowRegdatep = data.getString("flow_regdatep");//注册登记日期打印 + String flowNetreceivable = data.getString("flow_netreceivable");//应收净额 + Integer flowTempsub = data.getInteger("flow_tempsub");//临时性补贴 + Integer flowTempsub1 = data.getInteger("flow_tempsub1");//临时性补贴1 + String flowBrand = data.getString("flow_brand");//车辆品牌 + String flowModel = data.getString("flow_model");//车辆型号 + String flowDxcontractfee = data.getString("flow_dxcontractfee");//对班承包金大写 + String flowTerminatedate = data.getString("flow_terminatedate");//解除日期打印 + String flowEnd = data.getString("flow_end");//解除日期打印 + String flowTerminatelabor = data.getString("flow_terminatelabor");//劳动合同解除书 + String flowTerminatecontract = data.getString("flow_terminatecontract");//运营任务承包合同解除书 + String flowPaname = data.getString("flow_paname");//甲方名称 + String flowEpcontract = data.getString("flow_epcontract");//纸质合同 + String flowType = data.getString("flow_type");//劳动合同/返聘协议 + + + String flowDepartment = data.getString("flow_department");//所属部门-辅助 + String flowPlan = data.getString("flow_plan");//单班/双班 + String flowTopic = data.getString("flow_topic"); //标题 + String flowAgentn = data.getString("flow_agentn");//代签人姓名-辅助 + String flowAgentph = data.getString("flow_agentph");//代签人电话-辅助 + String flowAgentid = data.getString("flow_agentid");//代签人身份证号-辅助 + String flowLcontract = data.getString("flow_lcontract");//劳动合同打印请求-辅助 + String flowWcontract = data.getString("flow_wcontract");//承包合同打印请求-辅助 + String flowAgreement = data.getString("flow_agreement");//补充协议打印请求-辅助 + String flowCletter = data.getString("flow_cletter");//变更书打印请求-辅助 + + + + + + + + + + + + + + + /* + 银建劳动合同解除书 + + */ + + + + //创建签署任务 + JSONObject initiator = new JSONObject(); + JSONObject openid = new JSONObject(); + openid.put("idType", "corp"); + openid.put("openId", "625776ecae6742cb8eb710beedef9b4c"); + initiator.put("initiator", openid); + + initiator.put("signTaskSubject", "劳动合同解除" + "$" + flowName + "$" + flowContractno); + + initiator.put("signTemplateId", "1768899516850192763"); + initiator.put("businessId", "a09900c24614bd4c1de10c55712a3e0e"); + //参与方数组 + JSONArray jsonArray = new JSONArray(); + //actor个人对象 + JSONObject actor = new JSONObject(); + //actor详细信息个人 + JSONObject actorlist = new JSONObject(); + actorlist.put("actorId", "乙方"); + actorlist.put("actorType", "person"); + if (flowName != null) { + actorlist.put("actorName", flowName); + } + JSONArray permissions = new JSONArray(); + permissions.add("sign"); + if (flowName != null) { + actorlist.put("identNameForMatch", flowName); + } + actorlist.put("certType", "id_card"); + if (flowPbid != null) { + actorlist.put("certNoForMatch", flowPbid); + } + if (flow_pbphoneno != null) { + actorlist.put("notifyAddress", flow_pbphoneno); + } + JSONArray notifyType = new JSONArray(); + notifyType.add("start"); + notifyType.add("finish"); + actorlist.put("notifyType", notifyType); + actorlist.put("permissions", permissions); + actor.put("actor", actorlist); + + + //企业方对象 + JSONObject actors = new JSONObject(); + //actor详细信息企业 + JSONObject actorlists = new JSONObject(); + actorlists.put("actorId", "参与方1"); + actorlists.put("actorType", "corp"); + if (flowDepartment != null) { + actorlists.put("actorName", flowDepartment); + } + /*JSONArray permissionss = new JSONArray(); + permissionss.add("sign"); + actorlists.put("permissions",permissionss);*/ + if (!flowDepartment.equals("银建新能源")) { + actorlists.put("actorOpenId", "625776ecae6742cb8eb710beedef9b4c"); + String entryids = FDaDaUtil.entryids(flowPaname); + actorlists.put("actorEntityId", entryids); + } else if (flowDepartment.equals("银建新能源")) { + actorlists.put("actorOpenId", "a0c12949a1c54ff9bfa45dbe957fbc5d"); + } + /*actorlists.put("notifyAddress", "13520145209");*/ + JSONArray notifyTypes = new JSONArray(); + notifyTypes.add("start"); + notifyTypes.add("finish"); + actorlists.put("notifyType", notifyTypes); + JSONArray SignField = new JSONArray(); + JSONObject jsonObject2 = new JSONObject(); + + JSONObject ownerId = new JSONObject(); // docid + ownerId.put("ownerId", openid); + ownerId.put("signTemplateId", "1768899516850192763"); + String ownerIdJSONString = ownerId.toJSONString(); + String doc = FDaDaUtil.doc(ownerIdJSONString); + + jsonObject2.put("fieldDocId", doc); + if (flowDepartment.equals("银建")) { + jsonObject2.put("sealId", 1705990704393128941l); + } else if (flowDepartment.equals("金建")) { + jsonObject2.put("sealId", 1705991374867130717l); + } else if (flowDepartment.equals("金银建")) { + jsonObject2.put("sealId", 1705991362754131529l); + } else if (flowDepartment.equals("华建")) { + jsonObject2.put("sealId", 1705991079845184562l); + } else if (flowDepartment.equals("银建新能源")) { + jsonObject2.put("sealId", 1706510414541115296l); + } + + SignField.add(jsonObject2); + JSONObject signConfigInfo = new JSONObject(); + JSONObject signConfigInfos = new JSONObject(); + signConfigInfos.put("requestVerifyFree", true); + signConfigInfo.put("signConfigInfo", signConfigInfo); + + + actors.put("actor", actorlists); + actors.put("signFields", SignField); + actors.put("signConfigInfo", signConfigInfos); + + + + + + jsonArray.add(actor); + jsonArray.add(actors); + + initiator.put("actors", jsonArray); + String jsonString = initiator.toJSONString(); + + String fdd = FDaDaUtil.fdd(jsonString); + logger.info("劳动解除" + fdd); + JSONObject jsonObject = JSON.parseObject(fdd); + //任务id + String signTaskId = jsonObject.getJSONObject("data").getString("signTaskId"); + String signTaskIds = String.valueOf(jsonObject.getJSONObject("data")); + System.out.println("signTaskId____________________" + signTaskId); + System.out.println("signTaskIds========================" + signTaskIds); + + //填写控件 + JSONObject sizejsonobject = new JSONObject(); + sizejsonobject.put("signTaskId", signTaskId); + // jsonObject.put( "actorId", "参与方2"); + JSONArray sizejsonarray = new JSONArray(); + //乙方姓名 + JSONObject ldflowName = new JSONObject(); + ldflowName.put("fieldId", "2256854523"); + if (flowName != null) { + ldflowName.put("fieldValue", flowName); + } + ldflowName.put("docId", doc); + + //解除日期打印 + JSONObject ldflowTerminatedate = new JSONObject(); + ldflowTerminatedate.put("fieldId", "5592641929"); + if (flowTerminatedate != null) { + ldflowTerminatedate.put("fieldValue", flowTerminatedate); + } + ldflowTerminatedate.put("docId", doc); + + //解除或终止 + JSONObject ldflowEnd = new JSONObject(); + ldflowEnd.put("fieldId", "5408061541"); + if (flowEnd != null) { + ldflowEnd.put("fieldValue", flowEnd); + } + ldflowEnd.put("docId", doc); + + //解除日期打印 + JSONObject ldflowTerminatedate1 = new JSONObject(); + ldflowTerminatedate1.put("fieldId", "4317496512"); + if (flowTerminatedate != null) { + ldflowTerminatedate1.put("fieldValue", flowTerminatedate); + } + ldflowTerminatedate1.put("docId", doc); + + //甲方名称 + JSONObject ldflowPaname = new JSONObject(); + ldflowPaname.put("fieldId", "1185808894"); + if (flowPaname != null) { + ldflowPaname.put("fieldValue", flowPaname); + } + ldflowPaname.put("docId", doc); + + + sizejsonarray.add(ldflowName); + sizejsonarray.add(ldflowTerminatedate); + sizejsonarray.add(ldflowEnd); + sizejsonarray.add(ldflowTerminatedate1); + sizejsonarray.add(ldflowPaname); + + + sizejsonobject.put("docFieldValues", sizejsonarray); + String sizeString = sizejsonobject.toJSONString(); + + String sizekongjian = FDaDaUtil.sizekongjian(sizeString); + logger.info("劳动劳动解除写控件" + sizekongjian); + System.out.println("控件填写完成======================================="); + String signtask = FDaDaUtil.signtask(signTaskIds); + logger.info("劳动劳动解除完成" + signtask); + + AddInfo.add(signTaskId,flowName,flowPbid,flow_pbphoneno,"劳动合同解除",flowContractno, TimeUtils.timss(),signtask); + + + + + + return ""; + } + +} diff --git a/src/main/java/com/example/sso/util/DownUtil.java b/src/main/java/com/example/sso/util/DownUtil.java new file mode 100644 index 0000000..561959c --- /dev/null +++ b/src/main/java/com/example/sso/util/DownUtil.java @@ -0,0 +1,22 @@ +package com.example.sso.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; + +public class DownUtil { + + public static String urls(String id) throws Exception { + JSONObject jsonobjects = new JSONObject(); + JSONObject ownerIds = new JSONObject(); + ownerIds.put("idType", "corp"); + ownerIds.put("openId", "625776ecae6742cb8eb710beedef9b4c"); + jsonobjects.put("ownerId", ownerIds); + jsonobjects.put("signTaskId", id); + String jsonString = jsonobjects.toJSONString(); + String down = FDaDaUtil.down(jsonString); + JSONObject jsonObject = JSON.parseObject(down); + String strings = jsonObject.getJSONObject("data").getString("downloadUrl"); + return strings; + } + +} diff --git a/src/main/java/com/example/sso/util/FDaDaUtil.java b/src/main/java/com/example/sso/util/FDaDaUtil.java index c7f1a31..5f941a8 100644 --- a/src/main/java/com/example/sso/util/FDaDaUtil.java +++ b/src/main/java/com/example/sso/util/FDaDaUtil.java @@ -44,7 +44,111 @@ public class FDaDaUtil { + public static String infor( String bizContent) throws Exception { + String token = getToken(); + + // 获取当前时间的毫秒数 + long currentTimeMillis = System.currentTimeMillis(); + + // 将毫秒数转换为13位时间戳 + String timestamp = String.valueOf(currentTimeMillis); + while (timestamp.length() < 13) { + timestamp = "0" + timestamp; + } + + // 输出13位时间戳 + /* System.out.println("13位时间戳: " + timestamp);*/ + + //Nonce，先定义取值范围 + String chars = "0123456789QWERTYUIOPASDFGHJKLZXCVBNMabcdefghijklmnopqrstuvwxyz"; + StringBuffer value = new StringBuffer(); + for (int i = 0; i < 10; i++) { + value.append(chars.charAt((int) (Math.random() * 62))); + } + + /* System.out.println("随机选取的10个数为：" + value.toString());*/ + + String nonce = value.toString(); + + // appid + String appId = "00000916"; + //密钥 + String appSecret = "0WPTPAJKWRULHJ9BGBCZGWGLNZRHY5HD"; + //令牌 + String AccessToken = token; + + + //公共参数 + /*String bizContent="{\"ownerId\":{\"idType\":\"corp\",\"openId\":\"625776ecae6742cb8eb710beedef9b4c\"}}";*/ + /* System.out.println(nonce);*/ + Map paramMap = new TreeMap<>(new Comparator() { + @Override + public int compare(String str1, String str2) { + return str1.compareTo(str2); + } + }); + paramMap.put("X-FASC-App-Id", appId); + paramMap.put("X-FASC-Sign-Type", "HMAC-SHA256"); + paramMap.put("X-FASC-Timestamp", timestamp); + paramMap.put("X-FASC-Nonce", nonce); + paramMap.put("X-FASC-Api-SubVersion", "5.1"); + paramMap.put("X-FASC-AccessToken", AccessToken); + paramMap.put("bizContent", bizContent); + String str = ""; + for (String key : paramMap.keySet()) { + /* System.out.println("key: " + key + " value: " + paramMap.get(key));*/ + if (str.equals("") && str != null) { + str = str + key + "=" + paramMap.get(key); + } else { + str = str + "&" + key + "=" + paramMap.get(key); + } + + } + /* System.out.println(str);*/ + + byte[] secretSigning = hmac256(appSecret.getBytes(), timestamp); + /* System.out.println(byte2Hex(secretSigning));*/ + + String signText = getSha256Str(str); + + byte[] secretSigning2 = hmac256(secretSigning, signText); + String sign = byte2Hex(secretSigning2); + /* System.out.println(sign);*/ + + + String url = "https://api.fadada.com/api/v5/sign-task/get-detail"; + + // 设置请求头 + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/x-www-form-urlencoded"); + headers.add("X-FASC-App-Id", appId); + headers.add("X-FASC-Sign-Type", "HMAC-SHA256"); + headers.add("X-FASC-Sign", sign); + headers.add("X-FASC-Timestamp", timestamp); + headers.add("X-FASC-Nonce", nonce); + headers.add("X-FASC-AccessToken", AccessToken); + headers.add("X-FASC-Grant-Type", "client_credential"); + headers.add("X-FASC-Api-SubVersion", "5.1"); + RestTemplate restTemplate = new RestTemplate(); + + MultiValueMap forms = new LinkedMultiValueMap(); + + forms.put("bizContent", Collections.singletonList(bizContent)); + /* forms.put("X-FASC-Sign-Type", Collections.singletonList("HMAC-SHA256")); + forms.put("X-FASC-Sign", Collections.singletonList(sign)); + forms.put("X-FASC-Timestamp", Collections.singletonList(timestamp)); + forms.put("X-FASC-Nonce", Collections.singletonList(nonce)); + forms.put("X-FASC-Grant-Type", Collections.singletonList("client_credential")); + forms.put("X-FASC-Api-SubVersion", Collections.singletonList("5.1"));*/ + + HttpEntity> httpEntity = new HttpEntity>(forms, headers); + //获取返回数据 + String outcome = restTemplate.postForObject(url, httpEntity, String.class); + + + return outcome; + } public static String getToken() throws Exception { String url = "https://api.fadada.com/api/v5/service/get-access-token"; diff --git a/src/main/java/com/example/sso/util/TimeUtils.java b/src/main/java/com/example/sso/util/TimeUtils.java index 96bbd2f..c80f0f3 100644 --- a/src/main/java/com/example/sso/util/TimeUtils.java +++ b/src/main/java/com/example/sso/util/TimeUtils.java @@ -1,6 +1,8 @@ package com.example.sso.util; +import java.text.SimpleDateFormat; import java.util.Calendar; +import java.util.Date; public class TimeUtils { public static Long tim(long currentTimestamp){ @@ -47,4 +49,15 @@ public class TimeUtils { long previous24HoursTimestamp = calendar.getTimeInMillis(); return previous24HoursTimestamp; } + + public static String timss() { + // 创建SimpleDateFormat对象，指定格式为"yyyyMMddHHmmss" + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + // 获取当前时间并格式化 + String currentTime = sdf.format(new Date()); + + System.out.println("当前时间: " + currentTime); // 示例输出：20260121123456 + return currentTime; + } } diff --git a/src/main/java/com/example/sso/util/V5utils.java b/src/main/java/com/example/sso/util/V5utils.java index eae1c8e..785cdd2 100644 --- a/src/main/java/com/example/sso/util/V5utils.java +++ b/src/main/java/com/example/sso/util/V5utils.java @@ -158,6 +158,50 @@ public class V5utils { httpPost.setHeader("Authorization", "Bearer " + "BkIyzlh1onqnqu9cQ3ralDQBjECn97ex"); + StringEntity entity = new StringEntity(jsonBody, ContentType.APPLICATION_JSON); + httpPost.setEntity(entity); + + // 执行请求，获取响应对象 + CloseableHttpResponse response = httpClient.execute(httpPost); + + try { + // 从响应对象中获取响应实体 + HttpEntity responseEntity = response.getEntity(); + + // 处理响应数据 + responseBody = EntityUtils.toString(responseEntity); + System.out.println(responseBody); + } finally { + // 关闭响应对象 + response.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + try { + // 关闭 HttpClient + httpClient.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + return responseBody; + } + + + public static String get_upload_token(String jsonBody){ + CloseableHttpClient httpClient = HttpClients.createDefault(); + + // 创建 POST 请求对象 + HttpPost httpPost = new HttpPost("https://www.jiyuankeshang.com/api/v5/app/entry/file/get_upload_token"); + + String responseBody = null; + try { + // 设置请求头 + httpPost.setHeader("Content-Type", "application/json"); + httpPost.setHeader("Authorization", "Bearer " + "BkIyzlh1onqnqu9cQ3ralDQBjECn97ex"); + + StringEntity entity = new StringEntity(jsonBody, ContentType.APPLICATION_JSON); httpPost.setEntity(entity);