Skip to content

S
smart_gov_platform
Commit 2af0acbc authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

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

parents 49c3e06b fa0011c9
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 111 deletions
base-manager/db/add.sql
View file @ 2af0acbc
...@@ -206,8 +206,8 @@ ALTER TABLE `mortals_sys_model` ADD COLUMN `type` tinyint(2) DEFAULT '1' COMME ...@@ -206,8 +206,8 @@ ALTER TABLE `mortals_sys_model` ADD COLUMN `type` tinyint(2) DEFAULT '1' COMME
2023-9-11 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 `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 `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
View file @ 2af0acbc
...@@ -13,7 +13,7 @@ import lombok.Data; ...@@ -13,7 +13,7 @@ import lombok.Data;
* 自助终端应用模板信息字段实体对象 * 自助终端应用模板信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-09-12 * @date 2023-09-13
*/ */
@Data @Data
public class AppInfoFieldEntity extends AppInfoFieldVo { public class AppInfoFieldEntity extends AppInfoFieldVo {
...@@ -78,7 +78,7 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -78,7 +78,7 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
/** /**
* 事件服务接口请求参数 * 事件服务接口请求参数
*/ */
private String serviceAprParams; private String serviceApiParams;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -110,6 +110,6 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -110,6 +110,6 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
this.fieldOrderNo = 1; this.fieldOrderNo = 1;
this.remark = ""; this.remark = "";
this.serviceApi = ""; 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
View file @ 2af0acbc
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoFieldEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
* 自助终端应用模板信息字段查询对象 * 自助终端应用模板信息字段查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-09-12 * @date 2023-09-13
*/ */
public class AppInfoFieldQuery extends AppInfoFieldEntity { public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -145,10 +145,10 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -145,10 +145,10 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 事件服务接口请求地址排除列表 */ /** 事件服务接口请求地址排除列表 */
private List <String> serviceApiNotList; private List <String> serviceApiNotList;
/** 事件服务接口请求参数 */ /** 事件服务接口请求参数 */
private List<String> serviceAprParamsList; private List<String> serviceApiParamsList;
/** 事件服务接口请求参数排除列表 */ /** 事件服务接口请求参数排除列表 */
private List <String> serviceAprParamsNotList; private List <String> serviceApiParamsNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -975,34 +975,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -975,34 +975,34 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** /**
* 获取 事件服务接口请求参数 * 获取 事件服务接口请求参数
* @return serviceAprParamsList * @return serviceApiParamsList
*/ */
public List<String> getServiceAprParamsList(){ public List<String> getServiceApiParamsList(){
return this.serviceAprParamsList; return this.serviceApiParamsList;
} }
/** /**
* 设置 事件服务接口请求参数 * 设置 事件服务接口请求参数
* @param serviceAprParamsList * @param serviceApiParamsList
*/ */
public void setServiceAprParamsList(List<String> serviceAprParamsList){ public void setServiceApiParamsList(List<String> serviceApiParamsList){
this.serviceAprParamsList = serviceAprParamsList; this.serviceApiParamsList = serviceApiParamsList;
} }
/** /**
* 获取 事件服务接口请求参数 * 获取 事件服务接口请求参数
* @return serviceAprParamsNotList * @return serviceApiParamsNotList
*/ */
public List<String> getServiceAprParamsNotList(){ public List<String> getServiceApiParamsNotList(){
return this.serviceAprParamsNotList; return this.serviceApiParamsNotList;
} }
/** /**
* 设置 事件服务接口请求参数 * 设置 事件服务接口请求参数
* @param serviceAprParamsNotList * @param serviceApiParamsNotList
*/ */
public void setServiceAprParamsNotList(List<String> serviceAprParamsNotList){ public void setServiceApiParamsNotList(List<String> serviceApiParamsNotList){
this.serviceAprParamsNotList = serviceAprParamsNotList; this.serviceApiParamsNotList = serviceApiParamsNotList;
} }
/** /**
...@@ -1729,19 +1729,19 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -1729,19 +1729,19 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** /**
* 设置 事件服务接口请求参数 * 设置 事件服务接口请求参数
* @param serviceAprParams * @param serviceApiParams
*/ */
public AppInfoFieldQuery serviceAprParams(String serviceAprParams){ public AppInfoFieldQuery serviceApiParams(String serviceApiParams){
setServiceAprParams(serviceAprParams); setServiceApiParams(serviceApiParams);
return this; return this;
} }
/** /**
* 设置 事件服务接口请求参数 * 设置 事件服务接口请求参数
* @param serviceAprParamsList * @param serviceApiParamsList
*/ */
public AppInfoFieldQuery serviceAprParamsList(List<String> serviceAprParamsList){ public AppInfoFieldQuery serviceApiParamsList(List<String> serviceApiParamsList){
this.serviceAprParamsList = serviceAprParamsList; this.serviceApiParamsList = serviceApiParamsList;
return this; return this;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
View file @ 2af0acbc
package com.mortals.xhx.module.app.model; package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import java.math.BigDecimal; import java.math.BigDecimal;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo; import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
import lombok.Data; import lombok.Data;
/** /**
* 自助终端应用模板信息字段实体对象 * 自助终端应用模板信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-09-12 * @date 2023-09-13
*/ */
@Data @Data
public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
...@@ -83,13 +78,11 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -83,13 +78,11 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
/** /**
* 事件服务接口请求参数，json格式 * 事件服务接口请求参数，json格式
*/ */
private String serviceAprParams; private String serviceApiParams;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == null) return false; if (obj == null) return false;
...@@ -102,7 +95,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -102,7 +95,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
return false; return false;
} }
public void initAttrValue() { public void initAttrValue(){
this.appId = null; this.appId = null;
this.fieldCode = ""; this.fieldCode = "";
this.fieldName = ""; this.fieldName = "";
...@@ -117,6 +110,6 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -117,6 +110,6 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
this.fieldOrderNo = 1; this.fieldOrderNo = 1;
this.remark = ""; this.remark = "";
this.serviceApi = ""; 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
View file @ 2af0acbc
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
* 自助终端应用模板信息字段查询对象 * 自助终端应用模板信息字段查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-09-12 * @date 2023-09-13
*/ */
public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -145,10 +145,10 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -145,10 +145,10 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 事件服务接口请求地址排除列表 */ /** 事件服务接口请求地址排除列表 */
private List <String> serviceApiNotList; private List <String> serviceApiNotList;
/** 事件服务接口请求参数，json格式 */ /** 事件服务接口请求参数，json格式 */
private List<String> serviceAprParamsList; private List<String> serviceApiParamsList;
/** 事件服务接口请求参数，json格式排除列表 */ /** 事件服务接口请求参数，json格式排除列表 */
private List <String> serviceAprParamsNotList; private List <String> serviceApiParamsNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -975,34 +975,34 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -975,34 +975,34 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** /**
* 获取 事件服务接口请求参数，json格式 * 获取 事件服务接口请求参数，json格式
* @return serviceAprParamsList * @return serviceApiParamsList
*/ */
public List<String> getServiceAprParamsList(){ public List<String> getServiceApiParamsList(){
return this.serviceAprParamsList; return this.serviceApiParamsList;
} }
/** /**
* 设置 事件服务接口请求参数，json格式 * 设置 事件服务接口请求参数，json格式
* @param serviceAprParamsList * @param serviceApiParamsList
*/ */
public void setServiceAprParamsList(List<String> serviceAprParamsList){ public void setServiceApiParamsList(List<String> serviceApiParamsList){
this.serviceAprParamsList = serviceAprParamsList; this.serviceApiParamsList = serviceApiParamsList;
} }
/** /**
* 获取 事件服务接口请求参数，json格式 * 获取 事件服务接口请求参数，json格式
* @return serviceAprParamsNotList * @return serviceApiParamsNotList
*/ */
public List<String> getServiceAprParamsNotList(){ public List<String> getServiceApiParamsNotList(){
return this.serviceAprParamsNotList; return this.serviceApiParamsNotList;
} }
/** /**
* 设置 事件服务接口请求参数，json格式 * 设置 事件服务接口请求参数，json格式
* @param serviceAprParamsNotList * @param serviceApiParamsNotList
*/ */
public void setServiceAprParamsNotList(List<String> serviceAprParamsNotList){ public void setServiceApiParamsNotList(List<String> serviceApiParamsNotList){
this.serviceAprParamsNotList = serviceAprParamsNotList; this.serviceApiParamsNotList = serviceApiParamsNotList;
} }
/** /**
...@@ -1729,19 +1729,19 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -1729,19 +1729,19 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** /**
* 设置 事件服务接口请求参数，json格式 * 设置 事件服务接口请求参数，json格式
* @param serviceAprParams * @param serviceApiParams
*/ */
public AppInfoTempleteFieldQuery serviceAprParams(String serviceAprParams){ public AppInfoTempleteFieldQuery serviceApiParams(String serviceApiParams){
setServiceAprParams(serviceAprParams); setServiceApiParams(serviceApiParams);
return this; return this;
} }
/** /**
* 设置 事件服务接口请求参数，json格式 * 设置 事件服务接口请求参数，json格式
* @param serviceAprParamsList * @param serviceApiParamsList
*/ */
public AppInfoTempleteFieldQuery serviceAprParamsList(List<String> serviceAprParamsList){ public AppInfoTempleteFieldQuery serviceApiParamsList(List<String> serviceApiParamsList){
this.serviceAprParamsList = serviceAprParamsList; this.serviceApiParamsList = serviceApiParamsList;
return this; return this;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java
View file @ 2af0acbc
...@@ -79,7 +79,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService, ...@@ -79,7 +79,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
protected void doListBefore(AppEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(AppEntity query, Map<String, Object> model, Context context) throws AppException {
String serverName = request.getHeader("server-name"); String serverName = request.getHeader("server-name");
Integer serverPort = DataUtil.converStr2Int(request.getHeader("server-port"), 0); 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.setServerName(serverName);
query.setServerPort(serverPort); query.setServerPort(serverPort);
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml
View file @ 2af0acbc
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<result property="fieldOrderNo" column="fieldOrderNo" /> <result property="fieldOrderNo" column="fieldOrderNo" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="serviceApi" column="serviceApi" /> <result property="serviceApi" column="serviceApi" />
<result property="serviceAprParams" column="serviceAprParams" /> <result property="serviceApiParams" column="serviceApiParams" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
...@@ -77,8 +77,8 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApi') or colPickMode == 1 and data.containsKey('serviceApi')))">
a.serviceApi, a.serviceApi,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceAprParams') or colPickMode == 1 and data.containsKey('serviceAprParams')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApiParams') or colPickMode == 1 and data.containsKey('serviceApiParams')))">
a.serviceAprParams, a.serviceApiParams,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
...@@ -97,18 +97,18 @@ ...@@ -97,18 +97,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppInfoFieldEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppInfoFieldEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app_info_field 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 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>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app_info_field 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 VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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> </foreach>
</insert> </insert>
...@@ -175,8 +175,8 @@ ...@@ -175,8 +175,8 @@
<if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))"> <if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))">
a.serviceApi=#{data.serviceApi}, a.serviceApi=#{data.serviceApi},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('serviceAprParams')) or (colPickMode==1 and !data.containsKey('serviceAprParams'))"> <if test="(colPickMode==0 and data.containsKey('serviceApiParams')) or (colPickMode==1 and !data.containsKey('serviceApiParams'))">
a.serviceAprParams=#{data.serviceAprParams}, a.serviceApiParams=#{data.serviceApiParams},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
...@@ -331,10 +331,10 @@ ...@@ -331,10 +331,10 @@
</if> </if>
</foreach> </foreach>
</trim> </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="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serviceAprParams')) or (colPickMode==1 and !item.containsKey('serviceAprParams'))"> <if test="(colPickMode==0 and item.containsKey('serviceApiParams')) or (colPickMode==1 and !item.containsKey('serviceApiParams'))">
when a.id=#{item.id} then #{item.serviceAprParams} when a.id=#{item.id} then #{item.serviceApiParams}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -844,23 +844,23 @@ ...@@ -844,23 +844,23 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceAprParams')"> <if test="conditionParamRef.containsKey('serviceApiParams')">
<if test="conditionParamRef.serviceAprParams != null and conditionParamRef.serviceAprParams != ''"> <if test="conditionParamRef.serviceApiParams != null and conditionParamRef.serviceApiParams != ''">
${_conditionType_} a.serviceAprParams like #{${_conditionParam_}.serviceAprParams} ${_conditionType_} a.serviceApiParams like #{${_conditionParam_}.serviceApiParams}
</if> </if>
<if test="conditionParamRef.serviceAprParams == null"> <if test="conditionParamRef.serviceApiParams == null">
${_conditionType_} a.serviceAprParams is null ${_conditionType_} a.serviceApiParams is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('serviceAprParamsList') and conditionParamRef.serviceAprParamsList.size() > 0"> <if test="conditionParamRef.containsKey('serviceApiParamsList') and conditionParamRef.serviceApiParamsList.size() > 0">
${_conditionType_} a.serviceAprParams in ${_conditionType_} a.serviceApiParams in
<foreach collection="conditionParamRef.serviceAprParamsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.serviceApiParamsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceAprParamsNotList') and conditionParamRef.serviceAprParamsNotList.size() > 0"> <if test="conditionParamRef.containsKey('serviceApiParamsNotList') and conditionParamRef.serviceApiParamsNotList.size() > 0">
${_conditionType_} a.serviceAprParams not in ${_conditionType_} a.serviceApiParams not in
<foreach collection="conditionParamRef.serviceAprParamsNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.serviceApiParamsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -1036,9 +1036,9 @@ ...@@ -1036,9 +1036,9 @@
<if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if> <if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('serviceAprParams')"> <if test="orderCol.containsKey('serviceApiParams')">
a.serviceAprParams a.serviceApiParams
<if test='orderCol.serviceAprParams != null and "DESC".equalsIgnoreCase(orderCol.serviceAprParams)'>DESC</if> <if test='orderCol.serviceApiParams != null and "DESC".equalsIgnoreCase(orderCol.serviceApiParams)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml
View file @ 2af0acbc
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<result property="fieldOrderNo" column="fieldOrderNo" /> <result property="fieldOrderNo" column="fieldOrderNo" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="serviceApi" column="serviceApi" /> <result property="serviceApi" column="serviceApi" />
<result property="serviceAprParams" column="serviceAprParams" /> <result property="serviceApiParams" column="serviceApiParams" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
...@@ -77,8 +77,8 @@ ...@@ -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')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApi') or colPickMode == 1 and data.containsKey('serviceApi')))">
a.serviceApi, a.serviceApi,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceAprParams') or colPickMode == 1 and data.containsKey('serviceAprParams')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serviceApiParams') or colPickMode == 1 and data.containsKey('serviceApiParams')))">
a.serviceAprParams, a.serviceApiParams,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
...@@ -97,18 +97,18 @@ ...@@ -97,18 +97,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppInfoTempleteFieldEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppInfoTempleteFieldEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app_info_templete_field 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 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>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app_info_templete_field 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 VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <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> </foreach>
</insert> </insert>
...@@ -175,8 +175,8 @@ ...@@ -175,8 +175,8 @@
<if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))"> <if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))">
a.serviceApi=#{data.serviceApi}, a.serviceApi=#{data.serviceApi},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('serviceAprParams')) or (colPickMode==1 and !data.containsKey('serviceAprParams'))"> <if test="(colPickMode==0 and data.containsKey('serviceApiParams')) or (colPickMode==1 and !data.containsKey('serviceApiParams'))">
a.serviceAprParams=#{data.serviceAprParams}, a.serviceApiParams=#{data.serviceApiParams},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
...@@ -331,10 +331,10 @@ ...@@ -331,10 +331,10 @@
</if> </if>
</foreach> </foreach>
</trim> </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="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serviceAprParams')) or (colPickMode==1 and !item.containsKey('serviceAprParams'))"> <if test="(colPickMode==0 and item.containsKey('serviceApiParams')) or (colPickMode==1 and !item.containsKey('serviceApiParams'))">
when a.id=#{item.id} then #{item.serviceAprParams} when a.id=#{item.id} then #{item.serviceApiParams}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -844,23 +844,23 @@ ...@@ -844,23 +844,23 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceAprParams')"> <if test="conditionParamRef.containsKey('serviceApiParams')">
<if test="conditionParamRef.serviceAprParams != null and conditionParamRef.serviceAprParams != ''"> <if test="conditionParamRef.serviceApiParams != null and conditionParamRef.serviceApiParams != ''">
${_conditionType_} a.serviceAprParams like #{${_conditionParam_}.serviceAprParams} ${_conditionType_} a.serviceApiParams like #{${_conditionParam_}.serviceApiParams}
</if> </if>
<if test="conditionParamRef.serviceAprParams == null"> <if test="conditionParamRef.serviceApiParams == null">
${_conditionType_} a.serviceAprParams is null ${_conditionType_} a.serviceApiParams is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('serviceAprParamsList') and conditionParamRef.serviceAprParamsList.size() > 0"> <if test="conditionParamRef.containsKey('serviceApiParamsList') and conditionParamRef.serviceApiParamsList.size() > 0">
${_conditionType_} a.serviceAprParams in ${_conditionType_} a.serviceApiParams in
<foreach collection="conditionParamRef.serviceAprParamsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.serviceApiParamsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('serviceAprParamsNotList') and conditionParamRef.serviceAprParamsNotList.size() > 0"> <if test="conditionParamRef.containsKey('serviceApiParamsNotList') and conditionParamRef.serviceApiParamsNotList.size() > 0">
${_conditionType_} a.serviceAprParams not in ${_conditionType_} a.serviceApiParams not in
<foreach collection="conditionParamRef.serviceAprParamsNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.serviceApiParamsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -1036,9 +1036,9 @@ ...@@ -1036,9 +1036,9 @@
<if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if> <if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('serviceAprParams')"> <if test="orderCol.containsKey('serviceApiParams')">
a.serviceAprParams a.serviceApiParams
<if test='orderCol.serviceAprParams != null and "DESC".equalsIgnoreCase(orderCol.serviceAprParams)'>DESC</if> <if test='orderCol.serviceApiParams != null and "DESC".equalsIgnoreCase(orderCol.serviceApiParams)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment