diff --git a/portal-manager/db/product_db.sql b/portal-manager/db/product_db.sql
index 30fa12febfb71e937cf989fe07dae0a1b8e9b62d..e6eae69af308e45d63cf9afca4408ea77ec86ab7 100644
--- a/portal-manager/db/product_db.sql
+++ b/portal-manager/db/product_db.sql
@@ -84,3 +84,6 @@ CREATE TABLE `mortals_xhx_product_document` (
`updateTime` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='浜у搧璧勬枡琛�';
+
+ALTER TABLE `mortals_xhx_product_interface` ADD COLUMN `normalResponse` text DEFAULT NULL COMMENT '姝ｅ父杩斿洖绀轰緥' AFTER `remark`,
+ ADD COLUMN `abnormalResponse` text DEFAULT NULL COMMENT '寮傚父杩斿洖绀轰緥' AFTER `normalResponse`;
diff --git a/portal-manager/src/main/java/com/mortals/xhx/module/product/model/ProductInterfaceEntity.java b/portal-manager/src/main/java/com/mortals/xhx/module/product/model/ProductInterfaceEntity.java
index 072b4d676eb826f963cba9eb2e43dfcf280c7d2c..f141c0c3cbc3db5f71ecc4ef60e35aa47f0d20cc 100644
--- a/portal-manager/src/main/java/com/mortals/xhx/module/product/model/ProductInterfaceEntity.java
+++ b/portal-manager/src/main/java/com/mortals/xhx/module/product/model/ProductInterfaceEntity.java
@@ -1,13 +1,13 @@
package com.mortals.xhx.module.product.model;
-
import com.mortals.xhx.module.product.model.vo.ProductInterfaceVo;
+import lombok.Data;
/**
* 浜у搧鎺ュ彛瀹炰綋瀵硅薄
*
* @author zxfei
- * @date 2023-05-16
+ * @date 2023-05-29
*/
-
+@Data
public class ProductInterfaceEntity extends ProductInterfaceVo {
private static final long serialVersionUID = 1L;
@@ -83,266 +83,14 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
* 鎺ュ彛鎻忚堪
*/
private String remark;
-
-
-
- public ProductInterfaceEntity(){}
- /**
- * 鑾峰彇 浜у搧id
- * @return Long
- */
- public Long getProductId(){
- return productId;
- }
- /**
- * 璁剧疆 浜у搧id
- * @param productId
- */
- public void setProductId(Long productId){
- this.productId = productId;
- }
- /**
- * 鑾峰彇 鎺ュ彛鍚嶇О
- * @return String
- */
- public String getInterfaceName(){
- return interfaceName;
- }
- /**
- * 璁剧疆 鎺ュ彛鍚嶇О
- * @param interfaceName
- */
- public void setInterfaceName(String interfaceName){
- this.interfaceName = interfaceName;
- }
- /**
- * 鑾峰彇 鐗堟湰鍙�
- * @return String
- */
- public String getVersionNumber(){
- return versionNumber;
- }
- /**
- * 璁剧疆 鐗堟湰鍙�
- * @param versionNumber
- */
- public void setVersionNumber(String versionNumber){
- this.versionNumber = versionNumber;
- }
/**
- * 鑾峰彇 璇锋眰绫诲瀷1:POST,2:GET
- * @return Integer
+ * 姝ｅ父杩斿洖绀轰緥
*/
- public Integer getRequestType(){
- return requestType;
- }
- /**
- * 璁剧疆 璇锋眰绫诲瀷1:POST,2:GET
- * @param requestType
- */
- public void setRequestType(Integer requestType){
- this.requestType = requestType;
- }
- /**
- * 鑾峰彇 璇锋眰鍗忚1:HTTP,2:HTTPS
- * @return Integer
- */
- public Integer getRequestProtocol(){
- return requestProtocol;
- }
+ private String normalResponse;
/**
- * 璁剧疆 璇锋眰鍗忚1:HTTP,2:HTTPS
- * @param requestProtocol
+ * 寮傚父杩斿洖绀轰緥
*/
- public void setRequestProtocol(Integer requestProtocol){
- this.requestProtocol = requestProtocol;
- }
- /**
- * 鑾峰彇 璇锋眰璺緞
- * @return String
- */
- public String getRequestUrl(){
- return requestUrl;
- }
- /**
- * 璁剧疆 璇锋眰璺緞
- * @param requestUrl
- */
- public void setRequestUrl(String requestUrl){
- this.requestUrl = requestUrl;
- }
- /**
- * 鑾峰彇 瓒呮椂鏃堕棿锛堢锛�
- * @return Long
- */
- public Long getTimeoutValue(){
- return timeoutValue;
- }
- /**
- * 璁剧疆 瓒呮椂鏃堕棿锛堢锛�
- * @param timeoutValue
- */
- public void setTimeoutValue(Long timeoutValue){
- this.timeoutValue = timeoutValue;
- }
- /**
- * 鑾峰彇 闄愭祦绛栫暐1:鍒嗛挓,2:灏忔椂
- * @return Integer
- */
- public Integer getLimitStrategy(){
- return limitStrategy;
- }
- /**
- * 璁剧疆 闄愭祦绛栫暐1:鍒嗛挓,2:灏忔椂
- * @param limitStrategy
- */
- public void setLimitStrategy(Integer limitStrategy){
- this.limitStrategy = limitStrategy;
- }
- /**
- * 鑾峰彇 璁块棶缃戠粶1浜掕仈缃�2鏀垮姟缃�
- * @return String
- */
- public String getNetwork(){
- return network;
- }
- /**
- * 璁剧疆 璁块棶缃戠粶1浜掕仈缃�2鏀垮姟缃�
- * @param network
- */
- public void setNetwork(String network){
- this.network = network;
- }
- /**
- * 鑾峰彇 鎺ュ彛鎻忚堪
- * @return String
- */
- public String getDescription(){
- return description;
- }
- /**
- * 璁剧疆 鎺ュ彛鎻忚堪
- * @param description
- */
- public void setDescription(String description){
- this.description = description;
- }
- /**
- * 鑾峰彇 鍐呭绫诲瀷
- * @return String
- */
- public String getContentType(){
- return contentType;
- }
- /**
- * 璁剧疆 鍐呭绫诲瀷
- * @param contentType
- */
- public void setContentType(String contentType){
- this.contentType = contentType;
- }
- /**
- * 鑾峰彇 鏍囩
- * @return Integer
- */
- public Integer getInterfaceTag(){
- return interfaceTag;
- }
- /**
- * 璁剧疆 鏍囩
- * @param interfaceTag
- */
- public void setInterfaceTag(Integer interfaceTag){
- this.interfaceTag = interfaceTag;
- }
- /**
- * 鑾峰彇 鏉ユ簮1鑷湁2闈炶嚜鏈�
- * @return Integer
- */
- public Integer getInterfaceSource(){
- return interfaceSource;
- }
- /**
- * 璁剧疆 鏉ユ簮1鑷湁2闈炶嚜鏈�
- * @param interfaceSource
- */
- public void setInterfaceSource(Integer interfaceSource){
- this.interfaceSource = interfaceSource;
- }
- /**
- * 鑾峰彇 鍏ュ弬鏄惁鍔犲瘑
- * @return Integer
- */
- public Integer getInEncrypt(){
- return inEncrypt;
- }
- /**
- * 璁剧疆 鍏ュ弬鏄惁鍔犲瘑
- * @param inEncrypt
- */
- public void setInEncrypt(Integer inEncrypt){
- this.inEncrypt = inEncrypt;
- }
- /**
- * 鑾峰彇 璇锋眰鍙傛暟
- * @return String
- */
- public String getRequestParameters(){
- return requestParameters;
- }
- /**
- * 璁剧疆 璇锋眰鍙傛暟
- * @param requestParameters
- */
- public void setRequestParameters(String requestParameters){
- this.requestParameters = requestParameters;
- }
- /**
- * 鑾峰彇 鍑哄弬鏄惁鍔犲瘑
- * @return Integer
- */
- public Integer getOutEncrypt(){
- return outEncrypt;
- }
- /**
- * 璁剧疆 鍑哄弬鏄惁鍔犲瘑
- * @param outEncrypt
- */
- public void setOutEncrypt(Integer outEncrypt){
- this.outEncrypt = outEncrypt;
- }
- /**
- * 鑾峰彇 鍝嶅簲鏁版嵁
- * @return String
- */
- public String getResponseParameters(){
- return responseParameters;
- }
- /**
- * 璁剧疆 鍝嶅簲鏁版嵁
- * @param responseParameters
- */
- public void setResponseParameters(String responseParameters){
- this.responseParameters = responseParameters;
- }
- /**
- * 鑾峰彇 鎺ュ彛鎻忚堪
- * @return String
- */
- public String getRemark(){
- return remark;
- }
- /**
- * 璁剧疆 鎺ュ彛鎻忚堪
- * @param remark
- */
- public void setRemark(String remark){
- this.remark = remark;
- }
-
-
-
-
+ private String abnormalResponse;
@Override
public int hashCode() {
return this.getId().hashCode();
@@ -359,32 +107,9 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
return false;
}
- public String toString(){
- StringBuilder sb = new StringBuilder("");
- sb.append(",productId:").append(getProductId());
- sb.append(",interfaceName:").append(getInterfaceName());
- sb.append(",versionNumber:").append(getVersionNumber());
- sb.append(",requestType:").append(getRequestType());
- sb.append(",requestProtocol:").append(getRequestProtocol());
- sb.append(",requestUrl:").append(getRequestUrl());
- sb.append(",timeoutValue:").append(getTimeoutValue());
- sb.append(",limitStrategy:").append(getLimitStrategy());
- sb.append(",network:").append(getNetwork());
- sb.append(",description:").append(getDescription());
- sb.append(",contentType:").append(getContentType());
- sb.append(",interfaceTag:").append(getInterfaceTag());
- sb.append(",interfaceSource:").append(getInterfaceSource());
- sb.append(",inEncrypt:").append(getInEncrypt());
- sb.append(",requestParameters:").append(getRequestParameters());
- sb.append(",outEncrypt:").append(getOutEncrypt());
- sb.append(",responseParameters:").append(getResponseParameters());
- sb.append(",remark:").append(getRemark());
- return sb.toString();
- }
-
public void initAttrValue(){
- this.productId = null;
+ this.productId = -1L;
this.interfaceName = "";
@@ -396,9 +121,9 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
this.requestUrl = "";
- this.timeoutValue = null;
+ this.timeoutValue = -1L;
- this.limitStrategy = null;
+ this.limitStrategy = -1;
this.network = "";
@@ -406,18 +131,22 @@ public class ProductInterfaceEntity extends ProductInterfaceVo {
this.contentType = "";
- this.interfaceTag = null;
+ this.interfaceTag = -1;
this.interfaceSource = 1;
- this.inEncrypt = null;
+ this.inEncrypt = -1;
this.requestParameters = "";
- this.outEncrypt = null;
+ this.outEncrypt = -1;
this.responseParameters = "";
this.remark = "";
+
+ this.normalResponse = "";
+
+ this.abnormalResponse = "";
}
}
\ No newline at end of file
diff --git a/portal-manager/src/main/java/com/mortals/xhx/module/product/model/ProductInterfaceQuery.java b/portal-manager/src/main/java/com/mortals/xhx/module/product/model/ProductInterfaceQuery.java
index 4751874f52f08e561181f8dd54d30f9d858177cd..0f162e3e0dd4ce162f8b2f03d06270850b851092 100644
--- a/portal-manager/src/main/java/com/mortals/xhx/module/product/model/ProductInterfaceQuery.java
+++ b/portal-manager/src/main/java/com/mortals/xhx/module/product/model/ProductInterfaceQuery.java
@@ -5,7 +5,7 @@ import java.util.List;
* 浜у搧鎺ュ彛鏌ヨ瀵硅薄
*
* @author zxfei
- * @date 2023-05-16
+ * @date 2023-05-29
*/
public class ProductInterfaceQuery extends ProductInterfaceEntity {
/** 寮€濮� 搴忓彿锛屼富閿紝鑷闀� */
@@ -245,6 +245,16 @@ public class ProductInterfaceQuery extends ProductInterfaceEntity {
/** 缁撴潫 鏇存柊鏃堕棿 */
private String updateTimeEnd;
+ /** 姝ｅ父杩斿洖绀轰緥 */
+ private List<String> normalResponseList;
+
+ /** 姝ｅ父杩斿洖绀轰緥鎺掗櫎鍒楄〃 */
+ private List <String> normalResponseNotList;
+ /** 寮傚父杩斿洖绀轰緥 */
+ private List<String> abnormalResponseList;
+
+ /** 寮傚父杩斿洖绀轰緥鎺掗櫎鍒楄〃 */
+ private List <String> abnormalResponseNotList;
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ProductInterfaceQuery> orConditionList;
@@ -1577,6 +1587,70 @@ public class ProductInterfaceQuery extends ProductInterfaceEntity {
this.updateTimeEnd = updateTimeEnd;
}
+ /**
+ * 鑾峰彇 姝ｅ父杩斿洖绀轰緥
+ * @return normalResponseList
+ */
+ public List<String> getNormalResponseList(){
+ return this.normalResponseList;
+ }
+
+ /**
+ * 璁剧疆 姝ｅ父杩斿洖绀轰緥
+ * @param normalResponseList
+ */
+ public void setNormalResponseList(List<String> normalResponseList){
+ this.normalResponseList = normalResponseList;
+ }
+
+ /**
+ * 鑾峰彇 姝ｅ父杩斿洖绀轰緥
+ * @return normalResponseNotList
+ */
+ public List<String> getNormalResponseNotList(){
+ return this.normalResponseNotList;
+ }
+
+ /**
+ * 璁剧疆 姝ｅ父杩斿洖绀轰緥
+ * @param normalResponseNotList
+ */
+ public void setNormalResponseNotList(List<String> normalResponseNotList){
+ this.normalResponseNotList = normalResponseNotList;
+ }
+
+ /**
+ * 鑾峰彇 寮傚父杩斿洖绀轰緥
+ * @return abnormalResponseList
+ */
+ public List<String> getAbnormalResponseList(){
+ return this.abnormalResponseList;
+ }
+
+ /**
+ * 璁剧疆 寮傚父杩斿洖绀轰緥
+ * @param abnormalResponseList
+ */
+ public void setAbnormalResponseList(List<String> abnormalResponseList){
+ this.abnormalResponseList = abnormalResponseList;
+ }
+
+ /**
+ * 鑾峰彇 寮傚父杩斿洖绀轰緥
+ * @return abnormalResponseNotList
+ */
+ public List<String> getAbnormalResponseNotList(){
+ return this.abnormalResponseNotList;
+ }
+
+ /**
+ * 璁剧疆 寮傚父杩斿洖绀轰緥
+ * @param abnormalResponseNotList
+ */
+ public void setAbnormalResponseNotList(List<String> abnormalResponseNotList){
+ this.abnormalResponseNotList = abnormalResponseNotList;
+ }
+
/**
* 璁剧疆 搴忓彿锛屼富閿紝鑷闀�
* @param id
@@ -2398,6 +2472,44 @@ public class ProductInterfaceQuery extends ProductInterfaceEntity {
}
+
+ /**
+ * 璁剧疆 姝ｅ父杩斿洖绀轰緥
+ * @param normalResponse
+ */
+ public ProductInterfaceQuery normalResponse(String normalResponse){
+ setNormalResponse(normalResponse);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 姝ｅ父杩斿洖绀轰緥
+ * @param normalResponseList
+ */
+ public ProductInterfaceQuery normalResponseList(List<String> normalResponseList){
+ this.normalResponseList = normalResponseList;
+ return this;
+ }
+
+
+ /**
+ * 璁剧疆 寮傚父杩斿洖绀轰緥
+ * @param abnormalResponse
+ */
+ public ProductInterfaceQuery abnormalResponse(String abnormalResponse){
+ setAbnormalResponse(abnormalResponse);
+ return this;
+ }
+
+ /**
+ * 璁剧疆 寮傚父杩斿洖绀轰緥
+ * @param abnormalResponseList
+ */
+ public ProductInterfaceQuery abnormalResponseList(List<String> abnormalResponseList){
+ this.abnormalResponseList = abnormalResponseList;
+ return this;
+ }
+
/**
* 鑾峰彇 OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
diff --git a/portal-manager/src/main/resources/sqlmap/module/product/ProductInterfaceMapper.xml b/portal-manager/src/main/resources/sqlmap/module/product/ProductInterfaceMapper.xml
index 13acd93dbc79199d5eeb6c48110cd680348239cd..77fe60f3d3ab3d3700f58ca89781cc13dcce6b63 100644
--- a/portal-manager/src/main/resources/sqlmap/module/product/ProductInterfaceMapper.xml
+++ b/portal-manager/src/main/resources/sqlmap/module/product/ProductInterfaceMapper.xml
@@ -28,6 +28,8 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
+ <result property="normalResponse" column="normalResponse" />
+ <result property="abnormalResponse" column="abnormalResponse" />
</resultMap>
@@ -104,23 +106,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('normalResponse') or colPickMode == 1 and data.containsKey('normalResponse')))">
+ a.normalResponse,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('abnormalResponse') or colPickMode == 1 and data.containsKey('abnormalResponse')))">
+ a.abnormalResponse,
+ </if>
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
<insert id="insert" parameterType="ProductInterfaceEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_product_interface
- (productId,interfaceName,versionNumber,requestType,requestProtocol,requestUrl,timeoutValue,limitStrategy,network,description,contentType,interfaceTag,interfaceSource,inEncrypt,requestParameters,outEncrypt,responseParameters,remark,createUserId,createTime,updateUserId,updateTime)
+ (productId,interfaceName,versionNumber,requestType,requestProtocol,requestUrl,timeoutValue,limitStrategy,network,description,contentType,interfaceTag,interfaceSource,inEncrypt,requestParameters,outEncrypt,responseParameters,remark,createUserId,createTime,updateUserId,updateTime,normalResponse,abnormalResponse)
VALUES
- (#{productId},#{interfaceName},#{versionNumber},#{requestType},#{requestProtocol},#{requestUrl},#{timeoutValue},#{limitStrategy},#{network},#{description},#{contentType},#{interfaceTag},#{interfaceSource},#{inEncrypt},#{requestParameters},#{outEncrypt},#{responseParameters},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+ (#{productId},#{interfaceName},#{versionNumber},#{requestType},#{requestProtocol},#{requestUrl},#{timeoutValue},#{limitStrategy},#{network},#{description},#{contentType},#{interfaceTag},#{interfaceSource},#{inEncrypt},#{requestParameters},#{outEncrypt},#{responseParameters},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{normalResponse},#{abnormalResponse})
</insert>
<!-- 鎵归噺鏂板 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_product_interface
- (productId,interfaceName,versionNumber,requestType,requestProtocol,requestUrl,timeoutValue,limitStrategy,network,description,contentType,interfaceTag,interfaceSource,inEncrypt,requestParameters,outEncrypt,responseParameters,remark,createUserId,createTime,updateUserId,updateTime)
+ (productId,interfaceName,versionNumber,requestType,requestProtocol,requestUrl,timeoutValue,limitStrategy,network,description,contentType,interfaceTag,interfaceSource,inEncrypt,requestParameters,outEncrypt,responseParameters,remark,createUserId,createTime,updateUserId,updateTime,normalResponse,abnormalResponse)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
- (#{item.productId},#{item.interfaceName},#{item.versionNumber},#{item.requestType},#{item.requestProtocol},#{item.requestUrl},#{item.timeoutValue},#{item.limitStrategy},#{item.network},#{item.description},#{item.contentType},#{item.interfaceTag},#{item.interfaceSource},#{item.inEncrypt},#{item.requestParameters},#{item.outEncrypt},#{item.responseParameters},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+ (#{item.productId},#{item.interfaceName},#{item.versionNumber},#{item.requestType},#{item.requestProtocol},#{item.requestUrl},#{item.timeoutValue},#{item.limitStrategy},#{item.network},#{item.description},#{item.contentType},#{item.interfaceTag},#{item.interfaceSource},#{item.inEncrypt},#{item.requestParameters},#{item.outEncrypt},#{item.responseParameters},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.normalResponse},#{item.abnormalResponse})
</foreach>
</insert>
@@ -229,6 +237,12 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
+ <if test="(colPickMode==0 and data.containsKey('normalResponse')) or (colPickMode==1 and !data.containsKey('normalResponse'))">
+ a.normalResponse=#{data.normalResponse},
+ </if>
+ <if test="(colPickMode==0 and data.containsKey('abnormalResponse')) or (colPickMode==1 and !data.containsKey('abnormalResponse'))">
+ a.abnormalResponse=#{data.abnormalResponse},
+ </if>
</trim>
<trim suffixOverrides="where" suffix="">
where
@@ -450,6 +464,20 @@
</if>
</foreach>
</trim>
+ <trim prefix="normalResponse=(case" suffix="ELSE normalResponse end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('normalResponse')) or (colPickMode==1 and !item.containsKey('normalResponse'))">
+ when a.id=#{item.id} then #{item.normalResponse}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="abnormalResponse=(case" suffix="ELSE abnormalResponse end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('abnormalResponse')) or (colPickMode==1 and !item.containsKey('abnormalResponse'))">
+ when a.id=#{item.id} then #{item.abnormalResponse}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1109,6 +1137,48 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
+
+ <if test="conditionParamRef.containsKey('normalResponse')">
+ <if test="conditionParamRef.normalResponse != null and conditionParamRef.normalResponse != ''">
+ ${_conditionType_} a.normalResponse like #{${_conditionParam_}.normalResponse}
+ </if>
+ <if test="conditionParamRef.normalResponse == null">
+ ${_conditionType_} a.normalResponse is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('normalResponseList') and conditionParamRef.normalResponseList.size() > 0">
+ ${_conditionType_} a.normalResponse in
+ <foreach collection="conditionParamRef.normalResponseList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('normalResponseNotList') and conditionParamRef.normalResponseNotList.size() > 0">
+ ${_conditionType_} a.normalResponse not in
+ <foreach collection="conditionParamRef.normalResponseNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="conditionParamRef.containsKey('abnormalResponse')">
+ <if test="conditionParamRef.abnormalResponse != null and conditionParamRef.abnormalResponse != ''">
+ ${_conditionType_} a.abnormalResponse like #{${_conditionParam_}.abnormalResponse}
+ </if>
+ <if test="conditionParamRef.abnormalResponse == null">
+ ${_conditionType_} a.abnormalResponse is null
+ </if>
+ </if>
+ <if test="conditionParamRef.containsKey('abnormalResponseList') and conditionParamRef.abnormalResponseList.size() > 0">
+ ${_conditionType_} a.abnormalResponse in
+ <foreach collection="conditionParamRef.abnormalResponseList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('abnormalResponseNotList') and conditionParamRef.abnormalResponseNotList.size() > 0">
+ ${_conditionType_} a.abnormalResponse not in
+ <foreach collection="conditionParamRef.abnormalResponseNotList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
@@ -1237,6 +1307,16 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
+ <if test="orderCol.containsKey('normalResponse')">
+ a.normalResponse
+ <if test='orderCol.normalResponse != null and "DESC".equalsIgnoreCase(orderCol.normalResponse)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('abnormalResponse')">
+ a.abnormalResponse
+ <if test='orderCol.abnormalResponse != null and "DESC".equalsIgnoreCase(orderCol.abnormalResponse)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>