diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java b/base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
index d0d8e10e..16df4066 100644
--- a/base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
+++ b/base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.java
@@ -82,6 +82,9 @@ public class SysApplicationApiEntity extends BaseEntity {
/** 返回描述字段*/
private String returnMsg;
+ //对应nifi的apiid
+ private String nifiApiId;
+
public String getReturnMsg() {
return returnMsg;
}
@@ -321,5 +324,13 @@ public class SysApplicationApiEntity extends BaseEntity {
public void setAppCode(Long appCode) {
this.appCode = appCode;
}
+
+ public String getNifiApiId() {
+ return nifiApiId;
+ }
+
+ public void setNifiApiId(String nifiApiId) {
+ this.nifiApiId = nifiApiId;
+ }
}
diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml b/base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
index f2d0a1dc..20af3573 100644
--- a/base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
+++ b/base-service/src/main/java/com/hzya/frame/sysnew/application/api/entity/SysApplicationApiEntity.xml
@@ -10,6 +10,7 @@
+
@@ -51,7 +52,8 @@
,api_code
,api_path
,app_id
- ,catalogue_id
+ ,nifi_api_id
+ ,catalogue_id
,api_name
,api_remark
,need_Login
@@ -85,6 +87,7 @@
sys_application_api.id,
sys_application.app_id as app_code,
+ sys_application.nifi_api_id as nifi_api_id,
sys_application_api.api_code,
sys_application_api.api_name,
sys_application_api.api_remark,
@@ -111,6 +114,7 @@
b.name as app_name,
b.interface_address as app_url,
a.app_id,
+ a.nifi_api_id,
a.catalogue_id,
c.name as catalogue_name,
a.api_name,
@@ -162,6 +166,7 @@ WHERE
,api.api_code
,api.api_path
,api.app_id
+ ,api.nifi_api_id
,api.catalogue_id
,api.api_name
,api.api_remark
@@ -200,6 +205,7 @@ WHERE
and api.api_code = #{apiCode}
and api.api_path = #{apiPath}
and api.app_id = #{appId}
+ and api.nifi_api_id = #{nifiApiId}
and api.catalogue_id = #{catalogueId}
and api.api_name = #{apiName}
and api.api_remark = #{apiRemark}
@@ -251,6 +257,7 @@ WHERE
and api_code = #{apiCode}
and api_path = #{apiPath}
and app_id = #{appId}
+ and nifi_api_id = #{nifiApiId}
and catalogue_id = #{catalogueId}
and api_name = #{apiName}
and api_remark = #{apiRemark}
@@ -304,6 +311,7 @@ WHERE
and api_code like concat('%',#{apiCode},'%')
and api_path like concat('%',#{apiPath},'%')
and app_id like concat('%',#{appId},'%')
+ and nifi_api_id like concat('%',#{nifiApiId},'%')
and catalogue_id like concat('%',#{catalogueId},'%')
and api_name like concat('%',#{apiName},'%')
@@ -372,6 +380,7 @@ WHERE
and sys_application_api.api_code like concat('%',#{apiCode},'%')
and sys_application_api.api_path like concat('%',#{apiPath},'%')
and sys_application_api.app_id like concat('%',#{appId},'%')
+ and sys_application_api.nifi_api_id like concat('%',#{nifiApiId},'%')
and sys_application_api.catalogue_id like concat('%',#{catalogueId},'%')
and sys_application_api.api_name like concat('%',#{apiName},'%')
@@ -438,6 +447,7 @@ WHERE
or api_code = #{apiCode}
or api_path = #{apiPath}
or app_id = #{appId}
+ or nifi_api_id = #{nifiApiId}
or catalogue_id = #{catalogueId}
or api_name = #{apiName}
or api_remark = #{apiRemark}
@@ -490,6 +500,7 @@ WHERE
api_code ,
api_path ,
app_id ,
+ nifi_api_id ,
catalogue_id ,
api_name ,
api_remark ,
@@ -531,6 +542,7 @@ WHERE
#{apiPath} ,
#{appId} ,
+ #{nifiApiId} ,
#{catalogueId} ,
#{apiName} ,
#{apiRemark} ,
@@ -567,31 +579,32 @@ WHERE
- insert into sys_application_api(api_status,api_code,api_path, app_id, catalogue_id, api_name, api_remark,
+ insert into sys_application_api(api_status,api_code,api_path, app_id,nifi_api_id, catalogue_id, api_name, api_remark,
need_Login, authentication_port, parameter_passing_mode, destination_address, request_coding, request_method,
timeout_period, current_limiting, header_in, query_in, body_in_type, body_in, body_out, bean_name,return_msg,return_success_field,return_success_value, fun_name, extension_api, sorts, create_user_id,
create_time, modify_user_id, modify_time, sts, org_id, sts)
values
- (#{entity.apiStatus},#{entity.apiCode},#{entity.apiPath},#{entity.appId},#{entity.catalogueId},#{entity.apiName},#{entity.apiRemark},#{entity.needLogin},#{entity.authenticationPort},#{entity.parameterPassingMode},#{entity.destinationAddress},#{entity.requestCoding},#{entity.requestMethod},#{entity.timeoutPeriod},#{entity.currentLimiting},#{entity.headerIn},#{entity.queryIn},#{entity.bodyInType},#{entity.bodyIn},#{entity.bodyOut},#{entity.beanName},#{entity.returnMsg},#{entity.returnSuccessField},#{entity.returnSuccessValue},#{entity.funName},#{entity.extensionApi},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
+ (#{entity.apiStatus},#{entity.apiCode},#{entity.apiPath},#{entity.appId},#{entity.nifiApiId},#{entity.catalogueId},#{entity.apiName},#{entity.apiRemark},#{entity.needLogin},#{entity.authenticationPort},#{entity.parameterPassingMode},#{entity.destinationAddress},#{entity.requestCoding},#{entity.requestMethod},#{entity.timeoutPeriod},#{entity.currentLimiting},#{entity.headerIn},#{entity.queryIn},#{entity.bodyInType},#{entity.bodyIn},#{entity.bodyOut},#{entity.beanName},#{entity.returnMsg},#{entity.returnSuccessField},#{entity.returnSuccessValue},#{entity.funName},#{entity.extensionApi},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},
'Y')
- insert into sys_application_api(api_status,api_code,api_path, app_id, catalogue_id, api_name, api_remark,
+ insert into sys_application_api(api_status,api_code,api_path, app_id,nifi_api_id, catalogue_id, api_name, api_remark,
need_Login, authentication_port, parameter_passing_mode, destination_address, request_coding, request_method,
timeout_period, current_limiting, header_in, query_in, body_in_type, body_in, body_out,bean_name,return_msg,return_success_field,return_success_value,fun_name,extension_api, sorts, create_user_id,
create_time, modify_user_id, modify_time, sts, org_id)
values
- (#{entity.apiStatus},#{entity.apiCode},#{entity.apiPath},#{entity.appId},#{entity.catalogueId},#{entity.apiName},#{entity.apiRemark},#{entity.needLogin},#{entity.authenticationPort},#{entity.parameterPassingMode},#{entity.destinationAddress},#{entity.requestCoding},#{entity.requestMethod},#{entity.timeoutPeriod},#{entity.currentLimiting},#{entity.headerIn},#{entity.queryIn},#{entity.bodyInType},#{entity.bodyIn},#{entity.bodyOut},#{entity.beanName},#{entity.returnMsg},#{entity.returnSuccessField},#{entity.returnSuccessValue},#{entity.funName},#{entity.extensionApi},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
+ (#{entity.apiStatus},#{entity.apiCode},#{entity.apiPath},#{entity.appId},#{entity.nifiApiId},#{entity.catalogueId},#{entity.apiName},#{entity.apiRemark},#{entity.needLogin},#{entity.authenticationPort},#{entity.parameterPassingMode},#{entity.destinationAddress},#{entity.requestCoding},#{entity.requestMethod},#{entity.timeoutPeriod},#{entity.currentLimiting},#{entity.headerIn},#{entity.queryIn},#{entity.bodyInType},#{entity.bodyIn},#{entity.bodyOut},#{entity.beanName},#{entity.returnMsg},#{entity.returnSuccessField},#{entity.returnSuccessValue},#{entity.funName},#{entity.extensionApi},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id})
on duplicate key update
api_status = values(api_status),
api_code = values(api_code),
api_path = values(api_path),
app_id = values(app_id),
+ nifi_api_id = values(nifi_api_id),
catalogue_id = values(catalogue_id),
api_name = values(api_name),
api_remark = values(api_remark),
@@ -630,6 +643,7 @@ WHERE
api_code = #{apiCode},
api_path = #{apiPath},
app_id = #{appId},
+ nifi_api_id = #{nifiApiId},
catalogue_id = #{catalogueId},
api_name = #{apiName},
api_remark = #{apiRemark},
@@ -683,6 +697,7 @@ where id = #{id}
and api_code = #{apiCode}
and api_path = #{apiPath}
and app_id = #{appId}
+ and nifi_api_id = #{nifiApiId}
and catalogue_id = #{catalogueId}
and api_name = #{apiName}
and api_remark = #{apiRemark}
@@ -919,6 +934,7 @@ where id = #{id}
select
id
,app_id
+ ,nifi_api_id
,api_name
from sys_application_api
@@ -927,6 +943,7 @@ where id = #{id}
and api_code = #{apiCode}
and api_path = #{apiPath}
and app_id = #{appId}
+ and nifi_api_id = #{nifiApiId}
and catalogue_id = #{catalogueId}
and api_name = #{apiName}
and api_remark = #{apiRemark}