用户行为分析客户埋点接口

portal-manager/doc/api.md

@@ -4619,7 +4619,7 @@ msg|String|消息|-
 
 **内容类型:** application/json;charset=utf-8
 
-**简要描述:** 保存或更新页面事件记录：id为空时为新增保存，否则为更新提交
+**简要描述:** 保存页面事件记录
 
 **请求参数:**
 

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageAccessDepthEntity.java

@@ -10,12 +10,16 @@ import com.mortals.xhx.module.page.model.vo.PageAccessDepthVo;
 * 产品页面配置实体对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 
 public class PageAccessDepthEntity extends PageAccessDepthVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 设备编码
+    */
+    private String deviceNum;
     /**
     * 产品id
     */
@@ -41,6 +45,20 @@ public class PageAccessDepthEntity extends PageAccessDepthVo {
 
     public PageAccessDepthEntity(){}
     /**
+    * 获取 设备编码
+    * @return String
+    */
+    public String getDeviceNum(){
+        return deviceNum;
+    }
+    /**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public void setDeviceNum(String deviceNum){
+        this.deviceNum = deviceNum;
+    }
+    /**
     * 获取 产品id
     * @return Long
     */
@@ -98,7 +116,7 @@ public class PageAccessDepthEntity extends PageAccessDepthVo {
     }
     /**
     * 获取 本次访问深度
-    * @return String
+    * @return Integer
     */
     public Integer getDepthValue(){
         return depthValue;
@@ -132,6 +150,7 @@ public class PageAccessDepthEntity extends PageAccessDepthVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",deviceNum:").append(getDeviceNum());
         sb.append(",productId:").append(getProductId());
         sb.append(",productName:").append(getProductName());
         sb.append(",pageCode:").append(getPageCode());
@@ -142,6 +161,8 @@ public class PageAccessDepthEntity extends PageAccessDepthVo {
 
     public void initAttrValue(){
 
+            this.deviceNum = "";
+
             this.productId = null;
 
             this.productName = "";

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageAccessDepthQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.page.model.PageAccessDepthEntity;
 * 产品页面配置查询对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 public class PageAccessDepthQuery extends PageAccessDepthEntity {
     /** 开始 序号，主键，自增长 */
@@ -24,6 +24,11 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
     /** 序号，主键，自增长排除列表 */
     private List <Long> idNotList;
 
+    /** 设备编码 */
+    private List<String> deviceNumList;
+
+    /** 设备编码排除列表 */
+    private List <String> deviceNumNotList;
     /** 开始 产品id */
     private Long productIdStart;
 
@@ -54,11 +59,21 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
 
     /** 页面名称排除列表 */
     private List <String> pageNameNotList;
-    /** 本次访问深度 */
-    private List<Integer> depthValueList;
+    /** 开始 本次访问深度 */
+    private Integer depthValueStart;
+
+    /** 结束 本次访问深度 */
+    private Integer depthValueEnd;
+
+    /** 增加 本次访问深度 */
+    private Integer depthValueIncrement;
+
+    /** 本次访问深度列表 */
+    private List <Integer> depthValueList;
 
     /** 本次访问深度排除列表 */
-    private List <String> depthValueNotList;
+    private List <Integer> depthValueNotList;
+
     /** 开始 创建用户 */
     private Long createUserIdStart;
 
@@ -190,6 +205,38 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
     }
 
 
+    /**
+    * 获取 设备编码
+    * @return deviceNumList
+    */
+    public List<String> getDeviceNumList(){
+        return this.deviceNumList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public void setDeviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+    }
+
+    /**
+    * 获取 设备编码
+    * @return deviceNumNotList
+    */
+    public List<String> getDeviceNumNotList(){
+        return this.deviceNumNotList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumNotList
+    */
+    public void setDeviceNumNotList(List<String> deviceNumNotList){
+        this.deviceNumNotList = deviceNumNotList;
+    }
+
     /**
     * 获取 开始 产品id
     * @return productIdStart
@@ -367,6 +414,54 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
         this.pageNameNotList = pageNameNotList;
     }
 
+    /**
+    * 获取 开始 本次访问深度
+    * @return depthValueStart
+    */
+    public Integer getDepthValueStart(){
+        return this.depthValueStart;
+    }
+
+    /**
+    * 设置 开始 本次访问深度
+    * @param depthValueStart
+    */
+    public void setDepthValueStart(Integer depthValueStart){
+        this.depthValueStart = depthValueStart;
+    }
+
+    /**
+    * 获取 结束 本次访问深度
+    * @return $depthValueEnd
+    */
+    public Integer getDepthValueEnd(){
+        return this.depthValueEnd;
+    }
+
+    /**
+    * 设置 结束 本次访问深度
+    * @param depthValueEnd
+    */
+    public void setDepthValueEnd(Integer depthValueEnd){
+        this.depthValueEnd = depthValueEnd;
+    }
+
+    /**
+    * 获取 增加 本次访问深度
+    * @return depthValueIncrement
+    */
+    public Integer getDepthValueIncrement(){
+        return this.depthValueIncrement;
+    }
+
+    /**
+    * 设置 增加 本次访问深度
+    * @param depthValueIncrement
+    */
+    public void setDepthValueIncrement(Integer depthValueIncrement){
+        this.depthValueIncrement = depthValueIncrement;
+    }
+
     /**
     * 获取 本次访问深度
     * @return depthValueList
@@ -387,7 +482,7 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
     * 获取 本次访问深度
     * @return depthValueNotList
     */
-    public List<String> getDepthValueNotList(){
+    public List<Integer> getDepthValueNotList(){
         return this.depthValueNotList;
     }
 
@@ -395,10 +490,11 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
     * 设置 本次访问深度
     * @param depthValueNotList
     */
-    public void setDepthValueNotList(List<String> depthValueNotList){
+    public void setDepthValueNotList(List<Integer> depthValueNotList){
         this.depthValueNotList = depthValueNotList;
     }
 
+
     /**
     * 获取 开始 创建用户
     * @return createUserIdStart
@@ -679,6 +775,25 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
         return this;
         }
 
+
+	/**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public PageAccessDepthQuery deviceNum(String deviceNum){
+        setDeviceNum(deviceNum);
+		return this;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public PageAccessDepthQuery deviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+		return this;
+    }
+
     /**
     * 设置  产品id
     * @param productId
@@ -790,7 +905,6 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
 		return this;
     }
 
-
     /**
     * 设置  本次访问深度
     * @param depthValue
@@ -800,6 +914,33 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
 		return this;
     }
 	
+	 /**
+    * 设置 开始 本次访问深度
+    * @param depthValueStart
+    */
+    public PageAccessDepthQuery depthValueStart(Integer depthValueStart){
+		this.depthValueStart = depthValueStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 本次访问深度
+    * @param depthValueEnd
+    */
+    public PageAccessDepthQuery depthValueEnd(Integer depthValueEnd){
+		this.depthValueEnd = depthValueEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 本次访问深度
+    * @param depthValueIncrement
+    */
+    public PageAccessDepthQuery depthValueIncrement(Integer depthValueIncrement){
+		this.depthValueIncrement = depthValueIncrement;
+		return this;
+    }
+
     /**
     * 设置 本次访问深度
     * @param depthValueList
@@ -809,6 +950,15 @@ public class PageAccessDepthQuery extends PageAccessDepthEntity {
 		return this;
         }
 
+        /**
+        * 设置 本次访问深度
+        * @param depthValueNotList
+        */
+        public PageAccessDepthQuery depthValueNotList(List<Integer> depthValueNotList){
+        this.depthValueNotList = depthValueNotList;
+        return this;
+        }
+
     /**
     * 设置  创建用户
     * @param createUserId

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageAccessEntity.java

@@ -10,12 +10,16 @@ import com.mortals.xhx.module.page.model.vo.PageAccessVo;
 * 产品页面配置实体对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 
 public class PageAccessEntity extends PageAccessVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 设备编码
+    */
+    private String deviceNum;
     /**
     * 产品id
     */
@@ -41,6 +45,20 @@ public class PageAccessEntity extends PageAccessVo {
 
     public PageAccessEntity(){}
     /**
+    * 获取 设备编码
+    * @return String
+    */
+    public String getDeviceNum(){
+        return deviceNum;
+    }
+    /**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public void setDeviceNum(String deviceNum){
+        this.deviceNum = deviceNum;
+    }
+    /**
     * 获取 产品id
     * @return Long
     */
@@ -132,6 +150,7 @@ public class PageAccessEntity extends PageAccessVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",deviceNum:").append(getDeviceNum());
         sb.append(",productId:").append(getProductId());
         sb.append(",productName:").append(getProductName());
         sb.append(",pageCode:").append(getPageCode());
@@ -142,6 +161,8 @@ public class PageAccessEntity extends PageAccessVo {
 
     public void initAttrValue(){
 
+            this.deviceNum = "";
+
             this.productId = null;
 
             this.productName = "";

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageAccessQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.page.model.PageAccessEntity;
 * 产品页面配置查询对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 public class PageAccessQuery extends PageAccessEntity {
     /** 开始 序号，主键，自增长 */
@@ -24,6 +24,11 @@ public class PageAccessQuery extends PageAccessEntity {
     /** 序号，主键，自增长排除列表 */
     private List <Long> idNotList;
 
+    /** 设备编码 */
+    private List<String> deviceNumList;
+
+    /** 设备编码排除列表 */
+    private List <String> deviceNumNotList;
     /** 开始 产品id */
     private Long productIdStart;
 
@@ -200,6 +205,38 @@ public class PageAccessQuery extends PageAccessEntity {
     }
 
 
+    /**
+    * 获取 设备编码
+    * @return deviceNumList
+    */
+    public List<String> getDeviceNumList(){
+        return this.deviceNumList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public void setDeviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+    }
+
+    /**
+    * 获取 设备编码
+    * @return deviceNumNotList
+    */
+    public List<String> getDeviceNumNotList(){
+        return this.deviceNumNotList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumNotList
+    */
+    public void setDeviceNumNotList(List<String> deviceNumNotList){
+        this.deviceNumNotList = deviceNumNotList;
+    }
+
     /**
     * 获取 开始 产品id
     * @return productIdStart
@@ -738,6 +775,25 @@ public class PageAccessQuery extends PageAccessEntity {
         return this;
         }
 
+
+	/**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public PageAccessQuery deviceNum(String deviceNum){
+        setDeviceNum(deviceNum);
+		return this;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public PageAccessQuery deviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+		return this;
+    }
+
     /**
     * 设置  产品id
     * @param productId

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageEventEntity.java

@@ -10,12 +10,16 @@ import com.mortals.xhx.module.page.model.vo.PageEventVo;
 * 页面事件记录实体对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 
 public class PageEventEntity extends PageEventVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 设备编码
+    */
+    private String deviceNum;
     /**
     * 产品id
     */
@@ -61,6 +65,20 @@ public class PageEventEntity extends PageEventVo {
 
     public PageEventEntity(){}
     /**
+    * 获取 设备编码
+    * @return String
+    */
+    public String getDeviceNum(){
+        return deviceNum;
+    }
+    /**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public void setDeviceNum(String deviceNum){
+        this.deviceNum = deviceNum;
+    }
+    /**
     * 获取 产品id
     * @return Long
     */
@@ -222,6 +240,7 @@ public class PageEventEntity extends PageEventVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",deviceNum:").append(getDeviceNum());
         sb.append(",productId:").append(getProductId());
         sb.append(",productName:").append(getProductName());
         sb.append(",businessCode:").append(getBusinessCode());
@@ -237,6 +256,8 @@ public class PageEventEntity extends PageEventVo {
 
     public void initAttrValue(){
 
+            this.deviceNum = "";
+
             this.productId = null;
 
             this.productName = "";

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageEventQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.page.model.PageEventEntity;
 * 页面事件记录查询对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 public class PageEventQuery extends PageEventEntity {
     /** 开始 序号，主键，自增长 */
@@ -24,6 +24,11 @@ public class PageEventQuery extends PageEventEntity {
     /** 序号，主键，自增长排除列表 */
     private List <Long> idNotList;
 
+    /** 设备编码 */
+    private List<String> deviceNumList;
+
+    /** 设备编码排除列表 */
+    private List <String> deviceNumNotList;
     /** 开始 产品id */
     private Long productIdStart;
 
@@ -225,6 +230,38 @@ public class PageEventQuery extends PageEventEntity {
     }
 
 
+    /**
+    * 获取 设备编码
+    * @return deviceNumList
+    */
+    public List<String> getDeviceNumList(){
+        return this.deviceNumList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public void setDeviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+    }
+
+    /**
+    * 获取 设备编码
+    * @return deviceNumNotList
+    */
+    public List<String> getDeviceNumNotList(){
+        return this.deviceNumNotList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumNotList
+    */
+    public void setDeviceNumNotList(List<String> deviceNumNotList){
+        this.deviceNumNotList = deviceNumNotList;
+    }
+
     /**
     * 获取 开始 产品id
     * @return productIdStart
@@ -923,6 +960,25 @@ public class PageEventQuery extends PageEventEntity {
         return this;
         }
 
+
+	/**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public PageEventQuery deviceNum(String deviceNum){
+        setDeviceNum(deviceNum);
+		return this;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public PageEventQuery deviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+		return this;
+    }
+
     /**
     * 设置  产品id
     * @param productId

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageInfoEntity.java

@@ -10,12 +10,16 @@ import com.mortals.xhx.module.page.model.vo.PageInfoVo;
 * 产品页面配置实体对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 
 public class PageInfoEntity extends PageInfoVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 设备编码
+    */
+    private String deviceNum;
     /**
     * 产品id
     */
@@ -41,6 +45,20 @@ public class PageInfoEntity extends PageInfoVo {
 
     public PageInfoEntity(){}
     /**
+    * 获取 设备编码
+    * @return String
+    */
+    public String getDeviceNum(){
+        return deviceNum;
+    }
+    /**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public void setDeviceNum(String deviceNum){
+        this.deviceNum = deviceNum;
+    }
+    /**
     * 获取 产品id
     * @return Long
     */
@@ -132,6 +150,7 @@ public class PageInfoEntity extends PageInfoVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",deviceNum:").append(getDeviceNum());
         sb.append(",productId:").append(getProductId());
         sb.append(",productName:").append(getProductName());
         sb.append(",pageCode:").append(getPageCode());
@@ -142,6 +161,8 @@ public class PageInfoEntity extends PageInfoVo {
 
     public void initAttrValue(){
 
+            this.deviceNum = "";
+
             this.productId = null;
 
             this.productName = "";

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageInfoQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.page.model.PageInfoEntity;
 * 产品页面配置查询对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 public class PageInfoQuery extends PageInfoEntity {
     /** 开始 序号，主键，自增长 */
@@ -24,6 +24,11 @@ public class PageInfoQuery extends PageInfoEntity {
     /** 序号，主键，自增长排除列表 */
     private List <Long> idNotList;
 
+    /** 设备编码 */
+    private List<String> deviceNumList;
+
+    /** 设备编码排除列表 */
+    private List <String> deviceNumNotList;
     /** 开始 产品id */
     private Long productIdStart;
 
@@ -190,6 +195,38 @@ public class PageInfoQuery extends PageInfoEntity {
     }
 
 
+    /**
+    * 获取 设备编码
+    * @return deviceNumList
+    */
+    public List<String> getDeviceNumList(){
+        return this.deviceNumList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public void setDeviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+    }
+
+    /**
+    * 获取 设备编码
+    * @return deviceNumNotList
+    */
+    public List<String> getDeviceNumNotList(){
+        return this.deviceNumNotList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumNotList
+    */
+    public void setDeviceNumNotList(List<String> deviceNumNotList){
+        this.deviceNumNotList = deviceNumNotList;
+    }
+
     /**
     * 获取 开始 产品id
     * @return productIdStart
@@ -679,6 +716,25 @@ public class PageInfoQuery extends PageInfoEntity {
         return this;
         }
 
+
+	/**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public PageInfoQuery deviceNum(String deviceNum){
+        setDeviceNum(deviceNum);
+		return this;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public PageInfoQuery deviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+		return this;
+    }
+
     /**
     * 设置  产品id
     * @param productId

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageRouteEntity.java

@@ -10,12 +10,16 @@ import com.mortals.xhx.module.page.model.vo.PageRouteVo;
 * 页面路径记录实体对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 
 public class PageRouteEntity extends PageRouteVo {
     private static final long serialVersionUID = 1L;
 
+    /**
+    * 设备编码
+    */
+    private String deviceNum;
     /**
     * 产品id
     */
@@ -45,6 +49,20 @@ public class PageRouteEntity extends PageRouteVo {
 
     public PageRouteEntity(){}
     /**
+    * 获取 设备编码
+    * @return String
+    */
+    public String getDeviceNum(){
+        return deviceNum;
+    }
+    /**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public void setDeviceNum(String deviceNum){
+        this.deviceNum = deviceNum;
+    }
+    /**
     * 获取 产品id
     * @return Long
     */
@@ -116,7 +134,7 @@ public class PageRouteEntity extends PageRouteVo {
     }
     /**
     * 获取 目标页面名称
-    * @return Integer
+    * @return String
     */
     public String getTargetName(){
         return targetName;
@@ -150,6 +168,7 @@ public class PageRouteEntity extends PageRouteVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
+        sb.append(",deviceNum:").append(getDeviceNum());
         sb.append(",productId:").append(getProductId());
         sb.append(",productName:").append(getProductName());
         sb.append(",sourceCode:").append(getSourceCode());
@@ -161,6 +180,8 @@ public class PageRouteEntity extends PageRouteVo {
 
     public void initAttrValue(){
 
+            this.deviceNum = "";
+
             this.productId = null;
 
             this.productName = "";

portal-manager/src/main/java/com/mortals/xhx/module/page/model/PageRouteQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.page.model.PageRouteEntity;
 * 页面路径记录查询对象
 *
 * @author zxfei
-* @date 2023-04-10
+* @date 2023-04-12
 */
 public class PageRouteQuery extends PageRouteEntity {
     /** 开始 序号，主键，自增长 */
@@ -24,6 +24,11 @@ public class PageRouteQuery extends PageRouteEntity {
     /** 序号，主键，自增长排除列表 */
     private List <Long> idNotList;
 
+    /** 设备编码 */
+    private List<String> deviceNumList;
+
+    /** 设备编码排除列表 */
+    private List <String> deviceNumNotList;
     /** 开始 产品id */
     private Long productIdStart;
 
@@ -59,13 +64,11 @@ public class PageRouteQuery extends PageRouteEntity {
 
     /** 目标页面编码（路由）排除列表 */
     private List <String> targetCodeNotList;
-
-    /** 目标页面名称列表 */
-    private List <String> targetNameList;
+    /** 目标页面名称 */
+    private List<String> targetNameList;
 
     /** 目标页面名称排除列表 */
     private List <String> targetNameNotList;
-
     /** 开始 创建用户 */
     private Long createUserIdStart;
 
@@ -197,6 +200,38 @@ public class PageRouteQuery extends PageRouteEntity {
     }
 
 
+    /**
+    * 获取 设备编码
+    * @return deviceNumList
+    */
+    public List<String> getDeviceNumList(){
+        return this.deviceNumList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public void setDeviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+    }
+
+    /**
+    * 获取 设备编码
+    * @return deviceNumNotList
+    */
+    public List<String> getDeviceNumNotList(){
+        return this.deviceNumNotList;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumNotList
+    */
+    public void setDeviceNumNotList(List<String> deviceNumNotList){
+        this.deviceNumNotList = deviceNumNotList;
+    }
+
     /**
     * 获取 开始 产品id
     * @return productIdStart
@@ -406,7 +441,6 @@ public class PageRouteQuery extends PageRouteEntity {
         this.targetCodeNotList = targetCodeNotList;
     }
 
-
     /**
     * 获取 目标页面名称
     * @return targetNameList
@@ -439,7 +473,6 @@ public class PageRouteQuery extends PageRouteEntity {
         this.targetNameNotList = targetNameNotList;
     }
 
-
     /**
     * 获取 开始 创建用户
     * @return createUserIdStart
@@ -720,6 +753,25 @@ public class PageRouteQuery extends PageRouteEntity {
         return this;
         }
 
+
+	/**
+    * 设置 设备编码
+    * @param deviceNum
+    */
+    public PageRouteQuery deviceNum(String deviceNum){
+        setDeviceNum(deviceNum);
+		return this;
+    }
+
+    /**
+    * 设置 设备编码
+    * @param deviceNumList
+    */
+    public PageRouteQuery deviceNumList(List<String> deviceNumList){
+        this.deviceNumList = deviceNumList;
+		return this;
+    }
+
     /**
     * 设置  产品id
     * @param productId
@@ -850,6 +902,7 @@ public class PageRouteQuery extends PageRouteEntity {
 		return this;
     }
 
+
 	/**
     * 设置 目标页面名称
     * @param targetName
@@ -868,15 +921,6 @@ public class PageRouteQuery extends PageRouteEntity {
 		return this;
     }
 
-        /**
-        * 设置 目标页面名称
-        * @param targetNameNotList
-        */
-        public PageRouteQuery targetNameNotList(List<String> targetNameNotList){
-        this.targetNameNotList = targetNameNotList;
-        return this;
-        }
-
     /**
     * 设置  创建用户
     * @param createUserId

portal-manager/src/main/java/com/mortals/xhx/module/page/model/pdu/BuryPointPdu.java

@@ -11,6 +11,8 @@ import lombok.Data;
  */
 @Data
 public class BuryPointPdu {
+    /** 设备编号 */
+    private String deviceNum;
     /*** 产品id */
     private Long productId;
     /*** 产品名称 */

portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageAccessDepthServiceImpl.java

@@ -37,6 +37,7 @@ public class PageAccessDepthServiceImpl extends AbstractCRUDServiceImpl<PageAcce
             return null;
         }
         PageAccessDepthEntity entity = new PageAccessDepthEntity();
+        entity.setDeviceNum(pdu.getDeviceNum());
         entity.setProductId(pdu.getProductId());
         entity.setProductName(pdu.getProductName());
         entity.setPageCode(pdu.getPageCode());

portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageAccessServiceImpl.java

@@ -37,6 +37,7 @@ public class PageAccessServiceImpl extends AbstractCRUDServiceImpl<PageAccessDao
             return null;
         }
         PageAccessEntity entity = new PageAccessEntity();
+        entity.setDeviceNum(pdu.getDeviceNum());
         entity.setProductId(pdu.getProductId());
         entity.setProductName(pdu.getProductName());
         entity.setPageCode(pdu.getPageCode());

portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageEventServiceImpl.java

@@ -37,6 +37,7 @@ public class PageEventServiceImpl extends AbstractCRUDServiceImpl<PageEventDao,
             return null;
         }
         PageEventEntity entity = new PageEventEntity();
+        entity.setDeviceNum(pdu.getDeviceNum());
         entity.setProductId(pdu.getProductId());
         entity.setProductName(pdu.getProductName());
         entity.setPageCode(pdu.getPageCode());

portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageRouteServiceImpl.java

@@ -43,6 +43,7 @@ public class PageRouteServiceImpl extends AbstractCRUDServiceImpl<PageRouteDao,
             return null;
         }
         PageRouteEntity entity = new PageRouteEntity();
+        entity.setDeviceNum(pdu.getDeviceNum());
         entity.setProductId(pdu.getProductId());
         entity.setProductName(pdu.getProductName());
         entity.setSourceCode(pdu.getRouteInfo().getSourceCode());

portal-manager/src/main/java/com/mortals/xhx/module/page/web/BuryPointController.java

@@ -40,7 +40,6 @@ public class BuryPointController extends BaseJsonBodyController {
     private PageRouteService pageRouteService;
 
     @PostMapping({"save"})
-    @RepeatSubmit
     @UnAuth
     public String save(@RequestBody BuryPointPdu pdu) {
         Map<String, Object> model = new HashMap();

portal-manager/src/main/resources/sqlmap/module/page/PageAccessDepthMapper.xml

@@ -6,6 +6,7 @@
     <!-- 字段和属性映射 -->
     <resultMap type="PageAccessDepthEntity" id="PageAccessDepthEntity-Map">
             <id  property="id" column="id" />
+            <result property="deviceNum" column="deviceNum" />
             <result property="productId" column="productId" />
             <result property="productName" column="productName" />
             <result property="pageCode" column="pageCode" />
@@ -25,6 +26,9 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                     a.id,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))">
+                    a.deviceNum,
+                </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productId') or colPickMode == 1 and data.containsKey('productId')))">
                     a.productId,
                 </if>
@@ -57,18 +61,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PageAccessDepthEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_page_access_depth
-        (productId,productName,pageCode,pageName,depthValue,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,pageCode,pageName,depthValue,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{productId},#{productName},#{pageCode},#{pageName},#{depthValue},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{deviceNum},#{productId},#{productName},#{pageCode},#{pageName},#{depthValue},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_page_access_depth
-        (productId,productName,pageCode,pageName,depthValue,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,pageCode,pageName,depthValue,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.productId},#{item.productName},#{item.pageCode},#{item.pageName},#{item.depthValue},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.deviceNum},#{item.productId},#{item.productName},#{item.pageCode},#{item.pageName},#{item.depthValue},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -78,6 +82,9 @@
         update mortals_xhx_page_access_depth as a
         set
         <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('deviceNum')) or (colPickMode==1 and !data.containsKey('deviceNum'))">
+                a.deviceNum=#{data.deviceNum},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('productId')) or (colPickMode==1 and !data.containsKey('productId'))">
                 a.productId=#{data.productId},
             </if>
@@ -96,6 +103,9 @@
             <if test="(colPickMode==0 and data.containsKey('depthValue')) or (colPickMode==1 and !data.containsKey('depthValue'))">
                 a.depthValue=#{data.depthValue},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('depthValueIncrement')) or (colPickMode==1 and !data.containsKey('depthValueIncrement'))">
+                a.depthValue=ifnull(a.depthValue,0) + #{data.depthValueIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
                 a.createUserId=#{data.createUserId},
             </if>
@@ -126,6 +136,13 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_page_access_depth as a
         <trim prefix="set" suffixOverrides=",">
+                <trim prefix="deviceNum=(case" suffix="ELSE deviceNum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))">
+                            when a.id=#{item.id} then #{item.deviceNum}
+                        </if>
+                    </foreach>
+                </trim>
                         <trim prefix="productId=(case" suffix="ELSE productId end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
@@ -161,9 +178,14 @@
                 </trim>
                         <trim prefix="depthValue=(case" suffix="ELSE depthValue end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('depthValue')) or (colPickMode==1 and !item.containsKey('depthValue'))">
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('depthValue')) or (colPickMode==1 and !item.containsKey('depthValue'))">
                                         when a.id=#{item.id} then #{item.depthValue}
-                        </if>
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('depthValueIncrement')) or (colPickMode==1 and !item.containsKey('depthValueIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.depthValue,0) + #{item.depthValueIncrement}
+                                    </when>
+                                </choose>
                             </foreach>
                         </trim>
                         <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
@@ -328,13 +350,13 @@
                     ${_conditionType_} a.id is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('idList')">
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
                 ${_conditionType_} a.id in
                 <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('idNotList')">
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
                 ${_conditionType_} a.id not in
                 <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -347,6 +369,27 @@
                 ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
             </if>
 
+
+            <if test="conditionParamRef.containsKey('deviceNum')">
+                <if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''">
+                    ${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum}
+                </if>
+                <if test="conditionParamRef.deviceNum == null">
+                    ${_conditionType_} a.deviceNum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumList') and conditionParamRef.deviceNumList.size() > 0">
+                ${_conditionType_} a.deviceNum in
+                <foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumNotList') and conditionParamRef.deviceNumNotList.size() > 0">
+                ${_conditionType_} a.deviceNum not in
+                <foreach collection="conditionParamRef.deviceNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="conditionParamRef.containsKey('productId')">
                 <if test="conditionParamRef.productId != null ">
                     ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
@@ -355,13 +398,13 @@
                     ${_conditionType_} a.productId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productIdList')">
+            <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
                 ${_conditionType_} a.productId in
                 <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productIdNotList')">
+            <if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
                 ${_conditionType_} a.productId not in
                 <foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -383,13 +426,13 @@
                     ${_conditionType_} a.productName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productNameList')">
+            <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
                 ${_conditionType_} a.productName in
                 <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productNameNotList')">
+            <if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
                 ${_conditionType_} a.productName not in
                 <foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -404,13 +447,13 @@
                     ${_conditionType_} a.pageCode is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('pageCodeList')">
+            <if test="conditionParamRef.containsKey('pageCodeList') and conditionParamRef.pageCodeList.size() > 0">
                 ${_conditionType_} a.pageCode in
                 <foreach collection="conditionParamRef.pageCodeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('pageCodeNotList')">
+            <if test="conditionParamRef.containsKey('pageCodeNotList') and conditionParamRef.pageCodeNotList.size() > 0">
                 ${_conditionType_} a.pageCode not in
                 <foreach collection="conditionParamRef.pageCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -425,39 +468,45 @@
                     ${_conditionType_} a.pageName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('pageNameList')">
+            <if test="conditionParamRef.containsKey('pageNameList') and conditionParamRef.pageNameList.size() > 0">
                 ${_conditionType_} a.pageName in
                 <foreach collection="conditionParamRef.pageNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('pageNameNotList')">
+            <if test="conditionParamRef.containsKey('pageNameNotList') and conditionParamRef.pageNameNotList.size() > 0">
                 ${_conditionType_} a.pageName not in
                 <foreach collection="conditionParamRef.pageNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-
             <if test="conditionParamRef.containsKey('depthValue')">
-                <if test="conditionParamRef.depthValue != null and conditionParamRef.depthValue != ''">
-                    ${_conditionType_} a.depthValue like #{${_conditionParam_}.depthValue}
+                <if test="conditionParamRef.depthValue != null ">
+                    ${_conditionType_} a.depthValue = #{${_conditionParam_}.depthValue}
                 </if>
                 <if test="conditionParamRef.depthValue == null">
                     ${_conditionType_} a.depthValue is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('depthValueList')">
+            <if test="conditionParamRef.containsKey('depthValueList') and conditionParamRef.depthValueList.size() > 0">
                 ${_conditionType_} a.depthValue in
                 <foreach collection="conditionParamRef.depthValueList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('depthValueNotList')">
+            <if test="conditionParamRef.containsKey('depthValueNotList') and conditionParamRef.depthValueNotList.size() > 0">
                 ${_conditionType_} a.depthValue not in
                 <foreach collection="conditionParamRef.depthValueNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('depthValueStart') and conditionParamRef.depthValueStart != null">
+                ${_conditionType_} a.depthValue <![CDATA[ >= ]]> #{${_conditionParam_}.depthValueStart}
+            </if>
+            <if test="conditionParamRef.containsKey('depthValueEnd') and conditionParamRef.depthValueEnd != null">
+                ${_conditionType_} a.depthValue <![CDATA[ <= ]]> #{${_conditionParam_}.depthValueEnd}
+            </if>
+
             <if test="conditionParamRef.containsKey('createUserId')">
                 <if test="conditionParamRef.createUserId != null ">
                     ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
@@ -466,13 +515,13 @@
                     ${_conditionType_} a.createUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
                 ${_conditionType_} a.createUserId in
                 <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
                 ${_conditionType_} a.createUserId not in
                 <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -508,13 +557,13 @@
                     ${_conditionType_} a.updateUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList')">
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
                 ${_conditionType_} a.updateUserId in
                 <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
                 ${_conditionType_} a.updateUserId not in
                 <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -560,6 +609,11 @@
                         <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('deviceNum')">
+                        a.deviceNum
+                        <if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if>
+                        ,
+                    </if>
                     <if test="orderCol.containsKey('productId')">
                         a.productId
                         <if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if>

portal-manager/src/main/resources/sqlmap/module/page/PageAccessMapper.xml

@@ -6,6 +6,7 @@
     <!-- 字段和属性映射 -->
     <resultMap type="PageAccessEntity" id="PageAccessEntity-Map">
             <id  property="id" column="id" />
+            <result property="deviceNum" column="deviceNum" />
             <result property="productId" column="productId" />
             <result property="productName" column="productName" />
             <result property="pageCode" column="pageCode" />
@@ -25,6 +26,9 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                     a.id,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))">
+                    a.deviceNum,
+                </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productId') or colPickMode == 1 and data.containsKey('productId')))">
                     a.productId,
                 </if>
@@ -57,18 +61,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PageAccessEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_page_access
-        (productId,productName,pageCode,pageName,sceneDepth,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,pageCode,pageName,sceneDepth,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{productId},#{productName},#{pageCode},#{pageName},#{sceneDepth},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{deviceNum},#{productId},#{productName},#{pageCode},#{pageName},#{sceneDepth},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_page_access
-        (productId,productName,pageCode,pageName,sceneDepth,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,pageCode,pageName,sceneDepth,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.productId},#{item.productName},#{item.pageCode},#{item.pageName},#{item.sceneDepth},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.deviceNum},#{item.productId},#{item.productName},#{item.pageCode},#{item.pageName},#{item.sceneDepth},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -78,6 +82,9 @@
         update mortals_xhx_page_access as a
         set
         <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('deviceNum')) or (colPickMode==1 and !data.containsKey('deviceNum'))">
+                a.deviceNum=#{data.deviceNum},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('productId')) or (colPickMode==1 and !data.containsKey('productId'))">
                 a.productId=#{data.productId},
             </if>
@@ -129,6 +136,13 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_page_access as a
         <trim prefix="set" suffixOverrides=",">
+                <trim prefix="deviceNum=(case" suffix="ELSE deviceNum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))">
+                            when a.id=#{item.id} then #{item.deviceNum}
+                        </if>
+                    </foreach>
+                </trim>
                         <trim prefix="productId=(case" suffix="ELSE productId end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
@@ -336,13 +350,13 @@
                     ${_conditionType_} a.id is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('idList')">
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
                 ${_conditionType_} a.id in
                 <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('idNotList')">
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
                 ${_conditionType_} a.id not in
                 <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -355,6 +369,27 @@
                 ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
             </if>
 
+
+            <if test="conditionParamRef.containsKey('deviceNum')">
+                <if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''">
+                    ${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum}
+                </if>
+                <if test="conditionParamRef.deviceNum == null">
+                    ${_conditionType_} a.deviceNum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumList') and conditionParamRef.deviceNumList.size() > 0">
+                ${_conditionType_} a.deviceNum in
+                <foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumNotList') and conditionParamRef.deviceNumNotList.size() > 0">
+                ${_conditionType_} a.deviceNum not in
+                <foreach collection="conditionParamRef.deviceNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="conditionParamRef.containsKey('productId')">
                 <if test="conditionParamRef.productId != null ">
                     ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
@@ -363,13 +398,13 @@
                     ${_conditionType_} a.productId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productIdList')">
+            <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
                 ${_conditionType_} a.productId in
                 <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productIdNotList')">
+            <if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
                 ${_conditionType_} a.productId not in
                 <foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -391,13 +426,13 @@
                     ${_conditionType_} a.productName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productNameList')">
+            <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
                 ${_conditionType_} a.productName in
                 <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productNameNotList')">
+            <if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
                 ${_conditionType_} a.productName not in
                 <foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -412,13 +447,13 @@
                     ${_conditionType_} a.pageCode is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('pageCodeList')">
+            <if test="conditionParamRef.containsKey('pageCodeList') and conditionParamRef.pageCodeList.size() > 0">
                 ${_conditionType_} a.pageCode in
                 <foreach collection="conditionParamRef.pageCodeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('pageCodeNotList')">
+            <if test="conditionParamRef.containsKey('pageCodeNotList') and conditionParamRef.pageCodeNotList.size() > 0">
                 ${_conditionType_} a.pageCode not in
                 <foreach collection="conditionParamRef.pageCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -433,13 +468,13 @@
                     ${_conditionType_} a.pageName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('pageNameList')">
+            <if test="conditionParamRef.containsKey('pageNameList') and conditionParamRef.pageNameList.size() > 0">
                 ${_conditionType_} a.pageName in
                 <foreach collection="conditionParamRef.pageNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('pageNameNotList')">
+            <if test="conditionParamRef.containsKey('pageNameNotList') and conditionParamRef.pageNameNotList.size() > 0">
                 ${_conditionType_} a.pageName not in
                 <foreach collection="conditionParamRef.pageNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -453,13 +488,13 @@
                     ${_conditionType_} a.sceneDepth is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('sceneDepthList')">
+            <if test="conditionParamRef.containsKey('sceneDepthList') and conditionParamRef.sceneDepthList.size() > 0">
                 ${_conditionType_} a.sceneDepth in
                 <foreach collection="conditionParamRef.sceneDepthList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('sceneDepthNotList')">
+            <if test="conditionParamRef.containsKey('sceneDepthNotList') and conditionParamRef.sceneDepthNotList.size() > 0">
                 ${_conditionType_} a.sceneDepth not in
                 <foreach collection="conditionParamRef.sceneDepthNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -480,13 +515,13 @@
                     ${_conditionType_} a.createUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
                 ${_conditionType_} a.createUserId in
                 <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
                 ${_conditionType_} a.createUserId not in
                 <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -522,13 +557,13 @@
                     ${_conditionType_} a.updateUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList')">
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
                 ${_conditionType_} a.updateUserId in
                 <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
                 ${_conditionType_} a.updateUserId not in
                 <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -574,6 +609,11 @@
                         <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('deviceNum')">
+                        a.deviceNum
+                        <if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if>
+                        ,
+                    </if>
                     <if test="orderCol.containsKey('productId')">
                         a.productId
                         <if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if>

portal-manager/src/main/resources/sqlmap/module/page/PageEventMapper.xml

@@ -6,6 +6,7 @@
     <!-- 字段和属性映射 -->
     <resultMap type="PageEventEntity" id="PageEventEntity-Map">
             <id  property="id" column="id" />
+            <result property="deviceNum" column="deviceNum" />
             <result property="productId" column="productId" />
             <result property="productName" column="productName" />
             <result property="businessCode" column="businessCode" />
@@ -30,6 +31,9 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                     a.id,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))">
+                    a.deviceNum,
+                </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productId') or colPickMode == 1 and data.containsKey('productId')))">
                     a.productId,
                 </if>
@@ -77,18 +81,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PageEventEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_page_event
-        (productId,productName,businessCode,businessName,eventCode,eventName,takeTime,pageCode,pageName,coordinate,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,businessCode,businessName,eventCode,eventName,takeTime,pageCode,pageName,coordinate,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{productId},#{productName},#{businessCode},#{businessName},#{eventCode},#{eventName},#{takeTime},#{pageCode},#{pageName},#{coordinate},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{deviceNum},#{productId},#{productName},#{businessCode},#{businessName},#{eventCode},#{eventName},#{takeTime},#{pageCode},#{pageName},#{coordinate},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_page_event
-        (productId,productName,businessCode,businessName,eventCode,eventName,takeTime,pageCode,pageName,coordinate,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,businessCode,businessName,eventCode,eventName,takeTime,pageCode,pageName,coordinate,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.productId},#{item.productName},#{item.businessCode},#{item.businessName},#{item.eventCode},#{item.eventName},#{item.takeTime},#{item.pageCode},#{item.pageName},#{item.coordinate},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.deviceNum},#{item.productId},#{item.productName},#{item.businessCode},#{item.businessName},#{item.eventCode},#{item.eventName},#{item.takeTime},#{item.pageCode},#{item.pageName},#{item.coordinate},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -98,6 +102,9 @@
         update mortals_xhx_page_event as a
         set
         <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('deviceNum')) or (colPickMode==1 and !data.containsKey('deviceNum'))">
+                a.deviceNum=#{data.deviceNum},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('productId')) or (colPickMode==1 and !data.containsKey('productId'))">
                 a.productId=#{data.productId},
             </if>
@@ -164,6 +171,13 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_page_event as a
         <trim prefix="set" suffixOverrides=",">
+                <trim prefix="deviceNum=(case" suffix="ELSE deviceNum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))">
+                            when a.id=#{item.id} then #{item.deviceNum}
+                        </if>
+                    </foreach>
+                </trim>
                         <trim prefix="productId=(case" suffix="ELSE productId end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
@@ -406,13 +420,13 @@
                     ${_conditionType_} a.id is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('idList')">
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
                 ${_conditionType_} a.id in
                 <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('idNotList')">
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
                 ${_conditionType_} a.id not in
                 <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -425,6 +439,27 @@
                 ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
             </if>
 
+
+            <if test="conditionParamRef.containsKey('deviceNum')">
+                <if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''">
+                    ${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum}
+                </if>
+                <if test="conditionParamRef.deviceNum == null">
+                    ${_conditionType_} a.deviceNum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumList') and conditionParamRef.deviceNumList.size() > 0">
+                ${_conditionType_} a.deviceNum in
+                <foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumNotList') and conditionParamRef.deviceNumNotList.size() > 0">
+                ${_conditionType_} a.deviceNum not in
+                <foreach collection="conditionParamRef.deviceNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="conditionParamRef.containsKey('productId')">
                 <if test="conditionParamRef.productId != null ">
                     ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
@@ -433,13 +468,13 @@
                     ${_conditionType_} a.productId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productIdList')">
+            <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
                 ${_conditionType_} a.productId in
                 <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productIdNotList')">
+            <if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
                 ${_conditionType_} a.productId not in
                 <foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -461,13 +496,13 @@
                     ${_conditionType_} a.productName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productNameList')">
+            <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
                 ${_conditionType_} a.productName in
                 <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productNameNotList')">
+            <if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
                 ${_conditionType_} a.productName not in
                 <foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -482,13 +517,13 @@
                     ${_conditionType_} a.businessCode is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('businessCodeList')">
+            <if test="conditionParamRef.containsKey('businessCodeList') and conditionParamRef.businessCodeList.size() > 0">
                 ${_conditionType_} a.businessCode in
                 <foreach collection="conditionParamRef.businessCodeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('businessCodeNotList')">
+            <if test="conditionParamRef.containsKey('businessCodeNotList') and conditionParamRef.businessCodeNotList.size() > 0">
                 ${_conditionType_} a.businessCode not in
                 <foreach collection="conditionParamRef.businessCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -503,13 +538,13 @@
                     ${_conditionType_} a.businessName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('businessNameList')">
+            <if test="conditionParamRef.containsKey('businessNameList') and conditionParamRef.businessNameList.size() > 0">
                 ${_conditionType_} a.businessName in
                 <foreach collection="conditionParamRef.businessNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('businessNameNotList')">
+            <if test="conditionParamRef.containsKey('businessNameNotList') and conditionParamRef.businessNameNotList.size() > 0">
                 ${_conditionType_} a.businessName not in
                 <foreach collection="conditionParamRef.businessNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -524,13 +559,13 @@
                     ${_conditionType_} a.eventCode is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('eventCodeList')">
+            <if test="conditionParamRef.containsKey('eventCodeList') and conditionParamRef.eventCodeList.size() > 0">
                 ${_conditionType_} a.eventCode in
                 <foreach collection="conditionParamRef.eventCodeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('eventCodeNotList')">
+            <if test="conditionParamRef.containsKey('eventCodeNotList') and conditionParamRef.eventCodeNotList.size() > 0">
                 ${_conditionType_} a.eventCode not in
                 <foreach collection="conditionParamRef.eventCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -545,13 +580,13 @@
                     ${_conditionType_} a.eventName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('eventNameList')">
+            <if test="conditionParamRef.containsKey('eventNameList') and conditionParamRef.eventNameList.size() > 0">
                 ${_conditionType_} a.eventName in
                 <foreach collection="conditionParamRef.eventNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('eventNameNotList')">
+            <if test="conditionParamRef.containsKey('eventNameNotList') and conditionParamRef.eventNameNotList.size() > 0">
                 ${_conditionType_} a.eventName not in
                 <foreach collection="conditionParamRef.eventNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -565,13 +600,13 @@
                     ${_conditionType_} a.takeTime is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('takeTimeList')">
+            <if test="conditionParamRef.containsKey('takeTimeList') and conditionParamRef.takeTimeList.size() > 0">
                 ${_conditionType_} a.takeTime in
                 <foreach collection="conditionParamRef.takeTimeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('takeTimeNotList')">
+            <if test="conditionParamRef.containsKey('takeTimeNotList') and conditionParamRef.takeTimeNotList.size() > 0">
                 ${_conditionType_} a.takeTime not in
                 <foreach collection="conditionParamRef.takeTimeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -593,13 +628,13 @@
                     ${_conditionType_} a.pageCode is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('pageCodeList')">
+            <if test="conditionParamRef.containsKey('pageCodeList') and conditionParamRef.pageCodeList.size() > 0">
                 ${_conditionType_} a.pageCode in
                 <foreach collection="conditionParamRef.pageCodeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('pageCodeNotList')">
+            <if test="conditionParamRef.containsKey('pageCodeNotList') and conditionParamRef.pageCodeNotList.size() > 0">
                 ${_conditionType_} a.pageCode not in
                 <foreach collection="conditionParamRef.pageCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -614,13 +649,13 @@
                     ${_conditionType_} a.pageName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('pageNameList')">
+            <if test="conditionParamRef.containsKey('pageNameList') and conditionParamRef.pageNameList.size() > 0">
                 ${_conditionType_} a.pageName in
                 <foreach collection="conditionParamRef.pageNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('pageNameNotList')">
+            <if test="conditionParamRef.containsKey('pageNameNotList') and conditionParamRef.pageNameNotList.size() > 0">
                 ${_conditionType_} a.pageName not in
                 <foreach collection="conditionParamRef.pageNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -635,13 +670,13 @@
                     ${_conditionType_} a.coordinate is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('coordinateList')">
+            <if test="conditionParamRef.containsKey('coordinateList') and conditionParamRef.coordinateList.size() > 0">
                 ${_conditionType_} a.coordinate in
                 <foreach collection="conditionParamRef.coordinateList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('coordinateNotList')">
+            <if test="conditionParamRef.containsKey('coordinateNotList') and conditionParamRef.coordinateNotList.size() > 0">
                 ${_conditionType_} a.coordinate not in
                 <foreach collection="conditionParamRef.coordinateNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -655,13 +690,13 @@
                     ${_conditionType_} a.createUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
                 ${_conditionType_} a.createUserId in
                 <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
                 ${_conditionType_} a.createUserId not in
                 <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -697,13 +732,13 @@
                     ${_conditionType_} a.updateUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList')">
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
                 ${_conditionType_} a.updateUserId in
                 <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
                 ${_conditionType_} a.updateUserId not in
                 <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -749,6 +784,11 @@
                         <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('deviceNum')">
+                        a.deviceNum
+                        <if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if>
+                        ,
+                    </if>
                     <if test="orderCol.containsKey('productId')">
                         a.productId
                         <if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if>

portal-manager/src/main/resources/sqlmap/module/page/PageInfoMapper.xml

@@ -6,6 +6,7 @@
     <!-- 字段和属性映射 -->
     <resultMap type="PageInfoEntity" id="PageInfoEntity-Map">
             <id  property="id" column="id" />
+            <result property="deviceNum" column="deviceNum" />
             <result property="productId" column="productId" />
             <result property="productName" column="productName" />
             <result property="pageCode" column="pageCode" />
@@ -25,6 +26,9 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                     a.id,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))">
+                    a.deviceNum,
+                </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productId') or colPickMode == 1 and data.containsKey('productId')))">
                     a.productId,
                 </if>
@@ -57,18 +61,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PageInfoEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_page_info
-        (productId,productName,pageCode,pageName,screenUrl,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,pageCode,pageName,screenUrl,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{productId},#{productName},#{pageCode},#{pageName},#{screenUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{deviceNum},#{productId},#{productName},#{pageCode},#{pageName},#{screenUrl},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_page_info
-        (productId,productName,pageCode,pageName,screenUrl,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,pageCode,pageName,screenUrl,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.productId},#{item.productName},#{item.pageCode},#{item.pageName},#{item.screenUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.deviceNum},#{item.productId},#{item.productName},#{item.pageCode},#{item.pageName},#{item.screenUrl},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -78,6 +82,9 @@
         update mortals_xhx_page_info as a
         set
         <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('deviceNum')) or (colPickMode==1 and !data.containsKey('deviceNum'))">
+                a.deviceNum=#{data.deviceNum},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('productId')) or (colPickMode==1 and !data.containsKey('productId'))">
                 a.productId=#{data.productId},
             </if>
@@ -126,6 +133,13 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_page_info as a
         <trim prefix="set" suffixOverrides=",">
+                <trim prefix="deviceNum=(case" suffix="ELSE deviceNum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))">
+                            when a.id=#{item.id} then #{item.deviceNum}
+                        </if>
+                    </foreach>
+                </trim>
                         <trim prefix="productId=(case" suffix="ELSE productId end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
@@ -328,13 +342,13 @@
                     ${_conditionType_} a.id is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('idList')">
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
                 ${_conditionType_} a.id in
                 <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('idNotList')">
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
                 ${_conditionType_} a.id not in
                 <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -347,6 +361,27 @@
                 ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
             </if>
 
+
+            <if test="conditionParamRef.containsKey('deviceNum')">
+                <if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''">
+                    ${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum}
+                </if>
+                <if test="conditionParamRef.deviceNum == null">
+                    ${_conditionType_} a.deviceNum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumList') and conditionParamRef.deviceNumList.size() > 0">
+                ${_conditionType_} a.deviceNum in
+                <foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumNotList') and conditionParamRef.deviceNumNotList.size() > 0">
+                ${_conditionType_} a.deviceNum not in
+                <foreach collection="conditionParamRef.deviceNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="conditionParamRef.containsKey('productId')">
                 <if test="conditionParamRef.productId != null ">
                     ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
@@ -355,13 +390,13 @@
                     ${_conditionType_} a.productId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productIdList')">
+            <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
                 ${_conditionType_} a.productId in
                 <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productIdNotList')">
+            <if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
                 ${_conditionType_} a.productId not in
                 <foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -383,13 +418,13 @@
                     ${_conditionType_} a.productName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productNameList')">
+            <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
                 ${_conditionType_} a.productName in
                 <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productNameNotList')">
+            <if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
                 ${_conditionType_} a.productName not in
                 <foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -404,13 +439,13 @@
                     ${_conditionType_} a.pageCode is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('pageCodeList')">
+            <if test="conditionParamRef.containsKey('pageCodeList') and conditionParamRef.pageCodeList.size() > 0">
                 ${_conditionType_} a.pageCode in
                 <foreach collection="conditionParamRef.pageCodeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('pageCodeNotList')">
+            <if test="conditionParamRef.containsKey('pageCodeNotList') and conditionParamRef.pageCodeNotList.size() > 0">
                 ${_conditionType_} a.pageCode not in
                 <foreach collection="conditionParamRef.pageCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -425,13 +460,13 @@
                     ${_conditionType_} a.pageName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('pageNameList')">
+            <if test="conditionParamRef.containsKey('pageNameList') and conditionParamRef.pageNameList.size() > 0">
                 ${_conditionType_} a.pageName in
                 <foreach collection="conditionParamRef.pageNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('pageNameNotList')">
+            <if test="conditionParamRef.containsKey('pageNameNotList') and conditionParamRef.pageNameNotList.size() > 0">
                 ${_conditionType_} a.pageName not in
                 <foreach collection="conditionParamRef.pageNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -446,13 +481,13 @@
                     ${_conditionType_} a.screenUrl is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('screenUrlList')">
+            <if test="conditionParamRef.containsKey('screenUrlList') and conditionParamRef.screenUrlList.size() > 0">
                 ${_conditionType_} a.screenUrl in
                 <foreach collection="conditionParamRef.screenUrlList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('screenUrlNotList')">
+            <if test="conditionParamRef.containsKey('screenUrlNotList') and conditionParamRef.screenUrlNotList.size() > 0">
                 ${_conditionType_} a.screenUrl not in
                 <foreach collection="conditionParamRef.screenUrlNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -466,13 +501,13 @@
                     ${_conditionType_} a.createUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
                 ${_conditionType_} a.createUserId in
                 <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
                 ${_conditionType_} a.createUserId not in
                 <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -508,13 +543,13 @@
                     ${_conditionType_} a.updateUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList')">
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
                 ${_conditionType_} a.updateUserId in
                 <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
                 ${_conditionType_} a.updateUserId not in
                 <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -560,6 +595,11 @@
                         <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('deviceNum')">
+                        a.deviceNum
+                        <if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if>
+                        ,
+                    </if>
                     <if test="orderCol.containsKey('productId')">
                         a.productId
                         <if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if>

portal-manager/src/main/resources/sqlmap/module/page/PageRouteMapper.xml

@@ -6,6 +6,7 @@
     <!-- 字段和属性映射 -->
     <resultMap type="PageRouteEntity" id="PageRouteEntity-Map">
             <id  property="id" column="id" />
+            <result property="deviceNum" column="deviceNum" />
             <result property="productId" column="productId" />
             <result property="productName" column="productName" />
             <result property="sourceCode" column="sourceCode" />
@@ -26,6 +27,9 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
                     a.id,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))">
+                    a.deviceNum,
+                </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productId') or colPickMode == 1 and data.containsKey('productId')))">
                     a.productId,
                 </if>
@@ -61,18 +65,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PageRouteEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_page_route
-        (productId,productName,sourceCode,sourceName,targetCode,targetName,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,sourceCode,sourceName,targetCode,targetName,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{productId},#{productName},#{sourceCode},#{sourceName},#{targetCode},#{targetName},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{deviceNum},#{productId},#{productName},#{sourceCode},#{sourceName},#{targetCode},#{targetName},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_page_route
-        (productId,productName,sourceCode,sourceName,targetCode,targetName,createUserId,createTime,updateUserId,updateTime)
+        (deviceNum,productId,productName,sourceCode,sourceName,targetCode,targetName,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.productId},#{item.productName},#{item.sourceCode},#{item.sourceName},#{item.targetCode},#{item.targetName},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.deviceNum},#{item.productId},#{item.productName},#{item.sourceCode},#{item.sourceName},#{item.targetCode},#{item.targetName},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -82,6 +86,9 @@
         update mortals_xhx_page_route as a
         set
         <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('deviceNum')) or (colPickMode==1 and !data.containsKey('deviceNum'))">
+                a.deviceNum=#{data.deviceNum},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('productId')) or (colPickMode==1 and !data.containsKey('productId'))">
                 a.productId=#{data.productId},
             </if>
@@ -103,9 +110,6 @@
             <if test="(colPickMode==0 and data.containsKey('targetName')) or (colPickMode==1 and !data.containsKey('targetName'))">
                 a.targetName=#{data.targetName},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('targetNameIncrement')) or (colPickMode==1 and !data.containsKey('targetNameIncrement'))">
-                a.targetName=ifnull(a.targetName,0) + #{data.targetNameIncrement},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
                 a.createUserId=#{data.createUserId},
             </if>
@@ -136,6 +140,13 @@
     <update id="updateBatch" parameterType="paramDto">
         update mortals_xhx_page_route as a
         <trim prefix="set" suffixOverrides=",">
+                <trim prefix="deviceNum=(case" suffix="ELSE deviceNum end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))">
+                            when a.id=#{item.id} then #{item.deviceNum}
+                        </if>
+                    </foreach>
+                </trim>
                         <trim prefix="productId=(case" suffix="ELSE productId end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
@@ -178,14 +189,9 @@
                 </trim>
                 <trim prefix="targetName=(case" suffix="ELSE targetName end),">
                     <foreach collection="data.dataList" item="item" index="index" separator="" >
-                                <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('targetName')) or (colPickMode==1 and !item.containsKey('targetName'))">
+                        <if test="(colPickMode==0 and item.containsKey('targetName')) or (colPickMode==1 and !item.containsKey('targetName'))">
                             when a.id=#{item.id} then #{item.targetName}
-                                    </when>
-                                    <when test="(colPickMode==0 and item.containsKey('targetNameIncrement')) or (colPickMode==1 and !item.containsKey('targetNameIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.targetName,0) + #{item.targetNameIncrement}
-                                    </when>
-                                </choose>
+                        </if>
                     </foreach>
                 </trim>
                         <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
@@ -350,13 +356,13 @@
                     ${_conditionType_} a.id is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('idList')">
+            <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
                 ${_conditionType_} a.id in
                 <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('idNotList')">
+            <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
                 ${_conditionType_} a.id not in
                 <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -369,6 +375,27 @@
                 ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
             </if>
 
+
+            <if test="conditionParamRef.containsKey('deviceNum')">
+                <if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''">
+                    ${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum}
+                </if>
+                <if test="conditionParamRef.deviceNum == null">
+                    ${_conditionType_} a.deviceNum is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumList') and conditionParamRef.deviceNumList.size() > 0">
+                ${_conditionType_} a.deviceNum in
+                <foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('deviceNumNotList') and conditionParamRef.deviceNumNotList.size() > 0">
+                ${_conditionType_} a.deviceNum not in
+                <foreach collection="conditionParamRef.deviceNumNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="conditionParamRef.containsKey('productId')">
                 <if test="conditionParamRef.productId != null ">
                     ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
@@ -377,13 +404,13 @@
                     ${_conditionType_} a.productId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productIdList')">
+            <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
                 ${_conditionType_} a.productId in
                 <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productIdNotList')">
+            <if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
                 ${_conditionType_} a.productId not in
                 <foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -405,13 +432,13 @@
                     ${_conditionType_} a.productName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('productNameList')">
+            <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
                 ${_conditionType_} a.productName in
                 <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('productNameNotList')">
+            <if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
                 ${_conditionType_} a.productName not in
                 <foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -426,13 +453,13 @@
                     ${_conditionType_} a.sourceCode is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('sourceCodeList')">
+            <if test="conditionParamRef.containsKey('sourceCodeList') and conditionParamRef.sourceCodeList.size() > 0">
                 ${_conditionType_} a.sourceCode in
                 <foreach collection="conditionParamRef.sourceCodeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('sourceCodeNotList')">
+            <if test="conditionParamRef.containsKey('sourceCodeNotList') and conditionParamRef.sourceCodeNotList.size() > 0">
                 ${_conditionType_} a.sourceCode not in
                 <foreach collection="conditionParamRef.sourceCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -447,13 +474,13 @@
                     ${_conditionType_} a.sourceName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('sourceNameList')">
+            <if test="conditionParamRef.containsKey('sourceNameList') and conditionParamRef.sourceNameList.size() > 0">
                 ${_conditionType_} a.sourceName in
                 <foreach collection="conditionParamRef.sourceNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('sourceNameNotList')">
+            <if test="conditionParamRef.containsKey('sourceNameNotList') and conditionParamRef.sourceNameNotList.size() > 0">
                 ${_conditionType_} a.sourceName not in
                 <foreach collection="conditionParamRef.sourceNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -468,45 +495,39 @@
                     ${_conditionType_} a.targetCode is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('targetCodeList')">
+            <if test="conditionParamRef.containsKey('targetCodeList') and conditionParamRef.targetCodeList.size() > 0">
                 ${_conditionType_} a.targetCode in
                 <foreach collection="conditionParamRef.targetCodeList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('targetCodeNotList')">
+            <if test="conditionParamRef.containsKey('targetCodeNotList') and conditionParamRef.targetCodeNotList.size() > 0">
                 ${_conditionType_} a.targetCode not in
                 <foreach collection="conditionParamRef.targetCodeNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
+
             <if test="conditionParamRef.containsKey('targetName')">
-                <if test="conditionParamRef.targetName != null ">
-                    ${_conditionType_} a.targetName = #{${_conditionParam_}.targetName}
+                <if test="conditionParamRef.targetName != null and conditionParamRef.targetName != ''">
+                    ${_conditionType_} a.targetName like #{${_conditionParam_}.targetName}
                 </if>
                 <if test="conditionParamRef.targetName == null">
                     ${_conditionType_} a.targetName is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('targetNameList')">
+            <if test="conditionParamRef.containsKey('targetNameList') and conditionParamRef.targetNameList.size() > 0">
                 ${_conditionType_} a.targetName in
                 <foreach collection="conditionParamRef.targetNameList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('targetNameNotList')">
+            <if test="conditionParamRef.containsKey('targetNameNotList') and conditionParamRef.targetNameNotList.size() > 0">
                 ${_conditionType_} a.targetName not in
                 <foreach collection="conditionParamRef.targetNameNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('targetNameStart') and conditionParamRef.targetNameStart != null">
-                ${_conditionType_} a.targetName <![CDATA[ >= ]]> #{${_conditionParam_}.targetNameStart}
-            </if>
-            <if test="conditionParamRef.containsKey('targetNameEnd') and conditionParamRef.targetNameEnd != null">
-                ${_conditionType_} a.targetName <![CDATA[ <= ]]> #{${_conditionParam_}.targetNameEnd}
-            </if>
-
             <if test="conditionParamRef.containsKey('createUserId')">
                 <if test="conditionParamRef.createUserId != null ">
                     ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
@@ -515,13 +536,13 @@
                     ${_conditionType_} a.createUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList')">
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
                 ${_conditionType_} a.createUserId in
                 <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList')">
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
                 ${_conditionType_} a.createUserId not in
                 <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -557,13 +578,13 @@
                     ${_conditionType_} a.updateUserId is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList')">
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
                 ${_conditionType_} a.updateUserId in
                 <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdNotList')">
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
                 ${_conditionType_} a.updateUserId not in
                 <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
@@ -609,6 +630,11 @@
                         <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('deviceNum')">
+                        a.deviceNum
+                        <if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if>
+                        ,
+                    </if>
                     <if test="orderCol.containsKey('productId')">
                         a.productId
                         <if test='orderCol.productId != null and "DESC".equalsIgnoreCase(orderCol.productId)'>DESC</if>