Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/db/add.sql

@@ -206,8 +206,8 @@ ALTER TABLE `mortals_sys_model` ADD COLUMN `type` tinyint(2)  DEFAULT '1'  COMME
 2023-9-11
 -- ----------------------------
 ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `serviceApi` varchar(255)   default ''   COMMENT '事件服务接口请求地址';
-ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `serviceAprParams` varchar(1024) default ''     COMMENT '事件服务接口请求参数';
+ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `serviceApiParams` varchar(1024) default ''     COMMENT '事件服务接口请求参数';
 
 
 ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `serviceApi` varchar(255)   default ''   COMMENT '事件服务接口请求地址';
-ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `serviceAprParams` varchar(1024) default ''     COMMENT '事件服务接口请求参数';
+ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `serviceApiParams` varchar(1024) default ''     COMMENT '事件服务接口请求参数';

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java

@@ -13,7 +13,7 @@ import lombok.Data;
  * 自助终端应用模板信息字段实体对象
  *
  * @author zxfei
- * @date 2023-09-12
+ * @date 2023-09-13
  */
 @Data
 public class AppInfoFieldEntity extends AppInfoFieldVo {
@@ -78,7 +78,7 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
     /**
      * 事件服务接口请求参数
      */
-    private String serviceAprParams;
+    private String serviceApiParams;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -110,6 +110,6 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
         this.fieldOrderNo = 1;
         this.remark = "";
         this.serviceApi = "";
-        this.serviceAprParams = "";
+        this.serviceApiParams = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
  * 自助终端应用模板信息字段查询对象
  *
  * @author zxfei
- * @date 2023-09-12
+ * @date 2023-09-13
  */
 public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 开始 序号，主键，自增长 */
@@ -145,10 +145,10 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
     /** 事件服务接口请求地址排除列表 */
     private List <String> serviceApiNotList;
     /** 事件服务接口请求参数 */
-    private List<String> serviceAprParamsList;
+    private List<String> serviceApiParamsList;
 
     /** 事件服务接口请求参数排除列表 */
-    private List <String> serviceAprParamsNotList;
+    private List <String> serviceApiParamsNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -975,34 +975,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
 
     /**
      * 获取 事件服务接口请求参数
-     * @return serviceAprParamsList
+     * @return serviceApiParamsList
      */
-    public List<String> getServiceAprParamsList(){
-        return this.serviceAprParamsList;
+    public List<String> getServiceApiParamsList(){
+        return this.serviceApiParamsList;
     }
 
     /**
      * 设置 事件服务接口请求参数
-     * @param serviceAprParamsList
+     * @param serviceApiParamsList
      */
-    public void setServiceAprParamsList(List<String> serviceAprParamsList){
-        this.serviceAprParamsList = serviceAprParamsList;
+    public void setServiceApiParamsList(List<String> serviceApiParamsList){
+        this.serviceApiParamsList = serviceApiParamsList;
     }
 
     /**
      * 获取 事件服务接口请求参数
-     * @return serviceAprParamsNotList
+     * @return serviceApiParamsNotList
      */
-    public List<String> getServiceAprParamsNotList(){
-        return this.serviceAprParamsNotList;
+    public List<String> getServiceApiParamsNotList(){
+        return this.serviceApiParamsNotList;
     }
 
     /**
      * 设置 事件服务接口请求参数
-     * @param serviceAprParamsNotList
+     * @param serviceApiParamsNotList
      */
-    public void setServiceAprParamsNotList(List<String> serviceAprParamsNotList){
-        this.serviceAprParamsNotList = serviceAprParamsNotList;
+    public void setServiceApiParamsNotList(List<String> serviceApiParamsNotList){
+        this.serviceApiParamsNotList = serviceApiParamsNotList;
     }
 
     /**
@@ -1729,19 +1729,19 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
 
     /**
      * 设置 事件服务接口请求参数
-     * @param serviceAprParams
+     * @param serviceApiParams
      */
-    public AppInfoFieldQuery serviceAprParams(String serviceAprParams){
-        setServiceAprParams(serviceAprParams);
+    public AppInfoFieldQuery serviceApiParams(String serviceApiParams){
+        setServiceApiParams(serviceApiParams);
         return this;
     }
 
     /**
      * 设置 事件服务接口请求参数
-     * @param serviceAprParamsList
+     * @param serviceApiParamsList
      */
-    public AppInfoFieldQuery serviceAprParamsList(List<String> serviceAprParamsList){
-        this.serviceAprParamsList = serviceAprParamsList;
+    public AppInfoFieldQuery serviceApiParamsList(List<String> serviceApiParamsList){
+        this.serviceApiParamsList = serviceApiParamsList;
         return this;
     }
 

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java

 package com.mortals.xhx.module.app.model;
-
 import java.util.List;
 import java.util.ArrayList;
 import java.math.BigDecimal;
-
 import cn.hutool.core.date.DateUtil;
-
 import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
 import lombok.Data;
-
 /**
  * 自助终端应用模板信息字段实体对象
  *
  * @author zxfei
- * @date 2023-09-12
+ * @date 2023-09-13
  */
 @Data
 public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
@@ -83,13 +78,11 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
     /**
      * 事件服务接口请求参数，json格式
      */
-    private String serviceAprParams;
-
+    private String serviceApiParams;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
     }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
@@ -102,7 +95,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
         return false;
     }
 
-    public void initAttrValue() {
+    public void initAttrValue(){
         this.appId = null;
         this.fieldCode = "";
         this.fieldName = "";
@@ -117,6 +110,6 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
         this.fieldOrderNo = 1;
         this.remark = "";
         this.serviceApi = "";
-        this.serviceAprParams = "";
+        this.serviceApiParams = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
  * 自助终端应用模板信息字段查询对象
  *
  * @author zxfei
- * @date 2023-09-12
+ * @date 2023-09-13
  */
 public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 开始 序号，主键，自增长 */
@@ -145,10 +145,10 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
     /** 事件服务接口请求地址排除列表 */
     private List <String> serviceApiNotList;
     /** 事件服务接口请求参数，json格式 */
-    private List<String> serviceAprParamsList;
+    private List<String> serviceApiParamsList;
 
     /** 事件服务接口请求参数，json格式排除列表 */
-    private List <String> serviceAprParamsNotList;
+    private List <String> serviceApiParamsNotList;
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -975,34 +975,34 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
 
     /**
      * 获取 事件服务接口请求参数，json格式
-     * @return serviceAprParamsList
+     * @return serviceApiParamsList
      */
-    public List<String> getServiceAprParamsList(){
-        return this.serviceAprParamsList;
+    public List<String> getServiceApiParamsList(){
+        return this.serviceApiParamsList;
     }
 
     /**
      * 设置 事件服务接口请求参数，json格式
-     * @param serviceAprParamsList
+     * @param serviceApiParamsList
      */
-    public void setServiceAprParamsList(List<String> serviceAprParamsList){
-        this.serviceAprParamsList = serviceAprParamsList;
+    public void setServiceApiParamsList(List<String> serviceApiParamsList){
+        this.serviceApiParamsList = serviceApiParamsList;
     }
 
     /**
      * 获取 事件服务接口请求参数，json格式
-     * @return serviceAprParamsNotList
+     * @return serviceApiParamsNotList
      */
-    public List<String> getServiceAprParamsNotList(){
-        return this.serviceAprParamsNotList;
+    public List<String> getServiceApiParamsNotList(){
+        return this.serviceApiParamsNotList;
     }
 
     /**
      * 设置 事件服务接口请求参数，json格式
-     * @param serviceAprParamsNotList
+     * @param serviceApiParamsNotList
      */
-    public void setServiceAprParamsNotList(List<String> serviceAprParamsNotList){
-        this.serviceAprParamsNotList = serviceAprParamsNotList;
+    public void setServiceApiParamsNotList(List<String> serviceApiParamsNotList){
+        this.serviceApiParamsNotList = serviceApiParamsNotList;
     }
 
     /**
@@ -1729,19 +1729,19 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
 
     /**
      * 设置 事件服务接口请求参数，json格式
-     * @param serviceAprParams
+     * @param serviceApiParams
      */
-    public AppInfoTempleteFieldQuery serviceAprParams(String serviceAprParams){
-        setServiceAprParams(serviceAprParams);
+    public AppInfoTempleteFieldQuery serviceApiParams(String serviceApiParams){
+        setServiceApiParams(serviceApiParams);
         return this;
     }
 
     /**
      * 设置 事件服务接口请求参数，json格式
-     * @param serviceAprParamsList
+     * @param serviceApiParamsList
      */
-    public AppInfoTempleteFieldQuery serviceAprParamsList(List<String> serviceAprParamsList){
-        this.serviceAprParamsList = serviceAprParamsList;
+    public AppInfoTempleteFieldQuery serviceApiParamsList(List<String> serviceApiParamsList){
+        this.serviceApiParamsList = serviceApiParamsList;
         return this;
     }
 

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -79,7 +79,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
     protected void doListBefore(AppEntity query, Map<String, Object> model, Context context) throws AppException {
         String serverName = request.getHeader("server-name");
         Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0);
-        log.info("【应用请求】【请求体】-->serverName{} ,port:{}", serverName, serverPort);
+        log.info("【应用请求】【请求体】-->serverName:{} ,port:{}", serverName, serverPort);
         query.setServerName(serverName);
         query.setServerPort(serverPort);
         super.doListBefore(query, model, context);

base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml

@@ -20,7 +20,7 @@
         <result property="fieldOrderNo" column="fieldOrderNo" />
         <result property="remark" column="remark" />
         <result property="serviceApi" column="serviceApi" />
-        <result property="serviceAprParams" column="serviceAprParams" />
+        <result property="serviceApiParams" column="serviceApiParams" />
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
@@ -77,8 +77,8 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApi') or colPickMode == 1 and data.containsKey('serviceApi')))">
                 a.serviceApi,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceAprParams') or colPickMode == 1 and data.containsKey('serviceAprParams')))">
-                a.serviceAprParams,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApiParams') or colPickMode == 1 and data.containsKey('serviceApiParams')))">
+                a.serviceApiParams,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
                 a.createTime,
@@ -97,18 +97,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AppInfoFieldEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_app_info_field
-        (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceAprParams,createTime,createUserId,updateTime,updateUserId)
+        (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceApiParams,createTime,createUserId,updateTime,updateUserId)
         VALUES
-        (#{datasetId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{serviceApi},#{serviceAprParams},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{datasetId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{serviceApi},#{serviceApiParams},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_app_info_field
-        (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceAprParams,createTime,createUserId,updateTime,updateUserId)
+        (datasetId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceApiParams,createTime,createUserId,updateTime,updateUserId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.datasetId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.fieldTypeValue},#{item.dataType},#{item.fieldValue},#{item.defaultValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.serviceApi},#{item.serviceAprParams},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+            (#{item.datasetId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.fieldTypeValue},#{item.dataType},#{item.fieldValue},#{item.defaultValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.serviceApi},#{item.serviceApiParams},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
         </foreach>
     </insert>
 
@@ -175,8 +175,8 @@
             <if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))">
                 a.serviceApi=#{data.serviceApi},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('serviceAprParams')) or (colPickMode==1 and !data.containsKey('serviceAprParams'))">
-                a.serviceAprParams=#{data.serviceAprParams},
+            <if test="(colPickMode==0 and data.containsKey('serviceApiParams')) or (colPickMode==1 and !data.containsKey('serviceApiParams'))">
+                a.serviceApiParams=#{data.serviceApiParams},
             </if>
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
                 a.createTime=#{data.createTime},
@@ -331,10 +331,10 @@
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="serviceAprParams=(case" suffix="ELSE serviceAprParams end),">
+            <trim prefix="serviceApiParams=(case" suffix="ELSE serviceApiParams end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('serviceAprParams')) or (colPickMode==1 and !item.containsKey('serviceAprParams'))">
-                        when a.id=#{item.id} then #{item.serviceAprParams}
+                    <if test="(colPickMode==0 and item.containsKey('serviceApiParams')) or (colPickMode==1 and !item.containsKey('serviceApiParams'))">
+                        when a.id=#{item.id} then #{item.serviceApiParams}
                     </if>
                 </foreach>
             </trim>
@@ -844,23 +844,23 @@
             </foreach>
         </if>
 
-        <if test="conditionParamRef.containsKey('serviceAprParams')">
-            <if test="conditionParamRef.serviceAprParams != null and conditionParamRef.serviceAprParams != ''">
-                ${_conditionType_} a.serviceAprParams like #{${_conditionParam_}.serviceAprParams}
+        <if test="conditionParamRef.containsKey('serviceApiParams')">
+            <if test="conditionParamRef.serviceApiParams != null and conditionParamRef.serviceApiParams != ''">
+                ${_conditionType_} a.serviceApiParams like #{${_conditionParam_}.serviceApiParams}
             </if>
-            <if test="conditionParamRef.serviceAprParams == null">
-                ${_conditionType_} a.serviceAprParams is null
+            <if test="conditionParamRef.serviceApiParams == null">
+                ${_conditionType_} a.serviceApiParams is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('serviceAprParamsList') and conditionParamRef.serviceAprParamsList.size() > 0">
-            ${_conditionType_} a.serviceAprParams in
-            <foreach collection="conditionParamRef.serviceAprParamsList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('serviceApiParamsList') and conditionParamRef.serviceApiParamsList.size() > 0">
+            ${_conditionType_} a.serviceApiParams in
+            <foreach collection="conditionParamRef.serviceApiParamsList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('serviceAprParamsNotList') and conditionParamRef.serviceAprParamsNotList.size() > 0">
-            ${_conditionType_} a.serviceAprParams not in
-            <foreach collection="conditionParamRef.serviceAprParamsNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('serviceApiParamsNotList') and conditionParamRef.serviceApiParamsNotList.size() > 0">
+            ${_conditionType_} a.serviceApiParams not in
+            <foreach collection="conditionParamRef.serviceApiParamsNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -1036,9 +1036,9 @@
                     <if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('serviceAprParams')">
-                    a.serviceAprParams
-                    <if test='orderCol.serviceAprParams != null and "DESC".equalsIgnoreCase(orderCol.serviceAprParams)'>DESC</if>
+                <if test="orderCol.containsKey('serviceApiParams')">
+                    a.serviceApiParams
+                    <if test='orderCol.serviceApiParams != null and "DESC".equalsIgnoreCase(orderCol.serviceApiParams)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('createTime')">

base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml

@@ -20,7 +20,7 @@
         <result property="fieldOrderNo" column="fieldOrderNo" />
         <result property="remark" column="remark" />
         <result property="serviceApi" column="serviceApi" />
-        <result property="serviceAprParams" column="serviceAprParams" />
+        <result property="serviceApiParams" column="serviceApiParams" />
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
@@ -77,8 +77,8 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApi') or colPickMode == 1 and data.containsKey('serviceApi')))">
                 a.serviceApi,
             </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceAprParams') or colPickMode == 1 and data.containsKey('serviceAprParams')))">
-                a.serviceAprParams,
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApiParams') or colPickMode == 1 and data.containsKey('serviceApiParams')))">
+                a.serviceApiParams,
             </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
                 a.createTime,
@@ -97,18 +97,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="AppInfoTempleteFieldEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_app_info_templete_field
-        (appId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceAprParams,createTime,createUserId,updateTime,updateUserId)
+        (appId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceApiParams,createTime,createUserId,updateTime,updateUserId)
         VALUES
-        (#{appId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{serviceApi},#{serviceAprParams},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{appId},#{fieldCode},#{fieldName},#{fieldType},#{fieldTypeValue},#{dataType},#{fieldValue},#{defaultValue},#{fieldLen},#{fieldNull},#{isList},#{fieldOrderNo},#{remark},#{serviceApi},#{serviceApiParams},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_app_info_templete_field
-        (appId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceAprParams,createTime,createUserId,updateTime,updateUserId)
+        (appId,fieldCode,fieldName,fieldType,fieldTypeValue,dataType,fieldValue,defaultValue,fieldLen,fieldNull,isList,fieldOrderNo,remark,serviceApi,serviceApiParams,createTime,createUserId,updateTime,updateUserId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.appId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.fieldTypeValue},#{item.dataType},#{item.fieldValue},#{item.defaultValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.serviceApi},#{item.serviceAprParams},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+            (#{item.appId},#{item.fieldCode},#{item.fieldName},#{item.fieldType},#{item.fieldTypeValue},#{item.dataType},#{item.fieldValue},#{item.defaultValue},#{item.fieldLen},#{item.fieldNull},#{item.isList},#{item.fieldOrderNo},#{item.remark},#{item.serviceApi},#{item.serviceApiParams},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
         </foreach>
     </insert>
 
@@ -175,8 +175,8 @@
             <if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))">
                 a.serviceApi=#{data.serviceApi},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('serviceAprParams')) or (colPickMode==1 and !data.containsKey('serviceAprParams'))">
-                a.serviceAprParams=#{data.serviceAprParams},
+            <if test="(colPickMode==0 and data.containsKey('serviceApiParams')) or (colPickMode==1 and !data.containsKey('serviceApiParams'))">
+                a.serviceApiParams=#{data.serviceApiParams},
             </if>
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
                 a.createTime=#{data.createTime},
@@ -331,10 +331,10 @@
                     </if>
                 </foreach>
             </trim>
-            <trim prefix="serviceAprParams=(case" suffix="ELSE serviceAprParams end),">
+            <trim prefix="serviceApiParams=(case" suffix="ELSE serviceApiParams end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
-                    <if test="(colPickMode==0 and item.containsKey('serviceAprParams')) or (colPickMode==1 and !item.containsKey('serviceAprParams'))">
-                        when a.id=#{item.id} then #{item.serviceAprParams}
+                    <if test="(colPickMode==0 and item.containsKey('serviceApiParams')) or (colPickMode==1 and !item.containsKey('serviceApiParams'))">
+                        when a.id=#{item.id} then #{item.serviceApiParams}
                     </if>
                 </foreach>
             </trim>
@@ -844,23 +844,23 @@
             </foreach>
         </if>
 
-        <if test="conditionParamRef.containsKey('serviceAprParams')">
-            <if test="conditionParamRef.serviceAprParams != null and conditionParamRef.serviceAprParams != ''">
-                ${_conditionType_} a.serviceAprParams like #{${_conditionParam_}.serviceAprParams}
+        <if test="conditionParamRef.containsKey('serviceApiParams')">
+            <if test="conditionParamRef.serviceApiParams != null and conditionParamRef.serviceApiParams != ''">
+                ${_conditionType_} a.serviceApiParams like #{${_conditionParam_}.serviceApiParams}
             </if>
-            <if test="conditionParamRef.serviceAprParams == null">
-                ${_conditionType_} a.serviceAprParams is null
+            <if test="conditionParamRef.serviceApiParams == null">
+                ${_conditionType_} a.serviceApiParams is null
             </if>
         </if>
-        <if test="conditionParamRef.containsKey('serviceAprParamsList') and conditionParamRef.serviceAprParamsList.size() > 0">
-            ${_conditionType_} a.serviceAprParams in
-            <foreach collection="conditionParamRef.serviceAprParamsList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('serviceApiParamsList') and conditionParamRef.serviceApiParamsList.size() > 0">
+            ${_conditionType_} a.serviceApiParams in
+            <foreach collection="conditionParamRef.serviceApiParamsList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
-        <if test="conditionParamRef.containsKey('serviceAprParamsNotList') and conditionParamRef.serviceAprParamsNotList.size() > 0">
-            ${_conditionType_} a.serviceAprParams not in
-            <foreach collection="conditionParamRef.serviceAprParamsNotList" open="(" close=")" index="index" item="item" separator=",">
+        <if test="conditionParamRef.containsKey('serviceApiParamsNotList') and conditionParamRef.serviceApiParamsNotList.size() > 0">
+            ${_conditionType_} a.serviceApiParams not in
+            <foreach collection="conditionParamRef.serviceApiParamsNotList" open="(" close=")" index="index" item="item" separator=",">
                 #{item}
             </foreach>
         </if>
@@ -1036,9 +1036,9 @@
                     <if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if>
                     ,
                 </if>
-                <if test="orderCol.containsKey('serviceAprParams')">
-                    a.serviceAprParams
-                    <if test='orderCol.serviceAprParams != null and "DESC".equalsIgnoreCase(orderCol.serviceAprParams)'>DESC</if>
+                <if test="orderCol.containsKey('serviceApiParams')">
+                    a.serviceApiParams
+                    <if test='orderCol.serviceApiParams != null and "DESC".equalsIgnoreCase(orderCol.serviceApiParams)'>DESC</if>
                     ,
                 </if>
                 <if test="orderCol.containsKey('createTime')">