actionHandleMethod) {
+ }
+
+
+ /**
+ * action 提交流程业务处理方法
+ * 具体业务逻辑实现
+ * 全局存在log成员变量，用于日志的输出
+ * Util.actionFailException(requestManager,"error msg"); 用于提示action执行失败
+ *
+ *
+ * @param requestId 流程请求ID
+ * @param billTable 流程对应主表名称
+ * @param workflowId 流程对应流程ID
+ * @param user 当前节点操作者用户
+ * @param requestManager 请求管理对象
+ */
+
+ public abstract void doSubmit(String requestId, String billTable, int workflowId,
+ User user, RequestManager requestManager);
+
+
+ /**
+ * action 退回流程业务处理方法
+ * 具体业务逻辑实现
+ * 全局存在log成员变量，用于日志的输出
+ * Util.actionFailException(requestManager,"error msg"); 用于提示action执行失败
+ *
+ *
+ * @param requestId 流程请求ID
+ * @param billTable 流程对应主表名称
+ * @param workflowId 流程对应流程ID
+ * @param user 当前节点操作者用户
+ * @param requestManager 请求管理对象
+ */
+ public void doReject(String requestId, String billTable, int workflowId,
+ User user, RequestManager requestManager) {
+ }
+
+ /**
+ * action 撤回、撤回流程流程业务处理方法
+ * 具体业务逻辑实现
+ * 全局存在log成员变量，用于日志的输出
+ * Util.actionFailException(requestManager,"error msg"); 用于提示action执行失败
+ *
+ *
+ * @param requestId 流程请求ID
+ * @param billTable 流程对应主表名称
+ * @param workflowId 流程对应流程ID
+ * @param user 当前节点操作者用户
+ * @param requestManager 请求管理对象
+ */
+ public void doWithdraw(String requestId, String billTable, int workflowId,
+ User user, RequestManager requestManager) {
+ }
+
+
+ /**
+ * action 强制收回流程业务处理方法
+ * 具体业务逻辑实现
+ * 全局存在log成员变量，用于日志的输出
+ * Util.actionFailException(requestManager,"error msg"); 用于提示action执行失败
+ *
+ *
+ * @param requestId 流程请求ID
+ * @param billTable 流程对应主表名称
+ * @param workflowId 流程对应流程ID
+ * @param user 当前节点操作者用户
+ * @param requestManager 请求管理对象
+ */
+ public void doDrawBack(String requestId, String billTable, int workflowId,
+ User user, RequestManager requestManager) {
+ }
+
+
+ /**
+ * 获取流程主表数据
+ *
+ * @return 流程主表数据
+ */
+ protected Map getMainTableValue() {
+// 获取主表数据
+ Property[] propertyArr = requestInfo.getMainTableInfo().getProperty();
+ if (null == propertyArr) {
+ return null;
+ }
+ Map mainTable = new HashMap<>((int) Math.ceil(propertyArr.length * 0.75));
+ for (Property property : propertyArr) {
+ String fieldName = property.getName();
+ String value = property.getValue();
+ mainTable.put(fieldName, value);
+ }
+ return mainTable;
+ }
+
+
+ /**
+ * 获取所有明细数据
+ *
+ * @return 以明细表需要为键，以明细表数据为值的键值对明细数据信息
+ */
+ protected Map>> getDetailTableValue() {
+ DetailTable[] detailTableArr = requestInfo.getDetailTableInfo().getDetailTable();
+ Map>> detailDataList = new HashMap<>((int) Math.ceil(detailTableArr.length * 0.75));
+ for (DetailTable detailTable : detailTableArr) {
+ List> detailData = getDetailValue(detailTable);
+ detailDataList.put(detailTable.getId(), detailData);
+ }
+ return detailDataList;
+ }
+
+
+ /**
+ * 获取指定明细表的表数据
+ *
+ * @param detailNo 明细表编号
+ * @return 明细数据
+ */
+ protected List> getDetailTableValueByDetailNo(int detailNo) {
+ DetailTable detailTable = requestInfo.getDetailTableInfo().getDetailTable(detailNo);
+ List> detailData = getDetailValue(detailTable);
+ return detailData;
+ }
+
+ /**
+ * 根据明细表信息获取明细表数据
+ *
+ * @param detailTable 明细表对象
+ * @return 明细表数据
+ */
+ @NotNull
+ private List> getDetailValue(DetailTable detailTable) {
+ Row[] rowArr = detailTable.getRow();
+ List> detailData = new ArrayList<>(rowArr.length);
+ for (Row row : rowArr) {
+ Cell[] cellArr = row.getCell();
+ Map rowData = new HashMap<>((int) Math.ceil(cellArr.length * 0.75));
+ for (Cell cell : cellArr) {
+ String fieldName = cell.getName();
+ String value = cell.getValue();
+ rowData.put(fieldName, value);
+ }
+ detailData.add(rowData);
+ }
+ return detailData;
+ }
+
+
+ public static final class ActionRunType {
+ /**
+ * 退回
+ */
+ public static final String REJECT = "reject";
+ /**
+ * 撤回
+ */
+ public static final String WITHDRAW = "withdraw";
+ /**
+ * 强制收回
+ */
+ public static final String DRAW_BACK = "drawBack";
+ /**
+ * 提交
+ */
+ public static final String SUBMIT = "submit";
+ }
+
+}
diff --git a/src/main/java/aiyh/utils/action/CusBaseActionHandleFunction.java b/src/main/java/aiyh/utils/action/CusBaseActionHandleFunction.java
new file mode 100644
index 0000000..1a8b86a
--- /dev/null
+++ b/src/main/java/aiyh/utils/action/CusBaseActionHandleFunction.java
@@ -0,0 +1,26 @@
+package aiyh.utils.action;
+
+import weaver.hrm.User;
+import weaver.workflow.request.RequestManager;
+
+/**
+ * 流程类型处理方法
+ *
+ * @author EBU7-dev-1 aiyh
+ * create: 2022-07-23 18:05
+ */
+
+@FunctionalInterface
+public interface CusBaseActionHandleFunction {
+ /**
+ * 流程处理方法action
+ *
+ * @param requestId 流程请求ID
+ * @param billTable 流程对应主表名称
+ * @param workflowId 流程对应流程ID
+ * @param user 当前节点操作者用户
+ * @param requestManager 请求管理对象
+ */
+ void handle(String requestId, String billTable, int workflowId,
+ User user, RequestManager requestManager);
+}
diff --git a/src/main/java/aiyh/utils/annotation/ActionDefaultTestValue.java b/src/main/java/aiyh/utils/annotation/ActionDefaultTestValue.java
new file mode 100644
index 0000000..f026230
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/ActionDefaultTestValue.java
@@ -0,0 +1,17 @@
+package aiyh.utils.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 测试流程默认值
+ * create 2022/7/11 18:02
+ *
+ * @author ayh
+ */
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ActionDefaultTestValue {
+ String value();
+}
diff --git a/src/main/java/aiyh/utils/annotation/ActionDesc.java b/src/main/java/aiyh/utils/annotation/ActionDesc.java
new file mode 100644
index 0000000..aec80c0
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/ActionDesc.java
@@ -0,0 +1,18 @@
+package aiyh.utils.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 流程action简介
+ * create 2022/7/12 22:00
+ *
+ * @author ayh
+ */
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ActionDesc {
+ String value();
+ String author();
+}
diff --git a/src/main/java/aiyh/utils/annotation/ActionOptionalParam.java b/src/main/java/aiyh/utils/annotation/ActionOptionalParam.java
new file mode 100644
index 0000000..1215c01
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/ActionOptionalParam.java
@@ -0,0 +1,18 @@
+package aiyh.utils.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 可选配置参数
+ * create 2022/7/12 22:04
+ *
+ * @author ayh
+ */
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ActionOptionalParam {
+ String value();
+ String desc();
+}
diff --git a/src/main/java/aiyh/utils/annotation/PrintParamMark.java b/src/main/java/aiyh/utils/annotation/PrintParamMark.java
new file mode 100644
index 0000000..a3351bf
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/PrintParamMark.java
@@ -0,0 +1,15 @@
+package aiyh.utils.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * action等配置参数打印标识
+ * create 2022/7/1 15:50
+ *
+ * @author ayh
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface PrintParamMark {
+}
diff --git a/src/main/java/aiyh/utils/annotation/RequiredMark.java b/src/main/java/aiyh/utils/annotation/RequiredMark.java
new file mode 100644
index 0000000..e7f5dd9
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/RequiredMark.java
@@ -0,0 +1,17 @@
+package aiyh.utils.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 必填字段标识
+ * create 2022/6/16 09:48
+ *
+ * @author ayh
+ */
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RequiredMark {
+ String value() default "";
+}
diff --git a/src/main/java/aiyh/utils/annotation/recordset/BatchDelete.java b/src/main/java/aiyh/utils/annotation/recordset/BatchDelete.java
new file mode 100644
index 0000000..520cc48
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/recordset/BatchDelete.java
@@ -0,0 +1,20 @@
+package aiyh.utils.annotation.recordset;
+
+import java.lang.annotation.*;
+
+/**
+ * 批量插入
+ *
+ * create: 2022-08-09 17:40
+ *
+ * @author aiyh EBU7-dev-1
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface BatchDelete {
+ String value() default "";
+
+ // sql是否是在参数中
+ boolean custom() default false;
+}
diff --git a/src/main/java/aiyh/utils/annotation/recordset/BatchInsert.java b/src/main/java/aiyh/utils/annotation/recordset/BatchInsert.java
new file mode 100644
index 0000000..1378c71
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/recordset/BatchInsert.java
@@ -0,0 +1,20 @@
+package aiyh.utils.annotation.recordset;
+
+import java.lang.annotation.*;
+
+/**
+ * 批量插入
+ *
+ * create: 2022-08-09 17:40
+ *
+ * @author aiyh EBU7-dev-1
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface BatchInsert {
+ String value() default "";
+
+ // sql是否是在参数中
+ boolean custom() default false;
+}
diff --git a/src/main/java/aiyh/utils/annotation/recordset/BatchSqlArgs.java b/src/main/java/aiyh/utils/annotation/recordset/BatchSqlArgs.java
new file mode 100644
index 0000000..41e7d00
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/recordset/BatchSqlArgs.java
@@ -0,0 +1,18 @@
+package aiyh.utils.annotation.recordset;
+
+import java.lang.annotation.*;
+
+/**
+ * 批量参数标识
+ *
+ * create: 2022-08-10 10:53
+ *
+ * @author aiyh EBU7-dev-1
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+@Documented
+public @interface BatchSqlArgs {
+
+}
diff --git a/src/main/java/aiyh/utils/annotation/recordset/BatchUpdate.java b/src/main/java/aiyh/utils/annotation/recordset/BatchUpdate.java
new file mode 100644
index 0000000..e2dc2f4
--- /dev/null
+++ b/src/main/java/aiyh/utils/annotation/recordset/BatchUpdate.java
@@ -0,0 +1,20 @@
+package aiyh.utils.annotation.recordset;
+
+import java.lang.annotation.*;
+
+/**
+ * 批量插入
+ *
+ * create: 2022-08-09 17:40
+ *
+ * @author aiyh EBU7-dev-1
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface BatchUpdate {
+ String value() default "";
+
+ // sql是否是在参数中
+ boolean custom() default false;
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/factory/APIAsyncValueHandlerFactory.java b/src/main/java/aiyh/utils/apirequest/core/factory/APIAsyncValueHandlerFactory.java
new file mode 100644
index 0000000..cef2457
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/factory/APIAsyncValueHandlerFactory.java
@@ -0,0 +1,43 @@
+package aiyh.utils.apirequest.core.factory;
+
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncHeaderHandler;
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncMappingHandler;
+import aiyh.utils.apirequest.core.typehandler.apiasync.*;
+
+/**
+ * api参数取值规则工厂
+ * create 2022/3/16 3:35 PM
+ *
+ * @author ayh
+ */
+
+public class APIAsyncValueHandlerFactory {
+
+ public ApiAsyncHeaderHandler createHeaderHandle(Integer type){
+ switch (type){
+ case 0:
+ return new FixedHeaderValueAsyncRule();
+ case 1:
+ return null;
+ default:
+ return null;
+ }
+ }
+
+ public ApiAsyncMappingHandler createMappingHandle(Integer type) {
+ switch (type){
+ case 0:
+ return new FixedMappingValueAsyncRule();
+ case 1:
+ return new ApiValueMappingAsyncRule();
+ case 2:
+ return new CustomerValueMappingAsyncRule();
+ case 3:
+ return new ApiAsyncCustomerSqlValueRule();
+ case 4:
+ return new ApiAsyncDateConversionValurRule();
+ default:
+ return null;
+ }
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/factory/AbstractFactoryImpl.java b/src/main/java/aiyh/utils/apirequest/core/factory/AbstractFactoryImpl.java
index 7942b70..381db92 100644
--- a/src/main/java/aiyh/utils/apirequest/core/factory/AbstractFactoryImpl.java
+++ b/src/main/java/aiyh/utils/apirequest/core/factory/AbstractFactoryImpl.java
@@ -12,15 +12,7 @@ public class AbstractFactoryImpl implements AbstractFactory {
@Override
public T createParamHandlerFactory(Class type) {
- if (ParamTypeHandlerFactory.class.equals(type)) {
- return (T) new ParamTypeHandlerFactory();
- }
- if (ParamValueRuleHandlerFactory.class.equals(type)) {
- return (T) new ParamValueRuleHandlerFactory();
- }
- if (DataSourceHandlerFactory.class.equals(type)) {
- return (T) new DataSourceHandlerFactory();
- }
+
if(ApiAsyncFactory.class.equals(type)){
return (T) new ApiAsyncFactory();
}
diff --git a/src/main/java/aiyh/utils/apirequest/core/factory/ApiAsyncFactory.java b/src/main/java/aiyh/utils/apirequest/core/factory/ApiAsyncFactory.java
new file mode 100644
index 0000000..a0d51c0
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/factory/ApiAsyncFactory.java
@@ -0,0 +1,25 @@
+package aiyh.utils.apirequest.core.factory;
+
+import aiyh.utils.apirequest.core.typehandler.AsyncTargetTypeHandle;
+import aiyh.utils.apirequest.core.typehandler.apiasync.ModelTableAsync;
+
+/**
+ * 接口同步数据处理工厂
+ * create 2022/3/15 10:41 PM
+ *
+ * @author ayh
+ */
+
+public class ApiAsyncFactory implements TypeHandlerFactory{
+ @Override
+ public AsyncTargetTypeHandle createParamHandler(Integer type) {
+ switch (type){
+ case 0:
+ return new ModelTableAsync();
+ case 1:
+ return null;
+ default:
+ return null;
+ }
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/factory/DataSourceHandlerFactory.java b/src/main/java/aiyh/utils/apirequest/core/factory/DataSourceHandlerFactory.java
deleted file mode 100644
index 7529182..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/factory/DataSourceHandlerFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package aiyh.utils.apirequest.core.factory;
-
-import aiyh.utils.apirequest.core.typehandler.IDataSourceHandler;
-import aiyh.utils.apirequest.core.typehandler.datasource.ModelDataHandler;
-import aiyh.utils.apirequest.core.typehandler.datasource.WorkflowDataHandler;
-import aiyh.utils.apirequest.enumtype.DataSourceRuleEnum;
-
-/**
- * 解析参数处理器工厂
- * create 2022/1/25 0025 13:52
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class DataSourceHandlerFactory implements TypeHandlerFactory {
-
- @Override
- public IDataSourceHandler createParamHandler(DataSourceRuleEnum factoryEnum) {
- switch (factoryEnum){
- case WORKFLOW_DATA:
- return new WorkflowDataHandler();
- case MODEL_DATA:
- return new ModelDataHandler();
- default:
- break;
- }
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/factory/ParamTypeHandlerFactory.java b/src/main/java/aiyh/utils/apirequest/core/factory/ParamTypeHandlerFactory.java
deleted file mode 100644
index 95d48dd..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/factory/ParamTypeHandlerFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package aiyh.utils.apirequest.core.factory;
-
-import aiyh.utils.apirequest.core.typehandler.IParamTypeHandler;
-import aiyh.utils.apirequest.enumtype.ParamTypeEnum;
-
-/**
- * 参数类型处理器工厂
- * create 2022/1/23 0023 21:24
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class ParamTypeHandlerFactory implements TypeHandlerFactory {
-
-
- @Override
- public IParamTypeHandler createParamHandler(ParamTypeEnum factoryEnum) {
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/factory/ParamValueRuleHandlerFactory.java b/src/main/java/aiyh/utils/apirequest/core/factory/ParamValueRuleHandlerFactory.java
deleted file mode 100644
index 8124fc6..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/factory/ParamValueRuleHandlerFactory.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package aiyh.utils.apirequest.core.factory;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.enumtype.ParamValueRuleEnum;
-
-/**
- * 请求参数值处理器工厂
- * create 2022/1/23 0023 21:25
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class ParamValueRuleHandlerFactory implements TypeHandlerFactory {
-
-
- @Override
- public IParamValueRuleHandler createParamHandler(ParamValueRuleEnum factoryEnum) {
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/factory/TypeHandlerFactory.java b/src/main/java/aiyh/utils/apirequest/core/factory/TypeHandlerFactory.java
new file mode 100644
index 0000000..e8ff4f5
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/factory/TypeHandlerFactory.java
@@ -0,0 +1,19 @@
+package aiyh.utils.apirequest.core.factory;
+
+/**
+ * 参数处理工厂接口
+ * create 2022/1/24 0024 10:59
+ *
+ * @author EBU7-dev1-ayh
+ */
+
+
+public interface TypeHandlerFactory {
+ /**
+ * 创建参数处理对象工厂方法
+ * @param factoryEnum 工厂类型枚举
+ * @return 产生的对象
+ */
+
+ public R createParamHandler(V factoryEnum);
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncCustomerValueHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncCustomerValueHandler.java
new file mode 100644
index 0000000..5f69ec5
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncCustomerValueHandler.java
@@ -0,0 +1,15 @@
+package aiyh.utils.apirequest.core.typehandler;
+
+import java.util.Map;
+
+/**
+ * api同步自定义值处理方式
+ * create 2022/6/30 11:18
+ *
+ * @author ayh
+ */
+
+public interface ApiAsyncCustomerValueHandler {
+
+ public Object getValue(Map currentResult,Map allApiResult);
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncHeaderHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncHeaderHandler.java
new file mode 100644
index 0000000..2cb83e2
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncHeaderHandler.java
@@ -0,0 +1,19 @@
+package aiyh.utils.apirequest.core.typehandler;
+
+import aiyh.utils.apirequest.entity.ApiAsyncHeader;
+
+/**
+ * 请求头处理参数
+ * create 2022/3/16 3:50 PM
+ *
+ * @author ayh
+ */
+
+public interface ApiAsyncHeaderHandler {
+ /**
+ * 处理参数
+ * @param header 请求头信息
+ * @return 请求头值
+ */
+ public Object execute(ApiAsyncHeader header);
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncMappingHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncMappingHandler.java
new file mode 100644
index 0000000..1cf18a6
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/ApiAsyncMappingHandler.java
@@ -0,0 +1,22 @@
+package aiyh.utils.apirequest.core.typehandler;
+
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+
+import java.util.Map;
+
+/**
+ * 请求头处理参数
+ * create 2022/3/16 3:50 PM
+ *
+ * @author ayh
+ */
+
+public interface ApiAsyncMappingHandler {
+ /**
+ * 处理参数
+ * @param mapping 请求头信息
+ * @param result 请求接口返回值
+ * @return 请求头值
+ */
+ public Object execute(ApiAsyncMapping mapping, Map result,int type,Map apiResult);
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/AsyncTargetTypeHandle.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/AsyncTargetTypeHandle.java
new file mode 100644
index 0000000..3087b1d
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/AsyncTargetTypeHandle.java
@@ -0,0 +1,16 @@
+package aiyh.utils.apirequest.core.typehandler;
+
+import aiyh.utils.apirequest.entity.ApiAsyncMain;
+import aiyh.utils.apirequest.interceptor.ApiAsyncInterceptor;
+
+/**
+ * 同步到数据源处理器接口
+ * create 2022/3/15 10:43 PM
+ *
+ * @author ayh
+ */
+
+public interface AsyncTargetTypeHandle {
+
+ void async(ApiAsyncMain interceptorMain, ApiAsyncInterceptor interceptor);
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/IDataSourceHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/IDataSourceHandler.java
deleted file mode 100644
index 7fe064e..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/IDataSourceHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler;
-
-import aiyh.utils.apirequest.entity.ApiRequestData;
-import aiyh.utils.apirequest.entity.ParamConfigInfo;
-import aiyh.utils.apirequest.pojo.ApiRequestMain;
-
-/**
- * 解析参数统一接口
- * create 2022/1/26 0026 10:39
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public interface IDataSourceHandler {
-
- /**
- * 数据来源处理方法
- * @param apiRequestData 请求配置信息
- * @return 解析后
- */
- public ParamConfigInfo parseDataSource(ApiRequestData apiRequestData);
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/IParamTypeHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/IParamTypeHandler.java
deleted file mode 100644
index ba1e36b..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/IParamTypeHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler;
-
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-
-import java.util.Map;
-
-/**
- * 请求参数类型处理器接口
- * create 2022/1/22 0022 20:21
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public interface IParamTypeHandler {
- /**
- * 参数值类型的转换
- *
- * @param paramData 为转换前参数信息
- * @param paramValueRuleHandler 参数转换处理器
- * @return 转换后的参数
- */
- public Object getValue(ApiRequestParamData paramData, IParamValueRuleHandler paramValueRuleHandler, Map dataMap);
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/IParamValueRuleHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/IParamValueRuleHandler.java
deleted file mode 100644
index d8f3c13..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/IParamValueRuleHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler;
-
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-
-import java.util.Map;
-
-/**
- * 参数取值方式处理器
- * create 2022/1/22 0022 20:22
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public interface IParamValueRuleHandler {
- /**
- * 获取参数配置对应的值
- * @param paramInfo 参数信息
- * @param dataMap 流程数据或建模表数据
- * @return 参数对应 的值
- */
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap);
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiAsyncCustomerSqlValueRule.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiAsyncCustomerSqlValueRule.java
new file mode 100644
index 0000000..3233d29
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiAsyncCustomerSqlValueRule.java
@@ -0,0 +1,31 @@
+package aiyh.utils.apirequest.core.typehandler.apiasync;
+
+import aiyh.utils.Util;
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncMappingHandler;
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+import aiyh.utils.apirequest.mapper.ApiAsyncMapper;
+import aiyh.utils.excention.CustomerException;
+
+import java.util.Map;
+
+/**
+ * 自定义sql处理
+ * create 2022/6/30 11:30
+ *
+ * @author ayh
+ */
+
+public class ApiAsyncCustomerSqlValueRule implements ApiAsyncMappingHandler {
+ private final ApiAsyncMapper mapper = Util.getMapper(ApiAsyncMapper.class);
+
+ @Override
+ public Object execute(ApiAsyncMapping mapping, Map result, int type, Map apiResult) {
+ String customerValue = mapping.getCustomerValue();
+ customerValue = Util.sbc2dbcCase(customerValue);
+ if(customerValue != null && customerValue.trim().toLowerCase().startsWith("select ")){
+ return mapper.customerSqlValue(customerValue, result);
+ }else {
+ throw new CustomerException("自定义sql不符合规范，请检查自定义" + mapping.getApiField() + "字段的sql配置");
+ }
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiAsyncDateConversionValurRule.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiAsyncDateConversionValurRule.java
new file mode 100644
index 0000000..8da1bdd
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiAsyncDateConversionValurRule.java
@@ -0,0 +1,40 @@
+package aiyh.utils.apirequest.core.typehandler.apiasync;
+
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncMappingHandler;
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+import aiyh.utils.excention.CustomerException;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 日期转换处理
+ * create 2022/6/30 17:57
+ *
+ * @author ayh
+ */
+
+public class ApiAsyncDateConversionValurRule implements ApiAsyncMappingHandler {
+ @Override
+ public Object execute(ApiAsyncMapping mapping, Map result, int type, Map apiResult) {
+ String customerValue = mapping.getCustomerValue();
+ String[] split = customerValue.split(" to ");
+ if (split.length != 2) {
+ throw new CustomerException("日期自定义转换配置不符合规则！请检查配置，配置规则 「原格式 to 目标格式」 示例 yyyy/MM/dd to yyyy-MM-dd");
+ }
+ String sourceFormat = split[0];
+ String targetFormat = split[1];
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(sourceFormat);
+ Date parse = null;
+ String sourceDate = String.valueOf(result.get(mapping.getApiField()));
+ try {
+ parse = simpleDateFormat.parse(sourceDate);
+ } catch (ParseException e) {
+ throw new CustomerException("日期格式化出错，日期 "+ sourceDate + "与指定类型 "+ sourceFormat + " 不符合！",e);
+ }
+ SimpleDateFormat targetFormatObj = new SimpleDateFormat(targetFormat);
+ return targetFormatObj.format(parse);
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiValueMappingAsyncRule.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiValueMappingAsyncRule.java
new file mode 100644
index 0000000..28e98a2
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ApiValueMappingAsyncRule.java
@@ -0,0 +1,26 @@
+package aiyh.utils.apirequest.core.typehandler.apiasync;
+
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncMappingHandler;
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+
+import java.util.Map;
+
+/**
+ * 接口值处理
+ * create 2022/3/17 3:10 PM
+ *
+ * @author ayh
+ */
+
+public class ApiValueMappingAsyncRule implements ApiAsyncMappingHandler {
+ @Override
+ public Object execute(ApiAsyncMapping mapping, Map result, int type,Map apiResult) {
+ if(type == 0){
+ return result.get(mapping.getApiField());
+ }
+ if(type == 1){
+ return result.get(mapping.getApiField());
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/CustomerValueMapperBean.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/CustomerValueMapperBean.java
new file mode 100644
index 0000000..7a123b0
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/CustomerValueMapperBean.java
@@ -0,0 +1,37 @@
+package aiyh.utils.apirequest.core.typehandler.apiasync;
+
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncCustomerValueHandler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 自定义值处理bean管理工具
+ * create 2022/6/30 19:43
+ *
+ * @author ayh
+ */
+
+public class CustomerValueMapperBean {
+
+ private static final Map BEAN_MAP = new HashMap<>();
+
+ public static void setBean(ApiAsyncCustomerValueHandler bean){
+ if(bean != null){
+ String name = bean.getClass().getName();
+ BEAN_MAP.put(name,bean);
+ }
+ }
+
+ public static ApiAsyncCustomerValueHandler getBean(String className){
+ return BEAN_MAP.get(className);
+ }
+
+ public static void clearBean(){
+ BEAN_MAP.clear();
+ }
+
+ public static void clearBean(String className){
+ BEAN_MAP.remove(className);
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/CustomerValueMappingAsyncRule.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/CustomerValueMappingAsyncRule.java
new file mode 100644
index 0000000..304776f
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/CustomerValueMappingAsyncRule.java
@@ -0,0 +1,55 @@
+package aiyh.utils.apirequest.core.typehandler.apiasync;
+
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncCustomerValueHandler;
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncMappingHandler;
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+import aiyh.utils.excention.CustomerException;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
+
+/**
+ * 自定义参数处理类
+ * create 2022/6/30 11:15
+ *
+ * @author ayh
+ */
+
+public class CustomerValueMappingAsyncRule implements ApiAsyncMappingHandler {
+
+
+
+ @Override
+ public Object execute(ApiAsyncMapping mapping, Map result, int type,Map apiResult) {
+ String className = mapping.getCustomerValue();
+ ApiAsyncCustomerValueHandler bean = CustomerValueMapperBean.getBean(className);
+ if(bean != null){
+ return bean.getValue(result,apiResult);
+ }
+ Class aClass = null;
+ try {
+ aClass = Class.forName(className);
+ } catch (ClassNotFoundException e) {
+ throw new CustomerException("无法找到自定义处理类：" + className, e);
+ }
+ Constructor constructor = null;
+ try {
+ constructor = aClass.getConstructor();
+ } catch (NoSuchMethodException e) {
+ throw new CustomerException("获取" + className + " 类的构造方法出错，无法获取空参数构造方法！", e);
+ }
+ Object o = null;
+ try {
+ o = constructor.newInstance();
+ } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+ throw new CustomerException("创建自定义处理类" + className + "对象出错!", e);
+ }
+ if (o instanceof ApiAsyncCustomerValueHandler) {
+ ApiAsyncCustomerValueHandler customerValueHandler = (ApiAsyncCustomerValueHandler) o;
+ CustomerValueMapperBean.setBean(customerValueHandler);
+ return customerValueHandler.getValue(result,apiResult);
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/FixedHeaderValueAsyncRule.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/FixedHeaderValueAsyncRule.java
new file mode 100644
index 0000000..18557f1
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/FixedHeaderValueAsyncRule.java
@@ -0,0 +1,18 @@
+package aiyh.utils.apirequest.core.typehandler.apiasync;
+
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncHeaderHandler;
+import aiyh.utils.apirequest.entity.ApiAsyncHeader;
+
+/**
+ * 固定值处理
+ * create 2022/3/16 3:57 PM
+ *
+ * @author ayh
+ */
+
+public class FixedHeaderValueAsyncRule implements ApiAsyncHeaderHandler {
+ @Override
+ public Object execute(ApiAsyncHeader header) {
+ return header.getCustomerValue();
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/FixedMappingValueAsyncRule.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/FixedMappingValueAsyncRule.java
new file mode 100644
index 0000000..899b397
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/FixedMappingValueAsyncRule.java
@@ -0,0 +1,20 @@
+package aiyh.utils.apirequest.core.typehandler.apiasync;
+
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncMappingHandler;
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+
+import java.util.Map;
+
+/**
+ * 同步映射处理固定值
+ * create 2022/3/17 11:07 AM
+ *
+ * @author ayh
+ */
+
+public class FixedMappingValueAsyncRule implements ApiAsyncMappingHandler {
+ @Override
+ public Object execute(ApiAsyncMapping mapping, Map result,int type,Map apiResult) {
+ return mapping.getCustomerValue();
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ModelTableAsync.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ModelTableAsync.java
new file mode 100644
index 0000000..6713afe
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/core/typehandler/apiasync/ModelTableAsync.java
@@ -0,0 +1,99 @@
+package aiyh.utils.apirequest.core.typehandler.apiasync;
+
+import aiyh.utils.Util;
+import aiyh.utils.apirequest.core.factory.APIAsyncValueHandlerFactory;
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncHeaderHandler;
+import aiyh.utils.apirequest.core.typehandler.ApiAsyncMappingHandler;
+import aiyh.utils.apirequest.core.typehandler.AsyncTargetTypeHandle;
+import aiyh.utils.apirequest.entity.ApiAsyncHeader;
+import aiyh.utils.apirequest.entity.ApiAsyncMain;
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+import aiyh.utils.apirequest.entity.ApiResultInfo;
+import aiyh.utils.apirequest.interceptor.ApiAsyncInterceptor;
+import aiyh.utils.excention.CustomerException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 建模表数据同步
+ * create 2022/3/15 10:44 PM
+ *
+ * @author ayh
+ */
+
+public class ModelTableAsync implements AsyncTargetTypeHandle {
+
+
+ private final APIAsyncValueHandlerFactory factory = new APIAsyncValueHandlerFactory();
+
+ @Override
+ public void async(ApiAsyncMain main, ApiAsyncInterceptor interceptor) {
+ List headers = main.getHeaders();
+ List mappings = main.getMappings();
+ Map headerMap = getHeaders(headers);
+ int n = 0;
+ while (true){
+ ApiResultInfo apiResultInfo;
+ try {
+ apiResultInfo = interceptor.asyncList(main, headerMap,++n);
+ }catch (Exception e){
+ throw new CustomerException("asyncList 方法出现异常，请检查代码逻辑！", e);
+ }
+ List> resultList;
+ try {
+ resultList = apiResultInfo.getValue();
+ }catch (NullPointerException e){
+ throw new CustomerException("未获取到请求数据，请检查asyncList方法的返回值！");
+ }
+ List> mappingResult = getMapping(mappings, resultList);
+ try {
+ interceptor.handlerMappingResult(mappingResult);
+ }catch (Exception e){
+ throw new CustomerException("handlerMappingResult 方法出现异常，请检查代码逻辑！", e);
+ }
+ if(!apiResultInfo.isHasNext()){
+ return;
+ }
+ }
+ }
+
+ public Map getHeaders(List headers) {
+ Map headerMap = new HashMap<>(8);
+ for (ApiAsyncHeader header : headers) {
+ ApiAsyncHeaderHandler headerHandle = factory.createHeaderHandle(header.getValueRules());
+ String execute = String.valueOf(headerHandle.execute(header));
+ headerMap.put(header.getRequestHeard(), execute);
+ }
+ return headerMap;
+ }
+
+ public List> getMapping(List mappings, List> resultList) {
+ List treeMapping = Util.listToTree(mappings, ApiAsyncMapping::getLineNum, ApiAsyncMapping::getParentLine,
+ ApiAsyncMapping::getChildrenList, ApiAsyncMapping::setChildrenList,
+ parentLine -> parentLine == null || parentLine <= -1);
+ List> result = new ArrayList<>(resultList.size());
+ for (Map apiResult : resultList) {
+ Map parseResult = new HashMap<>(mappings.size());
+ parseMapping(treeMapping, apiResult,parseResult,apiResult);
+ result.add(parseResult);
+ }
+ return result;
+ }
+
+ private void parseMapping(List mappings, Map apiResult,Map result,Map apiAllResult) {
+ for (ApiAsyncMapping mapping : mappings) {
+ if(mapping.getChildrenList() == null || mapping.getChildrenList().size() == 0){
+// 取值规则获取
+ ApiAsyncMappingHandler mappingHandler = factory.createMappingHandle(mapping.getValueRules());
+ Object value = mappingHandler.execute(mapping,apiResult,0,apiAllResult);
+ result.put(mapping.getOaModelFieldName(),value);
+ continue;
+ }
+ Map nextChild = (Map) apiResult.get(mapping.getApiField());
+ parseMapping(mapping.getChildrenList(),nextChild,result,apiAllResult);
+ }
+ }
+}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/datasource/ModelDataHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/datasource/ModelDataHandler.java
deleted file mode 100644
index 8ee61f8..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/datasource/ModelDataHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.datasource;
-
-import aiyh.utils.apirequest.core.typehandler.IDataSourceHandler;
-import aiyh.utils.apirequest.entity.ApiRequestData;
-import aiyh.utils.apirequest.entity.ParamConfigInfo;
-import aiyh.utils.apirequest.pojo.ApiRequestMain;
-
-/**
- * 数据来源为流程的处理方法实现
- * create 2022/1/26 0026 11:00
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class ModelDataHandler implements IDataSourceHandler {
- @Override
- public ParamConfigInfo parseDataSource(ApiRequestData apiRequestData) {
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/datasource/WorkflowDataHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/datasource/WorkflowDataHandler.java
deleted file mode 100644
index 6415fe6..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/datasource/WorkflowDataHandler.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.datasource;
-
-import aiyh.utils.Util;
-import aiyh.utils.apirequest.core.factory.AbstractFactory;
-import aiyh.utils.apirequest.core.factory.AbstractFactoryImpl;
-import aiyh.utils.apirequest.core.factory.ParamTypeHandlerFactory;
-import aiyh.utils.apirequest.core.factory.ParamValueRuleHandlerFactory;
-import aiyh.utils.apirequest.core.typehandler.IDataSourceHandler;
-import aiyh.utils.apirequest.core.typehandler.IParamTypeHandler;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.*;
-import aiyh.utils.apirequest.enumtype.ParamTypeEnum;
-import aiyh.utils.apirequest.enumtype.ParamValueRuleEnum;
-import aiyh.utils.apirequest.mapper.DataSourceMapper;
-import aiyh.utils.apirequest.mapsturct.BeanMapper;
-import weaver.workflow.workflow.WorkflowVersion;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 数据来源为流程的处理方法实现
- * create 2022/1/26 0026 11:00
- *
- * @author EBU7-dev1-ayh
- */
-
-public class WorkflowDataHandler implements IDataSourceHandler {
-
- private final DataSourceMapper mapper = Util.getMapper(DataSourceMapper.class);
- private final AbstractFactory factory = new AbstractFactoryImpl();
-
- @Override
- public ParamConfigInfo parseDataSource(ApiRequestData apiRequestData) {
- String workflowId = apiRequestData.getWorkflowType();
- String workflowVersionIds = WorkflowVersion.getVersionStringByWfid(workflowId);
- String workflowTable = mapper.selectWorkflowTableById(workflowVersionIds.split(","));
- ApiBaseInfo apiBaseInfo = apiRequestData.getApiBaseInfo();
- if (apiBaseInfo == null) {
- throw new RuntimeException("The mandatory parameter is ApiBaseInfo empty");
- }
- Map mainData = mapper.selectMainData(workflowTable, apiBaseInfo.getRequestId());
- // 明细请求模式，单挑明细 当做请求参数进行一次请求
- if (apiRequestData.getParamRequestType() == 1) {
- List> lists = parseValueForDetail(apiRequestData, mainData);
- } else {
-// 默认模式
-
- }
- return null;
- }
-
-
- /**
- * 查询流程明细表数据，并通过明细表数据解析请求参数
- *
- * @param apiRequestData api请求配置参数对象
- * @param mainData 流程主表数据信息
- * @return api请求参数信息
- */
- public List> parseValueForDetail(ApiRequestData apiRequestData, Map mainData) {
- String requestDetailTableName = apiRequestData.getRequestDetailTableName();
- List> detailList = mapper.selectDetailData(requestDetailTableName, String.valueOf(mainData.get("id")));
-// 获取api请求配置明细表配置信息
- List paramDetailList = apiRequestData.getParamDetailList();
-// 树形结构转换
- paramDetailList = Util.listToTree(paramDetailList, ApiRequestParamData::getLineNum, ApiRequestParamData::getParentLine,
- ApiRequestParamData::getChildList, ApiRequestParamData::setChildList,
- parentLine -> parentLine == null || parentLine <= 0);
-// 创建参数处理对象
- ParamValueRuleHandlerFactory paramHandlerFactory = factory.createParamHandlerFactory(ParamValueRuleHandlerFactory.class);
- ParamTypeHandlerFactory paramTypeHandlerFactory = factory.createParamHandlerFactory(ParamTypeHandlerFactory.class);
- List> result = new ArrayList<>();
- Map dataMap = new HashMap<>(8);
- dataMap.put("main", mainData);
- dataMap.put("requestId", apiRequestData.getApiBaseInfo().getRequestId());
- dataMap.put("workflowId", apiRequestData.getApiBaseInfo().getWorkflowId());
- dataMap.put("user", apiRequestData.getApiBaseInfo().getUser());
- for (Map detail : detailList) {
- dataMap.put("detail", detail);
- List paramInfoList = new ArrayList<>();
- for (ApiRequestParamData paramDetail : paramDetailList) {
-// 获取值转换类型对应的枚举对象
- ParamValueRuleEnum paramValueRuleEnum = ParamValueRuleEnum.get(paramDetail.getValueRule());
- ParamTypeEnum paramTypeEnum = ParamTypeEnum.get(paramDetail.getParamType());
-// 通过工厂获取对应的参数处理对象
- IParamValueRuleHandler paramHandler = paramHandlerFactory.createParamHandler(paramValueRuleEnum);
- IParamTypeHandler paramTypeHandler = paramTypeHandlerFactory.createParamHandler(paramTypeEnum);
-// 处理参数值类型
- Object value = paramTypeHandler.getValue(paramDetail, paramHandler, dataMap);
-// 参数类型转换
- ParamInfo paramInfo = BeanMapper.INSTANCE.apiRequestData2ParamInfo(paramDetail);
-// 设置子结点
- paramInfo.setChildList(paramDetail.getParamInfoList());
- paramInfo.setParamValue(value);
- paramInfoList.add(paramInfo);
- }
- result.add(paramInfoList);
- }
- return result;
- }
-
- public List parseValueForDefault() {
- return null;
- }
-
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/BooleanTypeHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/BooleanTypeHandler.java
deleted file mode 100644
index b792b04..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/BooleanTypeHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramtype;
-
-import aiyh.utils.apirequest.core.typehandler.IParamTypeHandler;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-
-import java.util.Map;
-
-/**
- * boolean参数类型处理器
- * create 2022/1/24 0024 11:35
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class BooleanTypeHandler implements IParamTypeHandler {
-
-
- @Override
- public Object getValue(ApiRequestParamData paramData, IParamValueRuleHandler paramValueRuleHandler, Map dataMap) {
- Object value = paramValueRuleHandler.getValue(paramData, dataMap);
- return Boolean.parseBoolean(String.valueOf(value));
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/DoubleTypeHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/DoubleTypeHandler.java
deleted file mode 100644
index f4c9651..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/DoubleTypeHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramtype;
-
-import aiyh.utils.apirequest.core.typehandler.IParamTypeHandler;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-
-import java.util.Map;
-
-/**
- * 浮点数类型处理器
- * create 2022/1/24 0024 11:35
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class DoubleTypeHandler implements IParamTypeHandler {
-
-
- @Override
- public Object getValue(ApiRequestParamData paramData, IParamValueRuleHandler paramValueRuleHandler, Map dataMap) {
- Object value = paramValueRuleHandler.getValue(paramData, dataMap);
- return Double.parseDouble(String.valueOf(value));
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/ListTypeHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/ListTypeHandler.java
deleted file mode 100644
index 1e2e32d..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/ListTypeHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramtype;
-
-import aiyh.utils.Util;
-import aiyh.utils.apirequest.core.typehandler.IParamTypeHandler;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.mapper.ParamValueParseMapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 数组参数类型处理器
- * create 2022/1/24 0024 11:36
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class ListTypeHandler implements IParamTypeHandler {
-
- private ParamValueParseMapper mapper = Util.getMapper(ParamValueParseMapper.class);
-
- @Override
- public Object getValue(ApiRequestParamData paramData, IParamValueRuleHandler paramValueRuleHandler, Map dataMap) {
- return null;
- }
-
-
- public List> getDataListBySql(ApiRequestParamData paramData, Map dataMap){
- mapper.selectListByCustomerSql(paramData.getCustomerValue(),dataMap);
- return null;
- }
-
- public List> getDataListByDetail(){
-
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/LongTypeHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/LongTypeHandler.java
deleted file mode 100644
index 30cf639..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/LongTypeHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramtype;
-
-import aiyh.utils.apirequest.core.typehandler.IParamTypeHandler;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-
-import java.util.Map;
-
-/**
- * 长整型数据类型处理器
- * create 2022/1/24 0024 11:34
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class LongTypeHandler implements IParamTypeHandler {
- @Override
- public Object getValue(ApiRequestParamData paramData, IParamValueRuleHandler paramValueRuleHandler, Map dataMap) {
- Object value = paramValueRuleHandler.getValue(paramData, dataMap);
- return Long.parseLong(String.valueOf(value));
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/ObjectTypeHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/ObjectTypeHandler.java
deleted file mode 100644
index 8cd8036..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/ObjectTypeHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramtype;
-
-import aiyh.utils.apirequest.core.factory.AbstractFactory;
-import aiyh.utils.apirequest.core.factory.AbstractFactoryImpl;
-import aiyh.utils.apirequest.core.factory.ParamTypeHandlerFactory;
-import aiyh.utils.apirequest.core.factory.ParamValueRuleHandlerFactory;
-import aiyh.utils.apirequest.core.typehandler.IParamTypeHandler;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.entity.ParamInfo;
-import aiyh.utils.apirequest.enumtype.ParamTypeEnum;
-import aiyh.utils.apirequest.enumtype.ParamValueRuleEnum;
-import aiyh.utils.apirequest.mapsturct.BeanMapper;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Object参数类型处理器
- * create 2022/1/24 0024 11:34
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class ObjectTypeHandler implements IParamTypeHandler {
-
- private final AbstractFactory factory = new AbstractFactoryImpl();
- @Override
- public Object getValue(ApiRequestParamData paramData, IParamValueRuleHandler paramValueRuleHandler, Map dataMap) {
- List childList = paramData.getChildList();
- if(childList == null || childList.size() == 0){
- return new HashMap<>(2);
- }
- ParamValueRuleHandlerFactory paramHandlerFactory = factory.createParamHandlerFactory(ParamValueRuleHandlerFactory.class);
- ParamTypeHandlerFactory paramTypeHandlerFactory = factory.createParamHandlerFactory(ParamTypeHandlerFactory.class);
- List paramInfoList = new ArrayList<>();
-// 对子项进行解析和类型转换
- for (ApiRequestParamData apiRequestParamData : childList) {
-// 获取转换规则对应的枚举对象
- ParamValueRuleEnum paramValueRuleEnum = ParamValueRuleEnum.get(apiRequestParamData.getValueRule());
- ParamTypeEnum paramTypeEnum = ParamTypeEnum.get(apiRequestParamData.getParamType());
- IParamTypeHandler paramTypeHandler = paramTypeHandlerFactory.createParamHandler(paramTypeEnum);
- IParamValueRuleHandler paramHandler = paramHandlerFactory.createParamHandler(paramValueRuleEnum);
- Object value = paramTypeHandler.getValue(apiRequestParamData, paramHandler,dataMap);
- ParamInfo paramInfo = BeanMapper.INSTANCE.apiRequestData2ParamInfo(apiRequestParamData);
- paramInfo.setParamValue(value);
- paramInfoList.add(paramInfo);
- }
- paramData.setParamInfoList(paramInfoList);
- return null;
- }
-
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/StringTypeHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/StringTypeHandler.java
deleted file mode 100644
index d53df9e..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramtype/StringTypeHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramtype;
-
-import aiyh.utils.apirequest.core.typehandler.IParamTypeHandler;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-
-import java.util.Map;
-
-/**
- * 字符串类型处理器
- * create 2022/1/24 0024 11:09
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class StringTypeHandler implements IParamTypeHandler {
-
-
- @Override
- public Object getValue(ApiRequestParamData paramData, IParamValueRuleHandler paramValueRuleHandler, Map dataMap) {
- Object value = paramValueRuleHandler.getValue(paramData, dataMap);
- return String.valueOf(value);
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/CurrentDataTimeRuleHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/CurrentDataTimeRuleHandler.java
deleted file mode 100644
index 3348780..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/CurrentDataTimeRuleHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 当前日期时间处理
- * create 2022/1/27 0027 15:51
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class CurrentDataTimeRuleHandler implements IParamValueRuleHandler {
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat(paramInfo.getCustomerValue());
- return simpleDateFormat.format(new Date());
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/CustomerSqlRuleHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/CustomerSqlRuleHandler.java
deleted file mode 100644
index e29b716..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/CustomerSqlRuleHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.Util;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.enumtype.ParamTypeEnum;
-import aiyh.utils.apirequest.mapper.ParamValueParseMapper;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 自定义SQL处理器
- * create 2022/1/26 0026 16:30
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class CustomerSqlRuleHandler implements IParamValueRuleHandler {
- public static final String SELECT = "select ";
- private final ParamValueParseMapper mapper = Util.getMapper(ParamValueParseMapper.class);
-
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- String customerSql = paramInfo.getCustomerValue();
- customerSql = Util.sbc2dbcCase(customerSql);
- String pattern = "^(\\$:)(?\\w*)\\{(?[\\S\\s]+)}";
- Pattern compile = Pattern.compile(pattern);
- Matcher matcher = compile.matcher(customerSql.trim());
- if (matcher.find()) {
- String sqlStr = matcher.group("sql");
- String name = matcher.group("name");
- if (sqlStr.toLowerCase().trim().startsWith(SELECT.toLowerCase())) {
- if (Objects.isNull(name) || "".equals(name)) {
- return mapper.selectCustomerSql(sqlStr, dataMap);
- } else {
-// 起名字的SQL需要做特殊处理
- ParamTypeEnum paramTypeEnum = ParamTypeEnum.get(paramInfo.getParamType());
-// 如果参数类型是List类型，则需要查询list类型出来，并且将list数据存储在dataMap中
- if (paramTypeEnum == ParamTypeEnum.LIST_TYPE) {
- List> maps = mapper.selectListByCustomerSql(sqlStr, dataMap);
- dataMap.put(name, maps);
- return null;
- }
-// 如果是Object类型，则需要查询Map类型的数据，并将数据保存在dataMap中
- if (paramTypeEnum == ParamTypeEnum.OBJECT_TYPE) {
- Map dataResult = mapper.selectMapByCustomerSql(sqlStr, dataMap);
- dataMap.put(name, dataResult);
- return null;
- }
- }
- } else {
- throw new RuntimeException("违规SQL，自定义SQL只支持查询SQL，不支持其他SQL操作!");
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/FixedValueRuleHandle.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/FixedValueRuleHandle.java
deleted file mode 100644
index 6025ba2..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/FixedValueRuleHandle.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-
-import java.util.Map;
-
-/**
- * 固定值处理器
- * create 2022/1/23 0023 19:51
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class FixedValueRuleHandle implements IParamValueRuleHandler {
-
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- return paramInfo.getCustomerValue();
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/NullValueRuleHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/NullValueRuleHandler.java
deleted file mode 100644
index 5a0a876..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/NullValueRuleHandler.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-
-import java.util.Map;
-
-/**
- * 空值处理器
- * create 2022/1/23 0023 19:52
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class NullValueRuleHandler implements IParamValueRuleHandler {
-
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/RandomValueRuleHandle.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/RandomValueRuleHandle.java
deleted file mode 100644
index a3dee4c..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/RandomValueRuleHandle.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.Util;
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 随机值处理器
- * create 2022/1/27 0027 17:28
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class RandomValueRuleHandle implements IParamValueRuleHandler {
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- String customerValue = paramInfo.getCustomerValue();
- String pattern = "\\$\\{number:(?(\\d)+)}";
- Pattern compile = Pattern.compile(pattern);
- Matcher matcher = compile.matcher(customerValue.trim());
- if (matcher.find()) {
- int length = Integer.parseInt(matcher.group("length"));
- return Util.randomNumber(length);
- }
- pattern = "\\$\\{string:(?(\\\\d)+)}";
- compile = Pattern.compile(pattern);
- matcher = compile.matcher(customerValue.trim());
- if (matcher.find()) {
- int length = Integer.parseInt(matcher.group("length"));
- return Util.randomString(length);
- }
- pattern = "\\$\\{letter:(?(\\\\d)+)}";
- compile = Pattern.compile(pattern);
- matcher = compile.matcher(customerValue.trim());
- if (matcher.find()) {
- int length = Integer.parseInt(matcher.group("length"));
- return Util.randomLetter(length);
- }
- return Util.randomNumber(6);
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/RequestIdRuleHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/RequestIdRuleHandler.java
deleted file mode 100644
index f823dad..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/RequestIdRuleHandler.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-
-import java.util.Map;
-
-/**
- * 流程请求id值处理
- * create 2022/1/27 0027 15:53
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class RequestIdRuleHandler implements IParamValueRuleHandler {
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- return dataMap.get("requestId");
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/SqlFieldRuleHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/SqlFieldRuleHandler.java
deleted file mode 100644
index 3aede2d..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/SqlFieldRuleHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-
-import java.util.Map;
-
-/**
- * SQL字段值处理
- * create 2022/2/8 0008 11:40
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class SqlFieldRuleHandler implements IParamValueRuleHandler {
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/SystemFieldValueRuleHandle.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/SystemFieldValueRuleHandle.java
deleted file mode 100644
index 144ca67..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/SystemFieldValueRuleHandle.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-
-import java.util.Map;
-
-/**
- * 系统字段值处理
- * create 2022/1/26 0026 16:25
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class SystemFieldValueRuleHandle implements IParamValueRuleHandler {
- private String mainTableName = "workflow main table";
-
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- if (paramInfo.getFieldTableName() != null && mainTableName.equalsIgnoreCase(paramInfo.getFieldTableName())) {
- Map main = (Map) dataMap.get("main");
- return main.get(paramInfo.getSystemFieldName());
- } else {
- Map detail = (Map) dataMap.get("detail");
- return detail.get(paramInfo.getSystemFieldName());
- }
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/TimeStampRuleHandler.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/TimeStampRuleHandler.java
deleted file mode 100644
index ec55336..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/TimeStampRuleHandler.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-
-import java.util.Map;
-
-/**
- * 当前时间戳处理
- * create 2022/2/8 0008 11:38
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class TimeStampRuleHandler implements IParamValueRuleHandler {
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- return System.currentTimeMillis();
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/WorkflowIdRuleHandle.java b/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/WorkflowIdRuleHandle.java
deleted file mode 100644
index 8d44e1c..0000000
--- a/src/main/java/aiyh/utils/apirequest/core/typehandler/paramvalue/WorkflowIdRuleHandle.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package aiyh.utils.apirequest.core.typehandler.paramvalue;
-
-import aiyh.utils.apirequest.core.typehandler.IParamValueRuleHandler;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-
-import java.util.Map;
-
-/**
- * 流程类型值处理规则类
- * create 2022/1/27 0027 17:27
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class WorkflowIdRuleHandle implements IParamValueRuleHandler {
- @Override
- public Object getValue(ApiRequestParamData paramInfo, Map dataMap) {
- return dataMap.get("workflowId");
- }
-}
diff --git a/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncHeader.java b/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncHeader.java
new file mode 100644
index 0000000..0318b7e
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncHeader.java
@@ -0,0 +1,34 @@
+package aiyh.utils.apirequest.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 同步数据请求头
+ * create 2022/3/15 10:51 PM
+ *
+ * @author ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class ApiAsyncHeader {
+ /**
+ * id
+ */
+ private Integer id;
+ /**
+ * 请求头名称
+ */
+ private String requestHeard;
+ /**
+ * 自定义值
+ */
+ private String customerValue;
+ /**
+ * 取值方式
+ */
+ private Integer valueRules;
+}
diff --git a/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncMain.java b/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncMain.java
new file mode 100644
index 0000000..ea1ae2b
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncMain.java
@@ -0,0 +1,56 @@
+package aiyh.utils.apirequest.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * 数据同步主表数据
+ * create 2022/3/15 4:11 PM
+ *
+ * @author ayh
+ */
+
+@Getter
+@Setter
+@ToString
+public class ApiAsyncMain {
+ /**
+ * id
+ */
+ private Integer id;
+ /**
+ * api请求地址
+ */
+ private String apiUrl;
+ /**
+ * 同步目标到 0-建模 1-流程表
+ */
+ private Integer asyncTarget;
+ /**
+ * api详情
+ */
+ private String apiDesc;
+ /**
+ * 建模表id
+ */
+ private String modeTable;
+ /**
+ * 建模表名称
+ */
+ private String modeTableName;
+ /**
+ * 流程表表名
+ */
+ private String workflowTableName;
+ /**
+ * 请求头信息
+ */
+ private List headers;
+ /**
+ * 映射关系
+ */
+ private List mappings;
+}
diff --git a/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncMapping.java b/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncMapping.java
new file mode 100644
index 0000000..862e47a
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/entity/ApiAsyncMapping.java
@@ -0,0 +1,54 @@
+package aiyh.utils.apirequest.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * 请求同步数据映射关系
+ * create 2022/3/15 10:52 PM
+ *
+ * @author ayh
+ */
+@Getter
+@Setter
+@ToString
+public class ApiAsyncMapping{
+ /**
+ * id
+ */
+ private Integer id;
+ /**
+ * 行号
+ */
+ private Integer lineNum;
+ /**
+ * api字段
+ */
+ private String apiField;
+ /**
+ * 父级行号
+ */
+ private Integer parentLine;
+ /**
+ * 建模表字段名
+ */
+ private String oaModelFieldName;
+ /**
+ * 流程字段名
+ */
+ private String oaWorkflowFieldName;
+ /**
+ * 取值规则
+ */
+ private Integer valueRules;
+ /**
+ * 自定义值
+ */
+ private String customerValue;
+
+ private List childrenList;
+
+}
diff --git a/src/main/java/aiyh/utils/apirequest/entity/ApiResultInfo.java b/src/main/java/aiyh/utils/apirequest/entity/ApiResultInfo.java
new file mode 100644
index 0000000..8354daf
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/entity/ApiResultInfo.java
@@ -0,0 +1,30 @@
+package aiyh.utils.apirequest.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 请求结果实体类
+ * create 2022/3/17 11:34 AM
+ *
+ * @author ayh
+ */
+@Getter
+@Setter
+@ToString
+@AllArgsConstructor
+public class ApiResultInfo {
+ /**
+ * api请求接口数据
+ */
+ private List> value;
+ /**
+ * 是否还有下一次
+ */
+ private boolean hasNext;
+}
diff --git a/src/main/java/aiyh/utils/apirequest/interceptor/ApiAsyncInterceptor.java b/src/main/java/aiyh/utils/apirequest/interceptor/ApiAsyncInterceptor.java
new file mode 100644
index 0000000..f48acd9
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/interceptor/ApiAsyncInterceptor.java
@@ -0,0 +1,40 @@
+package aiyh.utils.apirequest.interceptor;
+
+import aiyh.utils.apirequest.entity.ApiAsyncMain;
+import aiyh.utils.apirequest.entity.ApiResultInfo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * api同步数据拦截器
+ * create 2022/3/15 3:50 PM
+ *
+ * @author ayh
+ */
+
+public interface ApiAsyncInterceptor {
+ /**
+ * 获取配置表数据后回调
+ *
+ * @param main 配置表数据
+ * @return 配置表数据
+ */
+ ApiAsyncMain getFilter(ApiAsyncMain main);
+
+ /**
+ * 请求方法回调
+ *
+ * @param main 主表数据
+ * @param headers 处理后的请求头
+ * @param n 请求次数
+ * @return 响应结果
+ */
+ ApiResultInfo asyncList(ApiAsyncMain main, Map headers, int n);
+
+ /**
+ * 处理映射方法
+ * @param mappingResult 处理后的映射数据
+ */
+ void handlerMappingResult(List> mappingResult);
+}
diff --git a/src/main/java/aiyh/utils/apirequest/mapper/ApiAsyncMapper.java b/src/main/java/aiyh/utils/apirequest/mapper/ApiAsyncMapper.java
new file mode 100644
index 0000000..f498219
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/mapper/ApiAsyncMapper.java
@@ -0,0 +1,55 @@
+package aiyh.utils.apirequest.mapper;
+
+import aiyh.utils.annotation.recordset.*;
+import aiyh.utils.apirequest.entity.ApiAsyncHeader;
+import aiyh.utils.apirequest.entity.ApiAsyncMain;
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * api同步工具查询数据库
+ * create 2022/3/15 3:51 PM
+ *
+ * @author ayh
+ */
+@SqlMapper
+public interface ApiAsyncMapper {
+
+ /**
+ * 查询主表信息 通过唯一值
+ * @param onlyMark 唯一值
+ * @return 主表数据
+ */
+ @Select("select " +
+ "id,api_url,async_target, " +
+ "api_desc,mode_table_name, " +
+ "workflow_table_name,mode_table " +
+ "from " +
+ "uf_api_oa_mapping " +
+ "where " +
+ "enable_status = 1 and only_mark = #{onlyMark}")
+ ApiAsyncMain selectMainByOnlyMark(@ParamMapper("onlyMark") String onlyMark);
+
+ /**
+ * 根据主表信息查询明细1数据
+ * @param id 主表ID
+ * @return 明细表数据
+ */
+ @Select("select * from uf_api_oa_mapping_dt1 where mainid = #{mainId}")
+ List selectHeardByMainId(@ParamMapper("mainId") Integer id);
+
+ /**
+ * 根据主表信息查询明细2数据
+ * @param id 主表ID
+ * @return 明细数据
+ */
+ @Select("select * from uf_api_oa_mapping_dt2 where mainid = #{mainId}")
+ List selectMapperByMainId(@ParamMapper("mainId") Integer id);
+
+
+ @Select(custom = true)
+ @CaseConversion(false)
+ String customerSqlValue(@SqlString String sql, Map param);
+}
diff --git a/src/main/java/aiyh/utils/apirequest/mapsturct/BeanMapper.java b/src/main/java/aiyh/utils/apirequest/mapsturct/BeanMapper.java
deleted file mode 100644
index 4d4ab57..0000000
--- a/src/main/java/aiyh/utils/apirequest/mapsturct/BeanMapper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package aiyh.utils.apirequest.mapsturct;
-
-import aiyh.utils.apirequest.entity.ApiRequestData;
-import aiyh.utils.apirequest.entity.ApiRequestHeardData;
-import aiyh.utils.apirequest.entity.ApiRequestParamData;
-import aiyh.utils.apirequest.entity.ParamInfo;
-import aiyh.utils.apirequest.pojo.ApiRequestHeardDetail;
-import aiyh.utils.apirequest.pojo.ApiRequestMain;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 实体类映射
- * create 2022/1/28 0028 9:34
- *
- * @author EBU7-dev1-ayh
- */
-
-/*
- 引入maven坐标
-
- 1.4.2.Final
-
-
- org.mapstruct
- mapstruct-jdk8
- ${org.mapstruct.version}
-
-
- org.mapstruct
- mapstruct
- ${org.mapstruct.version}
-
-
- */
-
-@Mapper
-public interface BeanMapper {
- static final BeanMapper INSTANCE = Mappers.getMapper(BeanMapper.class);
-
-
- /**
- * 将ApiRequestMain对象转化为APIRequestData对象
- *
- * @param requestMain 原对象
- * @return 复制转化后的对象
- */
-
- @Mapping(target = "apiBaseInfo", ignore = true)
- @Mapping(target = "paramDetailList", source = "paramDetailList")
- @Mapping(target = "heardDetailList", source = "heardDetailList")
- public ApiRequestData apiRequestMain2Data(ApiRequestMain requestMain);
-
- /**
- * 将ApiRequestParamDetail 对象转换为ApiRequestParamData对象
- *
- * @param paramDetail 原对象
- * @return 目标对象
- */
- public ApiRequestParamData apiRequestDetail2Data(ApiRequestParamDetail paramDetail);
-
- /**
- * 批量转换
- *
- * @param list 批量原对象
- * @return 目标对象集合
- */
- public List apiRequestDetailList2Data(List list);
-
- /**
- * 将ApiRequestHeardDetail对象转换为APIRequestHeardData对象
- *
- * @param heardDetail 原对象
- * @return 目标对象
- */
- public ApiRequestHeardData apiRequestHeard2Data(ApiRequestHeardDetail heardDetail);
-
- /**
- * 批量转换
- *
- * @param list 原对象集合
- * @return 目标对象集合
- */
- public List apiRequestHeardList2Data(List list);
-
-
- /**
- * apiRequestParamData 对象转为paramInfo对象
- *
- * @param paramData 原对象
- * @return 转换后的对象
- */
- @Mappings({
- @Mapping(target = "lineNum", source = "lineNum"),
- @Mapping(target = "paramName", source = "paramName"),
- @Mapping(target = "parentLine", source = "parentLine"),
- @Mapping(target = "paramValue", ignore = true),
- @Mapping(target = "childList", ignore = true)
- })
- public ParamInfo apiRequestData2ParamInfo(ApiRequestParamData paramData);
-}
diff --git a/src/main/java/aiyh/utils/apirequest/service/ApiAsyncService.java b/src/main/java/aiyh/utils/apirequest/service/ApiAsyncService.java
new file mode 100644
index 0000000..3c2c33b
--- /dev/null
+++ b/src/main/java/aiyh/utils/apirequest/service/ApiAsyncService.java
@@ -0,0 +1,60 @@
+package aiyh.utils.apirequest.service;
+
+import aiyh.utils.Util;
+import aiyh.utils.apirequest.core.factory.AbstractFactory;
+import aiyh.utils.apirequest.core.factory.AbstractFactoryImpl;
+import aiyh.utils.apirequest.core.factory.ApiAsyncFactory;
+import aiyh.utils.apirequest.core.typehandler.AsyncTargetTypeHandle;
+import aiyh.utils.apirequest.entity.ApiAsyncHeader;
+import aiyh.utils.apirequest.entity.ApiAsyncMain;
+import aiyh.utils.apirequest.entity.ApiAsyncMapping;
+import aiyh.utils.apirequest.interceptor.ApiAsyncInterceptor;
+import aiyh.utils.apirequest.mapper.ApiAsyncMapper;
+import aiyh.utils.excention.CustomerException;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * api同步数据工具
+ * create 2022/3/15 3:47 PM
+ *
+ * @author ayh
+ */
+
+public class ApiAsyncService {
+ private final ApiAsyncInterceptor apiAsyncInterceptor;
+ private final ApiAsyncMapper mapper = Util.getMapper(ApiAsyncMapper.class);
+ private final AbstractFactory factory = new AbstractFactoryImpl();
+
+ public ApiAsyncService(ApiAsyncInterceptor interceptor) {
+ this.apiAsyncInterceptor = interceptor;
+ }
+
+ public void asyncByOnlyMark(String onlyMark) {
+ ApiAsyncMain mainData = mapper.selectMainByOnlyMark(onlyMark);
+ ApiAsyncMain interceptorMain = null;
+ try {
+ List headers = mapper.selectHeardByMainId(mainData.getId());
+ List mappings = mapper.selectMapperByMainId(mainData.getId());
+ mainData.setHeaders(headers);
+ mainData.setMappings(mappings);
+
+ } catch (NullPointerException e) {
+ throw new CustomerException("未查询到相关的同步配置信息！", e);
+ }
+ final ApiAsyncMain[] main = new ApiAsyncMain[1];
+ Optional.ofNullable(apiAsyncInterceptor).map(interceptor -> {
+ main[0] = interceptor.getFilter(mainData);
+ return main[0];
+ });
+ interceptorMain = mainData;
+ if (main[0] != null) {
+ interceptorMain = main[0];
+ }
+ ApiAsyncFactory apiAsyncFactory = factory.createParamHandlerFactory(ApiAsyncFactory.class);
+ AsyncTargetTypeHandle targetTypeHandle = apiAsyncFactory.createParamHandler(interceptorMain.getAsyncTarget());
+ targetTypeHandle.async(interceptorMain, apiAsyncInterceptor);
+ }
+
+}
diff --git a/src/main/java/aiyh/utils/apirequest/service/ApiRequestService.java b/src/main/java/aiyh/utils/apirequest/service/ApiRequestService.java
deleted file mode 100644
index d03e488..0000000
--- a/src/main/java/aiyh/utils/apirequest/service/ApiRequestService.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package aiyh.utils.apirequest.service;
-
-import aiyh.utils.Util;
-import aiyh.utils.apirequest.core.factory.AbstractFactory;
-import aiyh.utils.apirequest.core.factory.AbstractFactoryImpl;
-import aiyh.utils.apirequest.core.factory.DataSourceHandlerFactory;
-import aiyh.utils.apirequest.core.typehandler.IDataSourceHandler;
-import aiyh.utils.apirequest.entity.*;
-import aiyh.utils.apirequest.enumtype.DataSourceRuleEnum;
-import aiyh.utils.apirequest.interceptor.ApiRequestInterceptor;
-import aiyh.utils.apirequest.mapper.ApiRequestMapper;
-import aiyh.utils.apirequest.mapsturct.BeanMapper;
-import aiyh.utils.apirequest.pojo.ApiRequestHeardDetail;
-import aiyh.utils.apirequest.pojo.ApiRequestMain;
-import aiyh.utils.apirequest.pojo.ApiRequestParamDetail;
-import lombok.Data;
-import lombok.Setter;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * api 请求工具具体处理 逻辑
- * create 2022/1/22 0022 20:26
- *
- * @author EBU7-dev1-ayh
- */
-
-
-@Setter
-@Data
-public class ApiRequestService {
-
- /**
- * 请求拦截器
- */
- private final ApiRequestInterceptor interceptor;
- private final AbstractFactory abstractFactory = new AbstractFactoryImpl();
- /**
- * 查询数据库数据
- */
- private final ApiRequestMapper mapper;
- private ApiBaseInfo apiBaseInfo;
-
-
- /**
- * @param interceptor 拦截器
- */
- public ApiRequestService(ApiRequestInterceptor interceptor) {
- this.mapper = Util.getMapper(ApiRequestMapper.class);
- this.interceptor = interceptor;
- }
-
- public void requestById(int id){
- ApiRequestMain apiRequestMain = getApiRequestMainById(id);
- ParamConfigInfo paramConfigInfo = parseParam(apiRequestMain);
-
- }
-
- public void requestByMark(){
-
- }
-
- /**
- * 获取数据库配置信息
- *
- * @param mark 配置唯一标识
- * @return
- */
- public ApiRequestMain getApiRequestMainByMark(String mark) {
- AtomicReference apiRequestMain = new AtomicReference<>(mapper.selectApiConfigByOnlyMark(mark));
- return getApiRequestMain(apiRequestMain);
- }
-
- /**
- * 获取配置信息
- * @param apiRequestMain 配置信息主表
- * @return
- */
- @Nullable
- private ApiRequestMain getApiRequestMain(AtomicReference apiRequestMain) {
- if (Objects.isNull(apiRequestMain.get())) {
- return null;
- }
-// 查询配置表明细信息
- List paramDetailList = mapper.selectApiParamListByMainId(apiRequestMain.get().getId());
-
- apiRequestMain.get().setParamDetailList(paramDetailList);
- List heardDetailList = mapper.selectApiHeardListByMainId(apiRequestMain.get().getId());
- apiRequestMain.get().setHeardDetailList(heardDetailList);
-// 回调拦截器
- Optional.ofNullable(interceptor).map(interceptor -> {
- Optional.ofNullable(interceptor.parseBefore(apiRequestMain.get())).map(v -> {
- apiRequestMain.set(v);
- return v;
- });
- return interceptor;
- });
- return apiRequestMain.get();
- }
-
-
- /**
- * 获取数据库配置信息
- *
- * @param id 配置id
- * @return
- */
- public ApiRequestMain getApiRequestMainById(int id) {
- AtomicReference apiRequestMain = new AtomicReference<>(mapper.selectApiConfigById(id));
- return getApiRequestMain(apiRequestMain);
- }
-
- /**
- * 解析参数值
- * ┗( ▔, ▔ )┛ Σσ(・Д・；)我我我什么都没做!!!
- * @param apiRequestMain 主表配置信息
- * @return 解析后的参数值
- */
- public ParamConfigInfo parseParam(ApiRequestMain apiRequestMain) {
-// 抽象工厂获取参数数据源处理对象
- DataSourceHandlerFactory dataSourceHandlerFactory = abstractFactory.createParamHandlerFactory(DataSourceHandlerFactory.class);
- DataSourceRuleEnum dataSourceRuleEnum = DataSourceRuleEnum.get(apiRequestMain.getDataSource());
- IDataSourceHandler paramHandler = dataSourceHandlerFactory.createParamHandler(dataSourceRuleEnum);
- ApiRequestData apiRequestData = BeanMapper.INSTANCE.apiRequestMain2Data(apiRequestMain);
- apiRequestData.setApiBaseInfo(this.apiBaseInfo);
-// 解析数据参数
- AtomicReference paramConfigInfo = new AtomicReference<>(paramHandler.parseDataSource(apiRequestData));
- Optional.ofNullable(interceptor).map(interceptor -> {
- Optional.ofNullable(interceptor.parseAfter(paramConfigInfo.get())).map(v -> {
- paramConfigInfo.set(v);
- return v;
- });
- return interceptor;
- });
- return paramConfigInfo.get();
- }
-
-
- /**
- * 解析树形参数并解析最终请求参数
- *
- * @param paramConfigInfo 解析后的请求参数值
- * @return
- */
- public ParseAfterData parseTree(ParamConfigInfo paramConfigInfo) {
- AtomicReference parseParamConfig = new AtomicReference<>(new ParamConfigInfo());
- Util.copyBeanBaseField(paramConfigInfo, parseParamConfig.get());
- List paramInfoList = paramConfigInfo.getParamInfoList();
- List treeParamList = Util.listToTree(paramInfoList,
- ParamInfo::getLineNum, ParamInfo::getParentLine,
- ParamInfo::getChildList, ParamInfo::setChildList,
- parentId -> Objects.isNull(parentId) || parentId == -1 || parentId == 0);
- parseParamConfig.get().setParamInfoList(treeParamList);
-// TODO 将树形结构组合为最终的请求参数结构
- Optional.ofNullable(interceptor).map(interceptor -> {
- Optional.ofNullable(interceptor.parseTreeAfter(parseParamConfig.get())).map(v -> {
- parseParamConfig.set(v);
- return v;
- });
- return interceptor;
- });
- return null;
- }
-
-}
-
-
-
-
-
diff --git a/src/main/java/aiyh/utils/apirequest/service/ParseParamValue.java b/src/main/java/aiyh/utils/apirequest/service/ParseParamValue.java
deleted file mode 100644
index e199595..0000000
--- a/src/main/java/aiyh/utils/apirequest/service/ParseParamValue.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package aiyh.utils.apirequest.service;
-
-import aiyh.utils.apirequest.core.factory.AbstractFactory;
-import aiyh.utils.apirequest.core.factory.AbstractFactoryImpl;
-import aiyh.utils.apirequest.core.factory.DataSourceHandlerFactory;
-import aiyh.utils.apirequest.core.typehandler.IDataSourceHandler;
-import aiyh.utils.apirequest.entity.ParamConfigInfo;
-import aiyh.utils.apirequest.enumtype.DataSourceRuleEnum;
-import aiyh.utils.apirequest.pojo.ApiRequestMain;
-
-/**
- * 解析参数值
- * create 2022/1/25 0025 10:02
- *
- * @author EBU7-dev1-ayh
- */
-
-
-public class ParseParamValue {
-
- private final AbstractFactory abstractFactory = new AbstractFactoryImpl();
-
- public ParamConfigInfo parseValue(ApiRequestMain apiRequestMain) {
- DataSourceHandlerFactory dataSourceHandlerFactory = abstractFactory.createParamHandlerFactory(DataSourceHandlerFactory.class);
- DataSourceRuleEnum dataSourceRuleEnum = DataSourceRuleEnum.get(apiRequestMain.getDataSource());
- IDataSourceHandler paramHandler = dataSourceHandlerFactory.createParamHandler(dataSourceRuleEnum);
-// return paramHandler.parseDataSource(apiRequestMain);
- return null;
- }
-}
diff --git a/src/main/java/aiyh/utils/entity/ActionTemplate.java b/src/main/java/aiyh/utils/entity/ActionTemplate.java
new file mode 100644
index 0000000..2344d4d
--- /dev/null
+++ b/src/main/java/aiyh/utils/entity/ActionTemplate.java
@@ -0,0 +1,93 @@
+package aiyh.utils.entity;
+
+/**
+ * @author aoey.oct.22
+ */
+public class ActionTemplate {
+ /**
+ * 包名
+ */
+ private String packageName;
+ /**
+ * action文件名
+ */
+ private String actionName;
+ /**
+ * action描述
+ */
+ private String actionDesc;
+ /**
+ * action作者
+ */
+ private String author;
+ /**
+ * 源码目录，以项目为相对目录
+ */
+ private String srcDirectory;
+
+ public static ActionTemplateBuilder builder() {
+ return new ActionTemplateBuilder();
+ }
+
+ private ActionTemplate() {
+
+ }
+
+ public String getPackageName() {
+ return packageName;
+ }
+
+ public String getActionName() {
+ return actionName;
+ }
+
+ public String getActionDesc() {
+ return actionDesc;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public String getSrcDirectory() {
+ return srcDirectory;
+ }
+
+ public static class ActionTemplateBuilder {
+
+ private ActionTemplate actionTemplate = new ActionTemplate();
+
+ private ActionTemplateBuilder() {
+ }
+
+ public ActionTemplateBuilder packageName(String packageName) {
+ this.actionTemplate.packageName = packageName;
+ return this;
+ }
+
+ public ActionTemplateBuilder actionName(String actionName) {
+ this.actionTemplate.actionName = actionName;
+ return this;
+ }
+
+ public ActionTemplateBuilder actionDesc(String actionDesc) {
+ this.actionTemplate.actionDesc = actionDesc;
+ return this;
+ }
+
+ public ActionTemplateBuilder author(String author) {
+ this.actionTemplate.author = author;
+ return this;
+ }
+
+ public ActionTemplateBuilder srcDirectory(String srcDirectory) {
+ this.actionTemplate.srcDirectory = srcDirectory;
+ return this;
+ }
+
+ public ActionTemplate builder() {
+ return this.actionTemplate;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/aiyh/utils/entity/DocImageInfo.java b/src/main/java/aiyh/utils/entity/DocImageInfo.java
index 68ed8f9..9834f9f 100644
--- a/src/main/java/aiyh/utils/entity/DocImageInfo.java
+++ b/src/main/java/aiyh/utils/entity/DocImageInfo.java
@@ -15,5 +15,7 @@ public class DocImageInfo {
private Integer imageFileId;
private String imageFileName;
private Integer id;
+ private Integer detailId;
+ private Integer fileSize;
}
diff --git a/src/main/java/aiyh/utils/entity/SelectValueEntity.java b/src/main/java/aiyh/utils/entity/SelectValueEntity.java
new file mode 100644
index 0000000..6411a50
--- /dev/null
+++ b/src/main/java/aiyh/utils/entity/SelectValueEntity.java
@@ -0,0 +1,20 @@
+package aiyh.utils.entity;
+
+import lombok.Data;
+
+/**
+ *
+ * create 2022/6/10 21:21
+ *
+ * @author ayh
+ */
+
+@Data
+public class SelectValueEntity {
+ private String id;
+ private String fieldname;
+ private String fieldlabel;
+ private String tablename;
+ private String selectname;
+ private Integer selectvalue;
+}
diff --git a/src/main/java/aiyh/utils/excention/monad/Try.java b/src/main/java/aiyh/utils/excention/monad/Try.java
index e26703e..ec2c0da 100644
--- a/src/main/java/aiyh/utils/excention/monad/Try.java
+++ b/src/main/java/aiyh/utils/excention/monad/Try.java
@@ -15,7 +15,7 @@ import java.util.function.Supplier;
* And also seeing that Scala deals with throwable,
* I made the decision to change it to use Throwable.
*
- * @param
+ * @param 范型
*/
public abstract class Try {
diff --git a/src/main/java/aiyh/utils/fileUtil/WritWatermark.java b/src/main/java/aiyh/utils/fileUtil/WritWatermark.java
index 26a6dfe..1d73412 100644
--- a/src/main/java/aiyh/utils/fileUtil/WritWatermark.java
+++ b/src/main/java/aiyh/utils/fileUtil/WritWatermark.java
@@ -27,798 +27,797 @@ import java.util.UUID;
public class WritWatermark {
- private static final ToolUtil toolUtil = new ToolUtil();
+ private static final ToolUtil toolUtil = new ToolUtil();
- /**
- * 根据系统中物理文件的id添加水印
- *
- * @param imageId 物理文件id
- * @param pressText 水印文字
- * @param color 水印文字颜色
- * @param fontName 水印文字字体 PLAIN（普通） BOLD（粗体） ITALIC（斜体）
- * @param fontStyle 水印文字样式
- * @param fontSize 水印文字大小
- * @param watermarkPoint 水印位置对象
- * @param degree 旋转角度
- * @param alpha 透明度 0-1
- * @param lineSpacing 行间距（倍数）
- * @return 带水印的物理图片的ID
- * @throws IOException io异常
- */
- public static int addTextWatermarkById(int imageId, String pressText, Color color, String fontName, int fontStyle
- , int fontSize, WatermarkPoint watermarkPoint, double degree, float alpha, double lineSpacing) throws IOException {
- ImageFileManager imageFileManager = new ImageFileManager();
- // 通过文件id获取输入流
- InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
- if (inputStreamById == null) {
- throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
- "Check whether the file exists in the system and ensure that the file is in the image format.");
- }
+ /**
+ * 根据系统中物理文件的id添加水印
+ *
+ * @param imageId 物理文件id
+ * @param pressText 水印文字
+ * @param color 水印文字颜色
+ * @param fontName 水印文字字体 PLAIN（普通） BOLD（粗体） ITALIC（斜体）
+ * @param fontStyle 水印文字样式
+ * @param fontSize 水印文字大小
+ * @param watermarkPoint 水印位置对象
+ * @param degree 旋转角度
+ * @param alpha 透明度 0-1
+ * @param lineSpacing 行间距（倍数）
+ * @return 带水印的物理图片的ID
+ * @throws IOException io异常
+ */
+ public static int addTextWatermarkById(int imageId, String pressText, Color color, String fontName, int fontStyle
+ , int fontSize, WatermarkPoint watermarkPoint, double degree, float alpha, double lineSpacing) throws IOException {
+ // 通过文件id获取输入流
+ InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
+ if (inputStreamById == null) {
+ throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
+ "Check whether the file exists in the system and ensure that the file is in the image format.");
+ }
// 将输入流读取为图片
- Image image = ImageIO.read(inputStreamById);
- int width = image.getWidth(null);
- int height = image.getHeight(null);
- // 创建bufferedImage
- BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- Graphics2D graphics = bufferedImage.createGraphics();
- // 设置对线段的锯齿状边缘处理
- graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
- RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- graphics.drawImage(image, 0, 0, width, height, null);
- String[] pressTexts = pressText.split("\n");
- String maxStr = "";
- int max = 0;
+ Image image = ImageIO.read(inputStreamById);
+ int width = image.getWidth(null);
+ int height = image.getHeight(null);
+ // 创建bufferedImage
+ BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ Graphics2D graphics = bufferedImage.createGraphics();
+ // 设置对线段的锯齿状边缘处理
+ graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+ RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ graphics.drawImage(image, 0, 0, width, height, null);
+ String[] pressTexts = pressText.split("\n");
+ String maxStr = "";
+ int max = 0;
// 求出最大长度值
- for (String press : pressTexts) {
- if (press.length() > max) {
- max = press.length();
- maxStr = press;
- }
- }
- String message = maxStr;
- Font defaultFont = new Font(fontName,fontStyle,fontSize);
- int wordWidth = getWordWidth(defaultFont, message);
+ for (String press : pressTexts) {
+ if (press.length() > max) {
+ max = press.length();
+ maxStr = press;
+ }
+ }
+ String message = maxStr;
+ Font defaultFont = new Font(fontName, fontStyle, fontSize);
+ int wordWidth = getWordWidth(defaultFont, message);
// 对字体进行限制
- if (wordWidth >= Math.min(width, height)) {
- fontSize = (int) (Math.min(width, height) / (pressText.length() + 6));
- }
- toolUtil.writeDebuggerLog(String.format(
- "图片宽度{%s}，图片高度{%s}，文字宽度{%s}，文字{%s}，字体大小{%s}，字体数量{%s}"
- ,width,height,wordWidth,message,fontSize,message.length()));
- double lineHeight = fontSize * lineSpacing;
- Font font = new Font(fontName, fontStyle, fontSize);
- graphics.setColor(color);
- graphics.setFont(font);
+ if (wordWidth >= Math.min(width, height)) {
+ fontSize = Math.min(width, height) / (pressText.length() + 6);
+ }
+ toolUtil.writeDebuggerLog(String.format(
+ "图片宽度{%s}，图片高度{%s}，文字宽度{%s}，文字{%s}，字体大小{%s}，字体数量{%s}"
+ , width, height, wordWidth, message, fontSize, message.length()));
+ double lineHeight = fontSize * lineSpacing;
+ Font font = new Font(fontName, fontStyle, fontSize);
+ graphics.setColor(color);
+ graphics.setFont(font);
// 设置旋转角度
- graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
+ graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
// 设置透明度
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
- int X;
- int Y;
- int fontWidth = graphics.getFontMetrics(graphics.getFont()).charsWidth(maxStr.toCharArray(), 0, max);
- int fontsHeight = (int) Math.round(lineHeight) * pressTexts.length;
- if (watermarkPoint.getLocation() == null) {
- X = watermarkPoint.getX();
- Y = watermarkPoint.getY();
- } else {
- // 水印放在中间
- if (watermarkPoint.getLocation().equals(WatermarkPointEnum.CENTER)) {
- X = (width / 2) - (fontWidth / 2);
- Y = (height / 2) - (fontsHeight / 2);
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_TOP)) {
- // 水印放在左上
- X = 10;
- Y = 10;
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_BOTTOM)) {
- // 水印放在左下
- X = 10;
- Y = height - fontsHeight - 10;
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.RIGHT_TOP)) {
- // 水印放在右上
- X = width - fontWidth - 10;
- Y = 10;
- } else {
- // 水印放在右下
- X = width - fontWidth - 10;
- Y = height - fontsHeight - 10;
- }
- }
+ int X;
+ int Y;
+ int fontWidth = graphics.getFontMetrics(graphics.getFont()).charsWidth(maxStr.toCharArray(), 0, max);
+ int fontsHeight = (int) Math.round(lineHeight) * pressTexts.length;
+ if (watermarkPoint.getLocation() == null) {
+ X = watermarkPoint.getX();
+ Y = watermarkPoint.getY();
+ } else {
+ // 水印放在中间
+ if (watermarkPoint.getLocation().equals(WatermarkPointEnum.CENTER)) {
+ X = (width / 2) - (fontWidth / 2);
+ Y = (height / 2) - (fontsHeight / 2);
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_TOP)) {
+ // 水印放在左上
+ X = 10;
+ Y = 10;
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_BOTTOM)) {
+ // 水印放在左下
+ X = 10;
+ Y = height - fontsHeight - 10;
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.RIGHT_TOP)) {
+ // 水印放在右上
+ X = width - fontWidth - 10;
+ Y = 10;
+ } else {
+ // 水印放在右下
+ X = width - fontWidth - 10;
+ Y = height - fontsHeight - 10;
+ }
+ }
- for (int i = 0; i < pressTexts.length; i++) {
+ for (int i = 0; i < pressTexts.length; i++) {
// 防止重叠，需要对Y进行特殊处理
- graphics.drawString(pressTexts[i], X, Y + ((int) Math.round(lineHeight) * (i + 1)));
- }
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
- graphics.dispose();
+ graphics.drawString(pressTexts[i], X, Y + ((int) Math.round(lineHeight) * (i + 1)));
+ }
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+ graphics.dispose();
// 获取图片后缀
- String query = "select imagefilename from imagefile where imagefileid = ?";
- RecordSet rs = new RecordSet();
- rs.executeQuery(query, imageId);
- String suffix = "jpg";
- String imageFileName = "";
- if (rs.next()) {
- imageFileName = Util.null2String(rs.getString(1));
- suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
- }
- String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
+ String query = "select imagefilename from imagefile where imagefileid = ?";
+ RecordSet rs = new RecordSet();
+ rs.executeQuery(query, imageId);
+ String suffix = "jpg";
+ String imageFileName = "";
+ if (rs.next()) {
+ imageFileName = Util.null2String(rs.getString(1));
+ suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
+ }
+ String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
// 防止高并发下文件名重复导致文件覆盖的问题
- String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
- File file = new File(tempPath);
- if (!file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
+ String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
+ File file = new File(tempPath);
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ if (!file.exists()) {
+ file.createNewFile();
+ }
// 输出到临时目录
- FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
- ImageIO.write(bufferedImage, suffix, outputStreamTem);
- outputStreamTem.close();
+ FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
+ ImageIO.write(bufferedImage, suffix, outputStreamTem);
+ outputStreamTem.close();
// 保存生成的水印图片到压缩包
- int i = imageFileManager.saveImageFileByInputStream(new FileInputStream(tempPath), imageFileName);
+ int i = aiyh.utils.Util.createFileByInputSteam(new FileInputStream(tempPath), imageFileName);
// 建议虚拟机进行一次垃圾回收，防止临时文件被其他文件流保存而无法删除临时文件
- System.gc();
+ System.gc();
// 删除临时文件， 防止文件删除失败，设置一个自旋操作，加大文件删除的几率
- boolean deleteFlag = true;
- int n = 0;
- while (deleteFlag) {
- try {
- n++;
- Files.delete(Paths.get(tempPath));
- deleteFlag = false;
- } catch (Exception e) {
+ boolean deleteFlag = true;
+ int n = 0;
+ while (deleteFlag) {
+ try {
+ n++;
+ Files.delete(Paths.get(tempPath));
+ deleteFlag = false;
+ } catch (Exception e) {
// 设置线程沉睡500毫秒，等待jvm进行垃圾回收，将持有临时文件的流对象回收，确保临时文件能删除
- try {
- Thread.sleep(500);
- } catch (InterruptedException interruptedException) {
- return i;
- }
- if (n > 5) {
- deleteFlag = false;
- }
- }
- }
- return i;
- }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException interruptedException) {
+ return i;
+ }
+ if (n > 5) {
+ deleteFlag = false;
+ }
+ }
+ }
+ return i;
+ }
- /**
- * 通过物理问文件id添加图片水印
- *
- * @param imageId 物理文件id
- * @param picId 水印图片物理文件id
- * @param watermarkPoint 水印位置对象
- * @param degree 旋转角度
- * @param alpha 透明度 0-1
- * @return 带水印的物理图片的ID
- * @throws IOException io异常
- */
- public static int addPicWatermarkById(int imageId, int picId
- , WatermarkPoint watermarkPoint, double degree, float alpha) throws IOException {
- ImageFileManager imageFileManager = new ImageFileManager();
- // 通过文件id获取输入流
- InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
- if (inputStreamById == null) {
- throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
- "Check whether the file exists in the system and ensure that the file is in the image format.");
- }
+ /**
+ * 通过物理问文件id添加图片水印
+ *
+ * @param imageId 物理文件id
+ * @param picId 水印图片物理文件id
+ * @param watermarkPoint 水印位置对象
+ * @param degree 旋转角度
+ * @param alpha 透明度 0-1
+ * @return 带水印的物理图片的ID
+ * @throws IOException io异常
+ */
+ public static int addPicWatermarkById(int imageId, int picId
+ , WatermarkPoint watermarkPoint, double degree, float alpha) throws IOException {
+ ImageFileManager imageFileManager = new ImageFileManager();
+ // 通过文件id获取输入流
+ InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
+ if (inputStreamById == null) {
+ throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
+ "Check whether the file exists in the system and ensure that the file is in the image format.");
+ }
// 将输入流读取为图片
- Image image = ImageIO.read(inputStreamById);
- int width = image.getWidth(null);
- int height = image.getHeight(null);
- // 创建bufferedImage
- BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- Graphics2D graphics = bufferedImage.createGraphics();
- // 设置对线段的锯齿状边缘处理
- graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
- RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- graphics.drawImage(image, 0, 0, width, height, null);
+ Image image = ImageIO.read(inputStreamById);
+ int width = image.getWidth(null);
+ int height = image.getHeight(null);
+ // 创建bufferedImage
+ BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ Graphics2D graphics = bufferedImage.createGraphics();
+ // 设置对线段的锯齿状边缘处理
+ graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+ RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ graphics.drawImage(image, 0, 0, width, height, null);
// 设置旋转角度
- graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
+ graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
// 设置透明度
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
// 获取水印图片
- InputStream inputStreamImgIcon = ImageFileManager.getInputStreamById(picId);
- if (inputStreamImgIcon == null) {
- throw new RuntimeException("The obtained watermark logo image is empty");
- }
- Image logoImg = ImageIO.read(inputStreamImgIcon);
- int logoWidth = logoImg.getWidth(null);
- int logoHeight = logoImg.getHeight(null);
- int X;
- int Y;
- if (watermarkPoint.getLocation() == null) {
- X = watermarkPoint.getX();
- Y = watermarkPoint.getY();
- } else {
- // 水印放在中间
- if (watermarkPoint.getLocation().equals(WatermarkPointEnum.CENTER)) {
- X = (width / 2) - (logoWidth / 2);
- Y = (height / 2) - (logoHeight / 2);
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_TOP)) {
- // 水印放在左上
- X = 10;
- Y = 10;
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_BOTTOM)) {
- // 水印放在左下
- X = 10;
- Y = height - logoHeight - 10;
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.RIGHT_TOP)) {
- // 水印放在右上
- X = width - logoWidth - 10;
- Y = 10;
- } else {
- // 水印放在右下
- X = width - logoWidth - 10;
- Y = height - logoHeight - 10;
- }
- }
- graphics.drawImage(logoImg, X, Y, null);
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
- graphics.dispose();
+ InputStream inputStreamImgIcon = ImageFileManager.getInputStreamById(picId);
+ if (inputStreamImgIcon == null) {
+ throw new RuntimeException("The obtained watermark logo image is empty");
+ }
+ Image logoImg = ImageIO.read(inputStreamImgIcon);
+ int logoWidth = logoImg.getWidth(null);
+ int logoHeight = logoImg.getHeight(null);
+ int X;
+ int Y;
+ if (watermarkPoint.getLocation() == null) {
+ X = watermarkPoint.getX();
+ Y = watermarkPoint.getY();
+ } else {
+ // 水印放在中间
+ if (watermarkPoint.getLocation().equals(WatermarkPointEnum.CENTER)) {
+ X = (width / 2) - (logoWidth / 2);
+ Y = (height / 2) - (logoHeight / 2);
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_TOP)) {
+ // 水印放在左上
+ X = 10;
+ Y = 10;
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_BOTTOM)) {
+ // 水印放在左下
+ X = 10;
+ Y = height - logoHeight - 10;
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.RIGHT_TOP)) {
+ // 水印放在右上
+ X = width - logoWidth - 10;
+ Y = 10;
+ } else {
+ // 水印放在右下
+ X = width - logoWidth - 10;
+ Y = height - logoHeight - 10;
+ }
+ }
+ graphics.drawImage(logoImg, X, Y, null);
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+ graphics.dispose();
// 获取图片后缀
- String query = "select imagefilename from imagefile where imagefileid = ?";
- RecordSet rs = new RecordSet();
- rs.executeQuery(query, imageId);
- String suffix = "jpg";
- String imageFileName = "";
- if (rs.next()) {
- imageFileName = Util.null2String(rs.getString(1));
- suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
- }
- String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
+ String query = "select imagefilename from imagefile where imagefileid = ?";
+ RecordSet rs = new RecordSet();
+ rs.executeQuery(query, imageId);
+ String suffix = "jpg";
+ String imageFileName = "";
+ if (rs.next()) {
+ imageFileName = Util.null2String(rs.getString(1));
+ suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
+ }
+ String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
// 防止高并发下文件名重复导致文件覆盖的问题
- String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
- File file = new File(tempPath);
- if (!file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
+ String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
+ File file = new File(tempPath);
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ if (!file.exists()) {
+ file.createNewFile();
+ }
// 输出到临时目录
- FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
- ImageIO.write(bufferedImage, suffix, outputStreamTem);
- outputStreamTem.close();
+ FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
+ ImageIO.write(bufferedImage, suffix, outputStreamTem);
+ outputStreamTem.close();
// 保存生成的水印图片到压缩包
- int i = imageFileManager.saveImageFileByInputStream(new FileInputStream(tempPath), imageFileName);
+ int i = aiyh.utils.Util.createFileByInputSteam(new FileInputStream(tempPath), imageFileName);
// 建议虚拟机进行一次垃圾回收，防止临时文件被其他文件流保存而无法删除临时文件
- System.gc();
+ System.gc();
// 删除临时文件， 防止文件删除失败，设置一个自旋操作，加大文件删除的几率
- boolean deleteFlag = true;
- int n = 0;
- while (deleteFlag) {
- try {
- n++;
- Files.delete(Paths.get(tempPath));
- deleteFlag = false;
- } catch (Exception e) {
+ boolean deleteFlag = true;
+ int n = 0;
+ while (deleteFlag) {
+ try {
+ n++;
+ Files.delete(Paths.get(tempPath));
+ deleteFlag = false;
+ } catch (Exception e) {
// 设置线程沉睡500毫秒，等待jvm进行垃圾回收，将持有临时文件的流对象回收，确保临时文件能删除
- try {
- Thread.sleep(500);
- } catch (InterruptedException interruptedException) {
- return i;
- }
- if (n > 5) {
- deleteFlag = false;
- }
- }
- }
- return i;
- }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException interruptedException) {
+ return i;
+ }
+ if (n > 5) {
+ deleteFlag = false;
+ }
+ }
+ }
+ return i;
+ }
- /**
- * 通过物理问文件id添加图片水印
- *
- * @param imageId 水印图片物理文件id
- * @param logoInput 水印图片的输入流
- * @param watermarkPoint 水印位置对象
- * @param degree 旋转角度
- * @param alpha 透明度 0-1
- * @return 带水印的物理图片的ID
- * @throws IOException io异常
- */
- public static int addPicWatermarkById(int imageId, InputStream logoInput
- , WatermarkPoint watermarkPoint, double degree, float alpha) throws IOException {
- ImageFileManager imageFileManager = new ImageFileManager();
- // 通过文件id获取输入流
- InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
- if (inputStreamById == null) {
- throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
- "Check whether the file exists in the system and ensure that the file is in the image format.");
- }
+ /**
+ * 通过物理问文件id添加图片水印
+ *
+ * @param imageId 水印图片物理文件id
+ * @param logoInput 水印图片的输入流
+ * @param watermarkPoint 水印位置对象
+ * @param degree 旋转角度
+ * @param alpha 透明度 0-1
+ * @return 带水印的物理图片的ID
+ * @throws IOException io异常
+ */
+ public static int addPicWatermarkById(int imageId, InputStream logoInput
+ , WatermarkPoint watermarkPoint, double degree, float alpha) throws IOException {
+ ImageFileManager imageFileManager = new ImageFileManager();
+ // 通过文件id获取输入流
+ InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
+ if (inputStreamById == null) {
+ throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
+ "Check whether the file exists in the system and ensure that the file is in the image format.");
+ }
// 将输入流读取为图片
- Image image = ImageIO.read(inputStreamById);
- int width = image.getWidth(null);
- int height = image.getHeight(null);
- // 创建bufferedImage
- BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- Graphics2D graphics = bufferedImage.createGraphics();
- // 设置对线段的锯齿状边缘处理
- graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
- RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- graphics.drawImage(image, 0, 0, width, height, null);
+ Image image = ImageIO.read(inputStreamById);
+ int width = image.getWidth(null);
+ int height = image.getHeight(null);
+ // 创建bufferedImage
+ BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ Graphics2D graphics = bufferedImage.createGraphics();
+ // 设置对线段的锯齿状边缘处理
+ graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+ RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ graphics.drawImage(image, 0, 0, width, height, null);
// 设置旋转角度
- graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
+ graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
// 设置透明度
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
- if (logoInput == null) {
- throw new RuntimeException("The obtained watermark logo image is empty");
- }
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+ if (logoInput == null) {
+ throw new RuntimeException("The obtained watermark logo image is empty");
+ }
// 获取水印图片
- ImageIcon logoImgIcon = new ImageIcon(ImageIO.read(logoInput));
- Image logoImg = logoImgIcon.getImage();
- int logoWidth = logoImg.getWidth(null);
- int logoHeight = logoImg.getHeight(null);
- int X;
- int Y;
- if (watermarkPoint.getLocation() == null) {
- X = watermarkPoint.getX();
- Y = watermarkPoint.getY();
- } else {
- // 水印放在中间
- if (watermarkPoint.getLocation().equals(WatermarkPointEnum.CENTER)) {
- X = (width / 2) - (logoWidth / 2);
- Y = (height / 2) - (logoHeight / 2);
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_TOP)) {
- // 水印放在左上
- X = 10;
- Y = 10;
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_BOTTOM)) {
- // 水印放在左下
- X = 10;
- Y = height - logoHeight - 10;
- } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.RIGHT_TOP)) {
- // 水印放在右上
- X = width - logoWidth - 10;
- Y = 10;
- } else {
- // 水印放在右下
- X = width - logoWidth - 10;
- Y = height - logoHeight - 10;
- }
- }
- graphics.drawImage(logoImg, X, Y, null);
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
- graphics.dispose();
+ ImageIcon logoImgIcon = new ImageIcon(ImageIO.read(logoInput));
+ Image logoImg = logoImgIcon.getImage();
+ int logoWidth = logoImg.getWidth(null);
+ int logoHeight = logoImg.getHeight(null);
+ int X;
+ int Y;
+ if (watermarkPoint.getLocation() == null) {
+ X = watermarkPoint.getX();
+ Y = watermarkPoint.getY();
+ } else {
+ // 水印放在中间
+ if (watermarkPoint.getLocation().equals(WatermarkPointEnum.CENTER)) {
+ X = (width / 2) - (logoWidth / 2);
+ Y = (height / 2) - (logoHeight / 2);
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_TOP)) {
+ // 水印放在左上
+ X = 10;
+ Y = 10;
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.LEFT_BOTTOM)) {
+ // 水印放在左下
+ X = 10;
+ Y = height - logoHeight - 10;
+ } else if (watermarkPoint.getLocation().equals(WatermarkPointEnum.RIGHT_TOP)) {
+ // 水印放在右上
+ X = width - logoWidth - 10;
+ Y = 10;
+ } else {
+ // 水印放在右下
+ X = width - logoWidth - 10;
+ Y = height - logoHeight - 10;
+ }
+ }
+ graphics.drawImage(logoImg, X, Y, null);
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+ graphics.dispose();
// 获取图片后缀
- String query = "select imagefilename from imagefile where imagefileid = ?";
- RecordSet rs = new RecordSet();
- rs.executeQuery(query, imageId);
- String suffix = "jpg";
- String imageFileName = "";
- if (rs.next()) {
- imageFileName = Util.null2String(rs.getString(1));
- suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
- }
- String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
+ String query = "select imagefilename from imagefile where imagefileid = ?";
+ RecordSet rs = new RecordSet();
+ rs.executeQuery(query, imageId);
+ String suffix = "jpg";
+ String imageFileName = "";
+ if (rs.next()) {
+ imageFileName = Util.null2String(rs.getString(1));
+ suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
+ }
+ String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
// 防止高并发下文件名重复导致文件覆盖的问题
- String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
- File file = new File(tempPath);
- if (!file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
+ String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
+ File file = new File(tempPath);
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ if (!file.exists()) {
+ file.createNewFile();
+ }
// 输出到临时目录
- FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
- ImageIO.write(bufferedImage, suffix, outputStreamTem);
- outputStreamTem.close();
+ FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
+ ImageIO.write(bufferedImage, suffix, outputStreamTem);
+ outputStreamTem.close();
// 保存生成的水印图片到压缩包
- int i = imageFileManager.saveImageFileByInputStream(new FileInputStream(tempPath), imageFileName);
+ int i = aiyh.utils.Util.createFileByInputSteam(new FileInputStream(tempPath), imageFileName);
// 建议虚拟机进行一次垃圾回收，防止临时文件被其他文件流保存而无法删除临时文件
- System.gc();
+ System.gc();
// 删除临时文件， 防止文件删除失败，设置一个自旋操作，加大文件删除的几率
- boolean deleteFlag = true;
- int n = 0;
- while (deleteFlag) {
- try {
- n++;
- Files.delete(Paths.get(tempPath));
- deleteFlag = false;
- } catch (Exception e) {
+ boolean deleteFlag = true;
+ int n = 0;
+ while (deleteFlag) {
+ try {
+ n++;
+ Files.delete(Paths.get(tempPath));
+ deleteFlag = false;
+ } catch (Exception e) {
// 设置线程沉睡500毫秒，等待jvm进行垃圾回收，将持有临时文件的流对象回收，确保临时文件能删除
- try {
- Thread.sleep(500);
- } catch (InterruptedException interruptedException) {
- return i;
- }
- if (n > 5) {
- deleteFlag = false;
- }
- }
- }
- return i;
- }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException interruptedException) {
+ return i;
+ }
+ if (n > 5) {
+ deleteFlag = false;
+ }
+ }
+ }
+ return i;
+ }
- /**
- * @param imageId 物理图片id
- * @param pressText 水印文字
- * @param color 水印文字颜色
- * @param fontName 水印字体名字
- * @param fontStyle 水印字体样式
- * @param fontSize 水印字体大小
- * @param degree 水印旋转角度
- * @param alpha 水印透明度
- * @param lineSpacing 水印文字行间距（倍数）
- * @param moveX 水印X轴偏移量
- * @param moveY 水印Y轴偏移量
- * @param randomX 水印X轴随机偏移量
- * @return 带水印的物理图片id
- * @throws IOException io异常
- */
- public static int addTextTileWatermarkById(int imageId, String pressText, Color color, String fontName, int fontStyle
- , int fontSize, double degree, float alpha, double lineSpacing, int moveX, int moveY, int randomX) throws IOException {
- ImageFileManager imageFileManager = new ImageFileManager();
- // 通过文件id获取输入流
- InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
- if (inputStreamById == null) {
- throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
- "Check whether the file exists in the system and ensure that the file is in the image format.");
- }
+ /**
+ * @param imageId 物理图片id
+ * @param pressText 水印文字
+ * @param color 水印文字颜色
+ * @param fontName 水印字体名字
+ * @param fontStyle 水印字体样式
+ * @param fontSize 水印字体大小
+ * @param degree 水印旋转角度
+ * @param alpha 水印透明度
+ * @param lineSpacing 水印文字行间距（倍数）
+ * @param moveX 水印X轴偏移量
+ * @param moveY 水印Y轴偏移量
+ * @param randomX 水印X轴随机偏移量
+ * @return 带水印的物理图片id
+ * @throws IOException io异常
+ */
+ public static int addTextTileWatermarkById(int imageId, String pressText, Color color, String fontName, int fontStyle
+ , int fontSize, double degree, float alpha, double lineSpacing, int moveX, int moveY, int randomX) throws IOException {
+ ImageFileManager imageFileManager = new ImageFileManager();
+ // 通过文件id获取输入流
+ InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
+ if (inputStreamById == null) {
+ throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
+ "Check whether the file exists in the system and ensure that the file is in the image format.");
+ }
// 将输入流读取为图片
- Image image = ImageIO.read(inputStreamById);
- int width = image.getWidth(null);
- int height = image.getHeight(null);
- double lineHeight = fontSize * lineSpacing;
- // 创建bufferedImage
- BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- Graphics2D graphics = bufferedImage.createGraphics();
- // 设置对线段的锯齿状边缘处理
- graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
- RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- graphics.drawImage(image, 0, 0, width, height, null);
- Font font = new Font(fontName, fontStyle, fontSize);
- graphics.setColor(color);
- graphics.setFont(font);
+ Image image = ImageIO.read(inputStreamById);
+ int width = image.getWidth(null);
+ int height = image.getHeight(null);
+ double lineHeight = fontSize * lineSpacing;
+ // 创建bufferedImage
+ BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ Graphics2D graphics = bufferedImage.createGraphics();
+ // 设置对线段的锯齿状边缘处理
+ graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+ RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ graphics.drawImage(image, 0, 0, width, height, null);
+ Font font = new Font(fontName, fontStyle, fontSize);
+ graphics.setColor(color);
+ graphics.setFont(font);
// 设置旋转角度
- graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
+ graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
// 设置透明度
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
- String[] pressTexts = pressText.split("\n");
- String maxStr = "";
- int max = 0;
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+ String[] pressTexts = pressText.split("\n");
+ String maxStr = "";
+ int max = 0;
// 求出最大长度值
- for (String press : pressTexts) {
- if (press.length() > max) {
- max = press.length();
- maxStr = press;
- }
- }
- int X;
- int Y;
- int fontWidth = graphics.getFontMetrics(graphics.getFont()).charsWidth(maxStr.toCharArray(), 0, max);
- int fontsHeight = (int) Math.round(lineHeight) * pressTexts.length;
- int mustX = fontWidth;
- int mustY = fontsHeight;
- int start = -(width + height);
- int end = width + height;
- X = start;
- Y = start;
- int random = 0;
+ for (String press : pressTexts) {
+ if (press.length() > max) {
+ max = press.length();
+ maxStr = press;
+ }
+ }
+ int X;
+ int Y;
+ int fontWidth = graphics.getFontMetrics(graphics.getFont()).charsWidth(maxStr.toCharArray(), 0, max);
+ int fontsHeight = (int) Math.round(lineHeight) * pressTexts.length;
+ int mustX = fontWidth;
+ int mustY = fontsHeight;
+ int start = -(width + height);
+ int end = width + height;
+ X = start;
+ Y = start;
+ int random = 0;
- // 循环Y，每次偏移防止重叠的最小偏移量加上自定义的偏移量
- for (; Y <= end; Y = Y + moveY + mustY) {
- // 循环X,每次偏移防止重叠的最小偏移量加上自定义偏移量
- for (; X <= end; X = X + moveX + mustX) {
- for (int i = 0; i < pressTexts.length; i++) {
- // 防止重叠对Y做文字偏移
- graphics.drawString(pressTexts[i], X + random, Y + (int) Math.ceil(lineHeight) * (i + 1));
- }
+ // 循环Y，每次偏移防止重叠的最小偏移量加上自定义的偏移量
+ for (; Y <= end; Y = Y + moveY + mustY) {
+ // 循环X,每次偏移防止重叠的最小偏移量加上自定义偏移量
+ for (; X <= end; X = X + moveX + mustX) {
+ for (int i = 0; i < pressTexts.length; i++) {
+ // 防止重叠对Y做文字偏移
+ graphics.drawString(pressTexts[i], X + random, Y + (int) Math.ceil(lineHeight) * (i + 1));
+ }
- }
- X = start;
- if (random == 0) {
- random = -randomX;
- } else {
- random = 0;
- }
- }
+ }
+ X = start;
+ if (random == 0) {
+ random = -randomX;
+ } else {
+ random = 0;
+ }
+ }
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
- graphics.dispose();
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+ graphics.dispose();
// 获取图片后缀
- String query = "select imagefilename from imagefile where imagefileid = ?";
- RecordSet rs = new RecordSet();
- rs.executeQuery(query, imageId);
- String suffix = "jpg";
- String imageFileName = "";
- if (rs.next()) {
- imageFileName = Util.null2String(rs.getString(1));
- suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
- }
- String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
+ String query = "select imagefilename from imagefile where imagefileid = ?";
+ RecordSet rs = new RecordSet();
+ rs.executeQuery(query, imageId);
+ String suffix = "jpg";
+ String imageFileName = "";
+ if (rs.next()) {
+ imageFileName = Util.null2String(rs.getString(1));
+ suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
+ }
+ String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
// 防止高并发下文件名重复导致文件覆盖的问题
- String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
- File file = new File(tempPath);
- if (!file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
+ String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
+ File file = new File(tempPath);
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ if (!file.exists()) {
+ file.createNewFile();
+ }
// 输出到临时目录
- FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
- ImageIO.write(bufferedImage, suffix, outputStreamTem);
- outputStreamTem.close();
+ FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
+ ImageIO.write(bufferedImage, suffix, outputStreamTem);
+ outputStreamTem.close();
// 保存生成的水印图片到压缩包
- int i = imageFileManager.saveImageFileByInputStream(new FileInputStream(tempPath), imageFileName);
+ int i = aiyh.utils.Util.createFileByInputSteam(new FileInputStream(tempPath), imageFileName);
// 建议虚拟机进行一次垃圾回收，防止临时文件被其他文件流保存而无法删除临时文件
- System.gc();
+ System.gc();
// 删除临时文件， 防止文件删除失败，设置一个自旋操作，加大文件删除的几率
- boolean deleteFlag = true;
- int n = 0;
- while (deleteFlag) {
- try {
- n++;
- Files.delete(Paths.get(tempPath));
- deleteFlag = false;
- } catch (Exception e) {
+ boolean deleteFlag = true;
+ int n = 0;
+ while (deleteFlag) {
+ try {
+ n++;
+ Files.delete(Paths.get(tempPath));
+ deleteFlag = false;
+ } catch (Exception e) {
// 设置线程沉睡500毫秒，等待jvm进行垃圾回收，将持有临时文件的流对象回收，确保临时文件能删除
- try {
- Thread.sleep(500);
- } catch (InterruptedException interruptedException) {
- return i;
- }
- if (n > 5) {
- deleteFlag = false;
- }
- }
- }
- return i;
- }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException interruptedException) {
+ return i;
+ }
+ if (n > 5) {
+ deleteFlag = false;
+ }
+ }
+ }
+ return i;
+ }
- /**
- * @param imageId 物理图片id
- * @param picId 水印物理文件id
- * @param degree 水印旋转角度
- * @param alpha 水印透明度
- * @param moveX 水印X轴偏移量
- * @param moveY 水印Y轴偏移量
- * @param randomX 水印X轴随机偏移量
- * @return 带水印的物理图片id
- * @throws IOException io异常
- */
- public static int addPicTileWatermarkById(int imageId, int picId
- , double degree, float alpha, int moveX, int moveY, int randomX) throws IOException {
- ImageFileManager imageFileManager = new ImageFileManager();
- // 通过文件id获取输入流
- InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
- if (inputStreamById == null) {
- throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
- "Check whether the file exists in the system and ensure that the file is in the image format.");
- }
+ /**
+ * @param imageId 物理图片id
+ * @param picId 水印物理文件id
+ * @param degree 水印旋转角度
+ * @param alpha 水印透明度
+ * @param moveX 水印X轴偏移量
+ * @param moveY 水印Y轴偏移量
+ * @param randomX 水印X轴随机偏移量
+ * @return 带水印的物理图片id
+ * @throws IOException io异常
+ */
+ public static int addPicTileWatermarkById(int imageId, int picId
+ , double degree, float alpha, int moveX, int moveY, int randomX) throws IOException {
+ ImageFileManager imageFileManager = new ImageFileManager();
+ // 通过文件id获取输入流
+ InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
+ if (inputStreamById == null) {
+ throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
+ "Check whether the file exists in the system and ensure that the file is in the image format.");
+ }
// 将输入流读取为图片
- Image image = ImageIO.read(inputStreamById);
- int width = image.getWidth(null);
- int height = image.getHeight(null);
- // 创建bufferedImage
- BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- Graphics2D graphics = bufferedImage.createGraphics();
- // 设置对线段的锯齿状边缘处理
- graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
- RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- graphics.drawImage(image, 0, 0, width, height, null);
+ Image image = ImageIO.read(inputStreamById);
+ int width = image.getWidth(null);
+ int height = image.getHeight(null);
+ // 创建bufferedImage
+ BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ Graphics2D graphics = bufferedImage.createGraphics();
+ // 设置对线段的锯齿状边缘处理
+ graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+ RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ graphics.drawImage(image, 0, 0, width, height, null);
// 设置旋转角度
- graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
+ graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
// 设置透明度
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
// 获取水印图片
- InputStream inputStreamImgIcon = ImageFileManager.getInputStreamById(picId);
- if (inputStreamImgIcon == null) {
- throw new RuntimeException("The obtained watermark logo image is empty");
- }
- ImageIcon logoImgIcon = new ImageIcon(ImageIO.read(inputStreamImgIcon));
- Image logoImg = logoImgIcon.getImage();
- int logoWidth = logoImg.getWidth(null);
- int logoHeight = logoImg.getHeight(null);
- int X;
- int Y;
- int mustX = logoWidth;
- int mustY = logoHeight;
- int start = -(width + height);
- int end = width + height;
- X = start;
- Y = start;
- int random = 0;
+ InputStream inputStreamImgIcon = ImageFileManager.getInputStreamById(picId);
+ if (inputStreamImgIcon == null) {
+ throw new RuntimeException("The obtained watermark logo image is empty");
+ }
+ ImageIcon logoImgIcon = new ImageIcon(ImageIO.read(inputStreamImgIcon));
+ Image logoImg = logoImgIcon.getImage();
+ int logoWidth = logoImg.getWidth(null);
+ int logoHeight = logoImg.getHeight(null);
+ int X;
+ int Y;
+ int mustX = logoWidth;
+ int mustY = logoHeight;
+ int start = -(width + height);
+ int end = width + height;
+ X = start;
+ Y = start;
+ int random = 0;
- // 循环Y，每次偏移防止重叠的最小偏移量加上自定义的偏移量
- for (; Y <= end; Y = Y + moveY + mustY) {
- // 循环X,每次偏移防止重叠的最小偏移量加上自定义偏移量
- for (; X <= end; X = X + moveX + mustX) {
- graphics.drawImage(logoImg, X + random, Y, null);
- }
- X = start;
- if (random == 0) {
- random = -randomX;
- } else {
- random = 0;
- }
- }
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
- graphics.dispose();
+ // 循环Y，每次偏移防止重叠的最小偏移量加上自定义的偏移量
+ for (; Y <= end; Y = Y + moveY + mustY) {
+ // 循环X,每次偏移防止重叠的最小偏移量加上自定义偏移量
+ for (; X <= end; X = X + moveX + mustX) {
+ graphics.drawImage(logoImg, X + random, Y, null);
+ }
+ X = start;
+ if (random == 0) {
+ random = -randomX;
+ } else {
+ random = 0;
+ }
+ }
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+ graphics.dispose();
// 获取图片后缀
- String query = "select imagefilename from imagefile where imagefileid = ?";
- RecordSet rs = new RecordSet();
- rs.executeQuery(query, imageId);
- String suffix = "jpg";
- String imageFileName = "";
- if (rs.next()) {
- imageFileName = Util.null2String(rs.getString(1));
- suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
- }
- String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
+ String query = "select imagefilename from imagefile where imagefileid = ?";
+ RecordSet rs = new RecordSet();
+ rs.executeQuery(query, imageId);
+ String suffix = "jpg";
+ String imageFileName = "";
+ if (rs.next()) {
+ imageFileName = Util.null2String(rs.getString(1));
+ suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
+ }
+ String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
// 防止高并发下文件名重复导致文件覆盖的问题
- String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
- File file = new File(tempPath);
- if (!file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
+ String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
+ File file = new File(tempPath);
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ if (!file.exists()) {
+ file.createNewFile();
+ }
// 输出到临时目录
- FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
- ImageIO.write(bufferedImage, suffix, outputStreamTem);
- outputStreamTem.close();
+ FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
+ ImageIO.write(bufferedImage, suffix, outputStreamTem);
+ outputStreamTem.close();
// 保存生成的水印图片到压缩包
- int i = imageFileManager.saveImageFileByInputStream(new FileInputStream(tempPath), imageFileName);
+ int i = aiyh.utils.Util.createFileByInputSteam(new FileInputStream(tempPath), imageFileName);
// 建议虚拟机进行一次垃圾回收，防止临时文件被其他文件流保存而无法删除临时文件
- System.gc();
+ System.gc();
// 删除临时文件， 防止文件删除失败，设置一个自旋操作，加大文件删除的几率
- boolean deleteFlag = true;
- int n = 0;
- while (deleteFlag) {
- try {
- n++;
- Files.delete(Paths.get(tempPath));
- deleteFlag = false;
- } catch (Exception e) {
+ boolean deleteFlag = true;
+ int n = 0;
+ while (deleteFlag) {
+ try {
+ n++;
+ Files.delete(Paths.get(tempPath));
+ deleteFlag = false;
+ } catch (Exception e) {
// 设置线程沉睡500毫秒，等待jvm进行垃圾回收，将持有临时文件的流对象回收，确保临时文件能删除
- try {
- Thread.sleep(500);
- } catch (InterruptedException interruptedException) {
- return i;
- }
- if (n > 5) {
- deleteFlag = false;
- }
- }
- }
- return i;
- }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException interruptedException) {
+ return i;
+ }
+ if (n > 5) {
+ deleteFlag = false;
+ }
+ }
+ }
+ return i;
+ }
- /**
- * @param imageId 物理图片id
- * @param logoInput 水印图片输入流
- * @param degree 水印旋转角度
- * @param alpha 水印透明度
- * @param moveX 水印X轴偏移位置
- * @param moveY 水印Y轴偏移位置
- * @param randomX 水印X轴随机偏移量
- * @return 带水印的物理图片id
- * @throws IOException io异常
- */
- public static int addPicTileWatermarkById(int imageId, InputStream logoInput
- , double degree, float alpha, int moveX, int moveY, int randomX) throws IOException {
- ImageFileManager imageFileManager = new ImageFileManager();
- // 通过文件id获取输入流
- InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
- if (inputStreamById == null) {
- throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
- "Check whether the file exists in the system and ensure that the file is in the image format.");
- }
+ /**
+ * @param imageId 物理图片id
+ * @param logoInput 水印图片输入流
+ * @param degree 水印旋转角度
+ * @param alpha 水印透明度
+ * @param moveX 水印X轴偏移位置
+ * @param moveY 水印Y轴偏移位置
+ * @param randomX 水印X轴随机偏移量
+ * @return 带水印的物理图片id
+ * @throws IOException io异常
+ */
+ public static int addPicTileWatermarkById(int imageId, InputStream logoInput
+ , double degree, float alpha, int moveX, int moveY, int randomX) throws IOException {
+ ImageFileManager imageFileManager = new ImageFileManager();
+ // 通过文件id获取输入流
+ InputStream inputStreamById = ImageFileManager.getInputStreamById(imageId);
+ if (inputStreamById == null) {
+ throw new RuntimeException("Failed to obtain the image to which a watermark is to be added. " +
+ "Check whether the file exists in the system and ensure that the file is in the image format.");
+ }
// 将输入流读取为图片
- Image image = ImageIO.read(inputStreamById);
- int width = image.getWidth(null);
- int height = image.getHeight(null);
- // 创建bufferedImage
- BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- Graphics2D graphics = bufferedImage.createGraphics();
- // 设置对线段的锯齿状边缘处理
- graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
- RenderingHints.VALUE_INTERPOLATION_BILINEAR);
- graphics.drawImage(image, 0, 0, width, height, null);
+ Image image = ImageIO.read(inputStreamById);
+ int width = image.getWidth(null);
+ int height = image.getHeight(null);
+ // 创建bufferedImage
+ BufferedImage bufferedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ Graphics2D graphics = bufferedImage.createGraphics();
+ // 设置对线段的锯齿状边缘处理
+ graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+ RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+ graphics.drawImage(image, 0, 0, width, height, null);
// 设置旋转角度
- graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
+ graphics.rotate(Math.toRadians(degree), (double) width / 2, (double) height / 2);
// 设置透明度
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
- if (logoInput == null) {
- throw new RuntimeException("The obtained watermark logo image is empty");
- }
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_ATOP, alpha));
+ if (logoInput == null) {
+ throw new RuntimeException("The obtained watermark logo image is empty");
+ }
// 获取水印图片
- ImageIcon logoImgIcon = new ImageIcon(ImageIO.read(logoInput));
- Image logoImg = logoImgIcon.getImage();
- int logoWidth = logoImg.getWidth(null);
- int logoHeight = logoImg.getHeight(null);
- int X;
- int Y;
- int mustX = logoWidth;
- int mustY = logoHeight;
- int start = -(width + height);
- int end = width + height;
- X = start;
- Y = start;
- int random = 0;
+ ImageIcon logoImgIcon = new ImageIcon(ImageIO.read(logoInput));
+ Image logoImg = logoImgIcon.getImage();
+ int logoWidth = logoImg.getWidth(null);
+ int logoHeight = logoImg.getHeight(null);
+ int X;
+ int Y;
+ int mustX = logoWidth;
+ int mustY = logoHeight;
+ int start = -(width + height);
+ int end = width + height;
+ X = start;
+ Y = start;
+ int random = 0;
- // 循环Y，每次偏移防止重叠的最小偏移量加上自定义的偏移量
- for (; Y <= end; Y = Y + moveY + mustY) {
- // 循环X,每次偏移防止重叠的最小偏移量加上自定义偏移量
- for (; X <= end; X = X + moveX + mustX) {
- graphics.drawImage(logoImg, X + random, Y, null);
- }
- X = start;
- if (random == 0) {
- random = -randomX;
- } else {
- random = 0;
- }
- }
- graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
- graphics.dispose();
+ // 循环Y，每次偏移防止重叠的最小偏移量加上自定义的偏移量
+ for (; Y <= end; Y = Y + moveY + mustY) {
+ // 循环X,每次偏移防止重叠的最小偏移量加上自定义偏移量
+ for (; X <= end; X = X + moveX + mustX) {
+ graphics.drawImage(logoImg, X + random, Y, null);
+ }
+ X = start;
+ if (random == 0) {
+ random = -randomX;
+ } else {
+ random = 0;
+ }
+ }
+ graphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
+ graphics.dispose();
// 获取图片后缀
- String query = "select imagefilename from imagefile where imagefileid = ?";
- RecordSet rs = new RecordSet();
- rs.executeQuery(query, imageId);
- String suffix = "jpg";
- String imageFileName = "";
- if (rs.next()) {
- imageFileName = Util.null2String(rs.getString(1));
- suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
- }
- String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
+ String query = "select imagefilename from imagefile where imagefileid = ?";
+ RecordSet rs = new RecordSet();
+ rs.executeQuery(query, imageId);
+ String suffix = "jpg";
+ String imageFileName = "";
+ if (rs.next()) {
+ imageFileName = Util.null2String(rs.getString(1));
+ suffix = imageFileName.substring(imageFileName.lastIndexOf(".") + 1);
+ }
+ String createDir = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
// 防止高并发下文件名重复导致文件覆盖的问题
- String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
- File file = new File(tempPath);
- if (!file.getParentFile().exists()) {
- file.getParentFile().mkdirs();
- }
- if (!file.exists()) {
- file.createNewFile();
- }
+ String tempPath = createDir + imageFileName + System.currentTimeMillis() + UUID.randomUUID() + "." + suffix;
+ File file = new File(tempPath);
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+ if (!file.exists()) {
+ file.createNewFile();
+ }
// 输出到临时目录
- FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
- ImageIO.write(bufferedImage, suffix, outputStreamTem);
- outputStreamTem.close();
+ FileOutputStream outputStreamTem = new FileOutputStream(URLDecoder.decode(tempPath, "utf-8"));
+ ImageIO.write(bufferedImage, suffix, outputStreamTem);
+ outputStreamTem.close();
// 保存生成的水印图片到压缩包
- int i = imageFileManager.saveImageFileByInputStream(new FileInputStream(tempPath), imageFileName);
+ int i = aiyh.utils.Util.createFileByInputSteam(new FileInputStream(tempPath), imageFileName);
// 建议虚拟机进行一次垃圾回收，防止临时文件被其他文件流保存而无法删除临时文件
- System.gc();
+ System.gc();
// 删除临时文件， 防止文件删除失败，设置一个自旋操作，加大文件删除的几率
- boolean deleteFlag = true;
- int n = 0;
- while (deleteFlag) {
- try {
- n++;
- Files.delete(Paths.get(tempPath));
- deleteFlag = false;
- } catch (Exception e) {
+ boolean deleteFlag = true;
+ int n = 0;
+ while (deleteFlag) {
+ try {
+ n++;
+ Files.delete(Paths.get(tempPath));
+ deleteFlag = false;
+ } catch (Exception e) {
// 设置线程沉睡500毫秒，等待jvm进行垃圾回收，将持有临时文件的流对象回收，确保临时文件能删除
- try {
- Thread.sleep(500);
- } catch (InterruptedException interruptedException) {
- return i;
- }
- if (n > 5) {
- deleteFlag = false;
- }
- }
- }
- return i;
- }
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException interruptedException) {
+ return i;
+ }
+ if (n > 5) {
+ deleteFlag = false;
+ }
+ }
+ }
+ return i;
+ }
- public static int getWordWidth(Font font, String content) {
- FontDesignMetrics metrics = FontDesignMetrics.getMetrics(font);
- int width = 0;
- for (int i = 0; i < content.length(); i++) {
- width += metrics.charWidth(content.charAt(i));
- }
- return width;
- }
+ public static int getWordWidth(Font font, String content) {
+ FontDesignMetrics metrics = FontDesignMetrics.getMetrics(font);
+ int width = 0;
+ for (int i = 0; i < content.length(); i++) {
+ width += metrics.charWidth(content.charAt(i));
+ }
+ return width;
+ }
}
diff --git a/src/main/java/aiyh/utils/httpUtil/HttpManager.java b/src/main/java/aiyh/utils/httpUtil/HttpManager.java
index 38c1293..4215cf2 100644
--- a/src/main/java/aiyh/utils/httpUtil/HttpManager.java
+++ b/src/main/java/aiyh/utils/httpUtil/HttpManager.java
@@ -1,9 +1,11 @@
package aiyh.utils.httpUtil;
+import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.ssl.SSLContextBuilder;
@@ -26,9 +28,9 @@ public class HttpManager {
*/
- private static final int CONNECT_TIMEOUT = 1000 * 60 * 5;
- private static final int CONNECTION_REQUEST_TIMEOUT = 1000 * 60 * 5;
- private static final int SOCKET_TIMEOUT = 10000 * 60 * 5;
+ private static final int CONNECT_TIMEOUT = 1000 * 60 * 3;
+ private static final int CONNECTION_REQUEST_TIMEOUT = 1000 * 60 * 3;
+ private static final int SOCKET_TIMEOUT = 10000 * 60 * 3;
private static final int MAX_TOTAL = 500;
private static final int MAX_PRE_ROUTE = 500;
@@ -56,7 +58,7 @@ public class HttpManager {
* @param url 请求地址
* @return 连接对象
*/
- public static CloseableHttpClient getHttpConnection(String url){
+ public static CloseableHttpClient getHttpConnection(String url, CredentialsProvider credentialsProvider){
if(url.trim().toUpperCase().startsWith(HttpArgsType.HTTP_HTTPS.toUpperCase())){
SSLContext sslContext;
SSLConnectionSocketFactory sslsf = null;
@@ -70,17 +72,25 @@ public class HttpManager {
} catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
e.printStackTrace();
}
- return HttpClients.custom()
+ HttpClientBuilder httpClientBuilder = HttpClients.custom()
.setSSLSocketFactory(sslsf)
.setConnectionManager(manager)
.setConnectionManagerShared(true)
- .setDefaultRequestConfig(requestConfig)
+ .setDefaultRequestConfig(requestConfig);
+ if(credentialsProvider != null){
+ httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+ }
+ return httpClientBuilder
.build();
}else{
- return HttpClients.custom()
+ HttpClientBuilder httpClientBuilder = HttpClients.custom()
.setConnectionManager(manager)
.setDefaultRequestConfig(requestConfig)
- .setConnectionManagerShared(true)
+ .setConnectionManagerShared(true);
+ if(credentialsProvider != null){
+ httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+ }
+ return httpClientBuilder
.build();
}
}
diff --git a/src/main/java/aiyh/utils/httpUtil/httpAsync/HttpAsyncThreadCallBack.java b/src/main/java/aiyh/utils/httpUtil/httpAsync/HttpAsyncThreadCallBack.java
index aa6ebee..4bcf525 100644
--- a/src/main/java/aiyh/utils/httpUtil/httpAsync/HttpAsyncThreadCallBack.java
+++ b/src/main/java/aiyh/utils/httpUtil/httpAsync/HttpAsyncThreadCallBack.java
@@ -1,10 +1,21 @@
package aiyh.utils.httpUtil.httpAsync;
+import aiyh.utils.Util;
+import aiyh.utils.httpUtil.ExtendedIOUtils;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.util.HttpUtilParamInfo;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.CloseableHttpClient;
-import aiyh.utils.httpUtil.ExtendedIOUtils;
+import org.apache.http.util.EntityUtils;
+import org.apache.log4j.Logger;
+import java.util.Date;
+import java.util.Locale;
import java.util.function.Consumer;
/**
@@ -14,27 +25,69 @@ import java.util.function.Consumer;
*/
-public class HttpAsyncThreadCallBack implements Runnable{
- private final CloseableHttpClient httpClient;
- private final HttpUriRequest request;
- private final Consumer consumer;
+public class HttpAsyncThreadCallBack implements Runnable {
+ private final CloseableHttpClient httpClient;
+ private final HttpUriRequest request;
+ private final Consumer consumer;
+ private String defaultEncoding = "UTF-8";
+ private static final Logger log = Util.getLogger("http_util");
- public HttpAsyncThreadCallBack(CloseableHttpClient httpClient, HttpUriRequest request, Consumer consumer){
- this.httpClient = httpClient;
- this.request = request;
- this.consumer = consumer;
- }
+ private HttpUtilParamInfo httpUtilParamInfo = new HttpUtilParamInfo();
- @Override
- public void run() {
- CloseableHttpResponse response = null;
- try {
- response = httpClient.execute(request);
- consumer.accept(response);
- } catch (Exception e) {
- consumer.accept(null);
- }
- ExtendedIOUtils.closeQuietly(httpClient);
- ExtendedIOUtils.closeQuietly(response);
- }
+ public HttpAsyncThreadCallBack(CloseableHttpClient httpClient, HttpUriRequest request, Consumer consumer) {
+ this.httpClient = httpClient;
+ this.request = request;
+ this.consumer = consumer;
+ }
+
+ public HttpAsyncThreadCallBack(CloseableHttpClient httpClient, HttpUriRequest request, Consumer consumer, String defaultEncoding) {
+ this.httpClient = httpClient;
+ this.request = request;
+ this.consumer = consumer;
+ this.defaultEncoding = defaultEncoding;
+ }
+
+ @Override
+ public void run() {
+ CloseableHttpResponse response = null;
+ try {
+
+ response = httpClient.execute(request);
+ HttpEntity entity = response.getEntity();
+ Header[] allHeaders = response.getAllHeaders();
+ ResponeVo responeVo = new ResponeVo();
+ Locale locale = response.getLocale();
+ responeVo.setLocale(locale);
+ responeVo.setAllHeaders(allHeaders);
+ responeVo.setEntityString(EntityUtils.toString(entity, defaultEncoding));
+ responeVo.setCode(response.getStatusLine().getStatusCode());
+ httpUtilParamInfo.setResponse(responeVo);
+ httpUtilParamInfo.setResponseDate(new Date());
+ try {
+ log.info(Util.logStr("url [{}] request info : [\n{}\n];", httpUtilParamInfo.getUrl(),
+ JSONObject.toJSONString(httpUtilParamInfo,
+ SerializerFeature.PrettyFormat,
+ SerializerFeature.WriteDateUseDateFormat)));
+ } catch (Exception ignore) {
+ }
+ consumer.accept(responeVo);
+ } catch (Exception e) {
+ log.error(" http调用失败:" + Util.getErrString(e));
+ try {
+ httpUtilParamInfo.setResponseDate(new Date());
+ log.info(Util.logStr("url [{}] request info : [\n{}\n];", httpUtilParamInfo.getUrl(),
+ JSONObject.toJSONString(httpUtilParamInfo,
+ SerializerFeature.PrettyFormat,
+ SerializerFeature.WriteDateUseDateFormat)));
+ } catch (Exception ignore) {
+ }
+ consumer.accept(null);
+ }
+ ExtendedIOUtils.closeQuietly(httpClient);
+ ExtendedIOUtils.closeQuietly(response);
+ }
+
+ public void setHttpUtilParamInfo(HttpUtilParamInfo httpUtilParamInfo) {
+ this.httpUtilParamInfo = httpUtilParamInfo;
+ }
}
diff --git a/src/main/java/aiyh/utils/httpUtil/staticUtil/HttpStaticUtils.java b/src/main/java/aiyh/utils/httpUtil/staticUtil/HttpStaticUtils.java
index 0728fcd..8688af4 100644
--- a/src/main/java/aiyh/utils/httpUtil/staticUtil/HttpStaticUtils.java
+++ b/src/main/java/aiyh/utils/httpUtil/staticUtil/HttpStaticUtils.java
@@ -1,6 +1,12 @@
package aiyh.utils.httpUtil.staticUtil;
-import aiyh.utils.httpUtil.util.CloseThread;
+import aiyh.utils.httpUtil.ExtendedIOUtils;
+import aiyh.utils.httpUtil.HttpArgsType;
+import aiyh.utils.httpUtil.HttpManager;
+import aiyh.utils.httpUtil.ResponeVo;
+import aiyh.utils.httpUtil.httpAsync.HttpAsyncThread;
+import aiyh.utils.httpUtil.httpAsync.HttpAsyncThreadCallBack;
+import aiyh.utils.zwl.common.ToolUtil;
import com.alibaba.fastjson.JSON;
import com.google.common.base.Strings;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -18,13 +24,6 @@ import org.apache.http.entity.mime.content.StringBody;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
-import aiyh.utils.httpUtil.ExtendedIOUtils;
-import aiyh.utils.httpUtil.HttpArgsType;
-import aiyh.utils.httpUtil.HttpManager;
-import aiyh.utils.httpUtil.ResponeVo;
-import aiyh.utils.httpUtil.httpAsync.HttpAsyncThread;
-import aiyh.utils.httpUtil.httpAsync.HttpAsyncThreadCallBack;
-import aiyh.utils.zwl.common.ToolUtil;
import weaver.file.ImageFileManager;
import java.io.*;
@@ -40,797 +39,811 @@ import java.util.function.Consumer;
public class HttpStaticUtils {
- // 默认编码
- public static String DEFAULT_ENCODING = "UTF-8";
+ // 默认编码
+ public static String DEFAULT_ENCODING = "UTF-8";
- private static final ToolUtil toolUtil = new ToolUtil();
+ private static final ToolUtil toolUtil = new ToolUtil();
- // 线程池
- public static final ThreadPoolExecutor executorService;
- static {
- // private final ExecutorService executorService = Executors.newFixedThreadPool(3);
- ThreadFactoryBuilder threadFactoryBuilder = new ThreadFactoryBuilder();
- ThreadFactory threadFactory = threadFactoryBuilder.setNameFormat("xxx-pool-%d").build();
- executorService = new ThreadPoolExecutor(5, 200, 0L,
- TimeUnit.MILLISECONDS,
- new LinkedBlockingQueue<>(1024),
- threadFactory,
- new ThreadPoolExecutor.AbortPolicy());
- }
+ // 线程池
+ public static final ThreadPoolExecutor executorService;
+
+ static {
+ // private final ExecutorService executorService = Executors.newFixedThreadPool(3);
+ ThreadFactoryBuilder threadFactoryBuilder = new ThreadFactoryBuilder();
+ ThreadFactory threadFactory = threadFactoryBuilder.setNameFormat("xxx-pool-%d").build();
+ executorService = new ThreadPoolExecutor(5, 200, 0L,
+ TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<>(1024),
+ threadFactory,
+ new ThreadPoolExecutor.AbortPolicy());
+ }
- public static HttpPost getHttpPost(String url) {
- HttpPost httpPost = new HttpPost(url);
- RequestConfig requestConfig = RequestConfig.custom()
- .setConnectTimeout(10000)
- .setConnectionRequestTimeout(10000)
- .setRedirectsEnabled(true)
- .build();
- httpPost.setConfig(requestConfig);
- return httpPost;
- }
+ public static HttpPost getHttpPost(String url) {
+ HttpPost httpPost = new HttpPost(url);
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setConnectTimeout(10000)
+ .setConnectionRequestTimeout(10000)
+ .setRedirectsEnabled(true)
+ .build();
+ httpPost.setConfig(requestConfig);
+ return httpPost;
+ }
- public static HttpGet getHttpGet(String url) {
- HttpGet httpGet = new HttpGet(url);
- RequestConfig requestConfig = RequestConfig.custom()
- .setConnectTimeout(10000)
- .setConnectionRequestTimeout(10000)
- .setRedirectsEnabled(true)
- .build();
- httpGet.setConfig(requestConfig);
- return httpGet;
- }
+ public static HttpGet getHttpGet(String url) {
+ HttpGet httpGet = new HttpGet(url);
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setConnectTimeout(10000)
+ .setConnectionRequestTimeout(10000)
+ .setRedirectsEnabled(true)
+ .build();
+ httpGet.setConfig(requestConfig);
+ return httpGet;
+ }
- /**
- * get请求
- * @param url 请求地址
- * @return 请求结果
- * @throws IOException io异常
- */
- public static ResponeVo apiGet(String url) throws IOException {
- CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url);
- Map params = paramsHandle(null);
- String getUrl = urlHandle(url, params);
- Map headers = headersHandle(null);
- HttpGet httpGet = new HttpGet(getUrl.trim());
- for (Map.Entry entry : headers.entrySet()) {
- httpGet.setHeader(entry.getKey(), entry.getValue());
- }
- return baseRequest(httpConnection, httpGet);
- }
+ /**
+ * get请求
+ *
+ * @param url 请求地址
+ * @return 请求结果
+ * @throws IOException io异常
+ */
+ public static ResponeVo apiGet(String url) throws IOException {
+ CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url, null);
+ Map params = paramsHandle(null);
+ String getUrl = urlHandle(url, params);
+ Map headers = headersHandle(null);
+ HttpGet httpGet = new HttpGet(getUrl.trim());
+ for (Map.Entry entry : headers.entrySet()) {
+ httpGet.setHeader(entry.getKey(), entry.getValue());
+ }
+ return baseRequest(httpConnection, httpGet);
+ }
- /**
- * delete请求
- * @param url 请求地址
- * @return 请求结果
- * @throws IOException io异常
- */
- public static ResponeVo apiDelete(String url) throws IOException {
- CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url);
- Map params = paramsHandle(null);
- String getUrl = urlHandle(url, params);
- Map headers = headersHandle(null);
- HttpDelete httpDelete = new HttpDelete(getUrl.trim());
- for (Map.Entry entry : headers.entrySet()) {
- httpDelete.setHeader(entry.getKey(), entry.getValue());
- }
- return baseRequest(httpConnection, httpDelete);
- }
+ /**
+ * delete请求
+ *
+ * @param url 请求地址
+ * @return 请求结果
+ * @throws IOException io异常
+ */
+ public static ResponeVo apiDelete(String url) throws IOException {
+ CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url, null);
+ Map params = paramsHandle(null);
+ String getUrl = urlHandle(url, params);
+ Map headers = headersHandle(null);
+ HttpDelete httpDelete = new HttpDelete(getUrl.trim());
+ for (Map.Entry entry : headers.entrySet()) {
+ httpDelete.setHeader(entry.getKey(), entry.getValue());
+ }
+ return baseRequest(httpConnection, httpDelete);
+ }
- /**
- * get请求
- * @param url 请求地址
- * @param headers 请求头
- * @return 响应结果封装
- * @throws IOException io异常
- */
- public static ResponeVo apiGet(String url, Map headers) throws IOException {
- CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url);
- Map params = paramsHandle(null);
- String getUrl = urlHandle(url, params);
- Map headerMap = headersHandle(headers);
- HttpGet httpGet = new HttpGet(getUrl.trim());
- for (Map.Entry entry : headerMap.entrySet()) {
- httpGet.setHeader(entry.getKey(), entry.getValue());
- }
- return baseRequest(httpConnection, httpGet);
- }
+ /**
+ * get请求
+ *
+ * @param url 请求地址
+ * @param headers 请求头
+ * @return 响应结果封装
+ * @throws IOException io异常
+ */
+ public static ResponeVo apiGet(String url, Map headers) throws IOException {
+ CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url, null);
+ Map params = paramsHandle(null);
+ String getUrl = urlHandle(url, params);
+ Map headerMap = headersHandle(headers);
+ HttpGet httpGet = new HttpGet(getUrl.trim());
+ for (Map.Entry entry : headerMap.entrySet()) {
+ httpGet.setHeader(entry.getKey(), entry.getValue());
+ }
+ return baseRequest(httpConnection, httpGet);
+ }
- /**
- * delete请求
- * @param url 请求地址
- * @param headers 请求头
- * @return 请求结果
- * @throws IOException io异常
- */
- public static ResponeVo apiDelete(String url, Map headers) throws IOException {
- CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url);
- Map params = paramsHandle(null);
- String getUrl = urlHandle(url, params);
- Map headerMap = headersHandle(headers);
- HttpDelete httpDelete = new HttpDelete(getUrl.trim());
- for (Map.Entry entry : headerMap.entrySet()) {
- httpDelete.setHeader(entry.getKey(), entry.getValue());
- }
- return baseRequest(httpConnection, httpDelete);
- }
+ /**
+ * delete请求
+ *
+ * @param url 请求地址
+ * @param headers 请求头
+ * @return 请求结果
+ * @throws IOException io异常
+ */
+ public static ResponeVo apiDelete(String url, Map headers) throws IOException {
+ CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url, null);
+ Map params = paramsHandle(null);
+ String getUrl = urlHandle(url, params);
+ Map headerMap = headersHandle(headers);
+ HttpDelete httpDelete = new HttpDelete(getUrl.trim());
+ for (Map.Entry entry : headerMap.entrySet()) {
+ httpDelete.setHeader(entry.getKey(), entry.getValue());
+ }
+ return baseRequest(httpConnection, httpDelete);
+ }
- public static ResponeVo apiGet(String url, Map params, Map headers) throws IOException {
- Map paramsMap = paramsHandle(params);
- String getUrl = urlHandle(url, paramsMap);
- Map headerMap = headersHandle(headers);
- CloseableHttpClient httpConnection = HttpManager.getHttpConnection(url);
- HttpGet httpGet = new HttpGet(getUrl.trim());
- for (Map.Entry