添加评价器事件地址

device-manager-ui/admin/src/views/product/drawershow.vue

@@ -15,7 +15,7 @@
                           
                               <Field :span="22" label="默认首页" prop="skinId" v-model="form.skinId" @change="skinSelect" :enumData="dict.skinProductCodeMap[form.productCode]" type="select" placeholder="请输入产品名称，名称唯一"/>
 
-                            <!-- <Field :span="22" label="首页地址" prop="homeUrl" v-model="form.homeUrl"  placeholder="请输入首页地址"/> -->
+                            <Field :span="22" v-if="form.productCode=='pjq'" label="事件地址" prop="eventUrl" v-model="form.eventUrl"  placeholder="请输入事件地址"/>
                             <Field :span="22" label="备注" prop="productRemark" v-model="form.productRemark" type="textarea" placeholder="请输入备注"/>
 
             </el-row>

device-manager/db/add.sql

 ALTER TABLE mortals_xhx_device ADD COLUMN `skinId` bigint (20)     COMMENT '皮肤id' AFTER productName;
 ALTER TABLE mortals_xhx_device ADD COLUMN `skinName` varchar (512)     COMMENT '皮肤名称' AFTER skinId;
 ALTER TABLE mortals_xhx_device ADD COLUMN `homeUrl` varchar (512)     COMMENT '首页地址' AFTER skinName;
+
 ALTER TABLE mortals_xhx_device ADD COLUMN `deviceSN` varchar (512)     COMMENT '设备SN码' AFTER deviceCode;
 
 
 ALTER TABLE mortals_xhx_product ADD COLUMN `skinId` bigint (20)     COMMENT '皮肤id' AFTER productCode;
 ALTER TABLE mortals_xhx_product ADD COLUMN `skinName` varchar (512)     COMMENT '皮肤名称' AFTER skinId;
+ALTER TABLE mortals_xhx_device ADD COLUMN `eventUrl` varchar (512)     COMMENT '事件地址' AFTER homeUrl;
 
 
 

device-manager/db/module.sql

-use `device-platform`;
+use
+`device-platform`;
 
 -- ----------------------------
 -- 设备表
@@ -82,22 +83,23 @@ CREATE TABLE mortals_xhx_platform
 -- 产品表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_product`;
-CREATE TABLE `mortals_xhx_product`
+CREATE TABLE mortals_xhx_product
 (
-    `id`            bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
-    `platformId`    bigint(20) DEFAULT NULL,
-    `productName`   varchar(20)  NOT NULL COMMENT '产品名称，名称唯一',
-    `productCode`   varchar(256) NOT NULL COMMENT '产品编码，编码唯一',
-    `skinId`        bigint(20) DEFAULT NULL COMMENT '皮肤id',
-    `skinName`      varchar(512) DEFAULT NULL COMMENT '皮肤名称',
-    `homeUrl`       varchar(255) DEFAULT NULL COMMENT '首页',
-    `productRemark` varchar(256) DEFAULT NULL COMMENT '备注',
+    `id`            bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
+    `platformId`    bigint(20) NOT NULL AUTO_INCREMENT COMMENT '关联平台',
+    `productName`   varchar(20) NOT NULL COMMENT '产品名称，名称唯一',
+    `productCode`   varchar(256) COMMENT '产品编码',
+    `skinId`        bigint(20) NOT NULL COMMENT '皮肤id',
+    `skinName`      varchar(20) COMMENT '皮肤名称',
+    `homeUrl`       varchar(512) COMMENT '首页地址',
+    `eventUrl`      varchar(512) COMMENT '事件地址，评价器使用',
+    `productRemark` varchar(256) COMMENT '备注',
     `createUserId`  bigint(20) NOT NULL COMMENT '创建用户',
-    `createTime`    datetime     NOT NULL COMMENT '创建时间',
-    `updateUserId`  bigint(20) DEFAULT NULL COMMENT '更新用户',
-    `updateTime`    datetime     DEFAULT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='产品';
+    `createTime`    datetime    NOT NULL COMMENT '创建时间',
+    `updateUserId`  bigint(20) COMMENT '更新用户',
+    `updateTime`    datetime COMMENT '更新时间',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='产品';
 
 
 

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -826,6 +826,7 @@ public class DeviceApiController {
         String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11091");
 
         serverInfo.setHomeUrl(UrlBuilder.of(domain).addPath(homeUrl).toString());
+        serverInfo.setEventUrl(productEntity.getEventUrl());
     }
 
     private void buildDownloadUrl(ProductVersionEntity productVersionEntity, ProductVersionInfo productVersionInfo) {

device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductEntity.java

 package com.mortals.xhx.module.product.model;
 
-import java.util.List;
-import java.util.ArrayList;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
-import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.product.model.vo.ProductVo;
 /**
  * 产品实体对象
  *
  * @author zxfei
- * @date 2022-08-01
+ * @date 2022-11-09
  */
 
 public class ProductEntity extends ProductVo {
@@ -29,14 +25,6 @@ public class ProductEntity extends ProductVo {
      * 产品编码
      */
     private String productCode;
-    /**
-     * 首页地址
-     */
-    private String homeUrl;
-    /**
-     * 备注
-     */
-    private String productRemark;
     /**
      * 皮肤id
      */
@@ -46,6 +34,18 @@ public class ProductEntity extends ProductVo {
      */
     @Excel(name = "皮肤名称")
     private String skinName;
+    /**
+     * 首页地址
+     */
+    private String homeUrl;
+    /**
+     * 事件地址，评价器使用
+     */
+    private String eventUrl;
+    /**
+     * 备注
+     */
+    private String productRemark;
 
 
 
@@ -92,34 +92,6 @@ public class ProductEntity extends ProductVo {
     public void setProductCode(String productCode){
         this.productCode = productCode;
     }
-    /**
-     * 获取 首页地址
-     * @return String
-     */
-    public String getHomeUrl(){
-        return homeUrl;
-    }
-    /**
-     * 设置 首页地址
-     * @param homeUrl
-     */
-    public void setHomeUrl(String homeUrl){
-        this.homeUrl = homeUrl;
-    }
-    /**
-     * 获取 备注
-     * @return String
-     */
-    public String getProductRemark(){
-        return productRemark;
-    }
-    /**
-     * 设置 备注
-     * @param productRemark
-     */
-    public void setProductRemark(String productRemark){
-        this.productRemark = productRemark;
-    }
     /**
      * 获取 皮肤id
      * @return Long
@@ -148,6 +120,48 @@ public class ProductEntity extends ProductVo {
     public void setSkinName(String skinName){
         this.skinName = skinName;
     }
+    /**
+     * 获取 首页地址
+     * @return String
+     */
+    public String getHomeUrl(){
+        return homeUrl;
+    }
+    /**
+     * 设置 首页地址
+     * @param homeUrl
+     */
+    public void setHomeUrl(String homeUrl){
+        this.homeUrl = homeUrl;
+    }
+    /**
+     * 获取 事件地址，评价器使用
+     * @return String
+     */
+    public String getEventUrl(){
+        return eventUrl;
+    }
+    /**
+     * 设置 事件地址，评价器使用
+     * @param eventUrl
+     */
+    public void setEventUrl(String eventUrl){
+        this.eventUrl = eventUrl;
+    }
+    /**
+     * 获取 备注
+     * @return String
+     */
+    public String getProductRemark(){
+        return productRemark;
+    }
+    /**
+     * 设置 备注
+     * @param productRemark
+     */
+    public void setProductRemark(String productRemark){
+        this.productRemark = productRemark;
+    }
 
 
 
@@ -173,10 +187,11 @@ public class ProductEntity extends ProductVo {
         sb.append(",platformId:").append(getPlatformId());
         sb.append(",productName:").append(getProductName());
         sb.append(",productCode:").append(getProductCode());
-        sb.append(",homeUrl:").append(getHomeUrl());
-        sb.append(",productRemark:").append(getProductRemark());
         sb.append(",skinId:").append(getSkinId());
         sb.append(",skinName:").append(getSkinName());
+        sb.append(",homeUrl:").append(getHomeUrl());
+        sb.append(",eventUrl:").append(getEventUrl());
+        sb.append(",productRemark:").append(getProductRemark());
         return sb.toString();
     }
 
@@ -188,12 +203,14 @@ public class ProductEntity extends ProductVo {
 
         this.productCode = "";
 
-        this.homeUrl = "";
-
-        this.productRemark = "";
-
         this.skinId = null;
 
         this.skinName = "";
+
+        this.homeUrl = "";
+
+        this.eventUrl = "";
+
+        this.productRemark = "";
     }
 }
\ No newline at end of file

device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductQuery.java

 package com.mortals.xhx.module.product.model;
 
 import java.util.List;
-import com.mortals.xhx.module.product.model.ProductEntity;
 /**
  * 产品查询对象
  *
  * @author zxfei
- * @date 2022-08-01
+ * @date 2022-11-09
  */
 public class ProductQuery extends ProductEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -39,9 +38,27 @@ public class ProductQuery extends ProductEntity {
     /** 产品编码 */
     private List<String> productCodeList;
 
+    /** 开始 皮肤id */
+    private Long skinIdStart;
+
+    /** 结束 皮肤id */
+    private Long skinIdEnd;
+
+    /** 增加 皮肤id */
+    private Long skinIdIncrement;
+
+    /** 皮肤id列表 */
+    private List <Long> skinIdList;
+
+    /** 皮肤名称 */
+    private List<String> skinNameList;
+
     /** 首页地址 */
     private List<String> homeUrlList;
 
+    /** 事件地址，评价器使用 */
+    private List<String> eventUrlList;
+
     /** 备注 */
     private List<String> productRemarkList;
 
@@ -81,21 +98,6 @@ public class ProductQuery extends ProductEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
-    /** 开始 皮肤id */
-    private Long skinIdStart;
-
-    /** 结束 皮肤id */
-    private Long skinIdEnd;
-
-    /** 增加 皮肤id */
-    private Long skinIdIncrement;
-
-    /** 皮肤id列表 */
-    private List <Long> skinIdList;
-
-    /** 皮肤名称 */
-    private List<String> skinNameList;
-
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<ProductQuery> orConditionList;
 
@@ -262,6 +264,85 @@ public class ProductQuery extends ProductEntity {
     public void setProductCodeList(List<String> productCodeList){
         this.productCodeList = productCodeList;
     }
+    /**
+     * 获取 开始 皮肤id
+     * @return skinIdStart
+     */
+    public Long getSkinIdStart(){
+        return this.skinIdStart;
+    }
+
+    /**
+     * 设置 开始 皮肤id
+     * @param skinIdStart
+     */
+    public void setSkinIdStart(Long skinIdStart){
+        this.skinIdStart = skinIdStart;
+    }
+
+    /**
+     * 获取 结束 皮肤id
+     * @return $skinIdEnd
+     */
+    public Long getSkinIdEnd(){
+        return this.skinIdEnd;
+    }
+
+    /**
+     * 设置 结束 皮肤id
+     * @param skinIdEnd
+     */
+    public void setSkinIdEnd(Long skinIdEnd){
+        this.skinIdEnd = skinIdEnd;
+    }
+
+    /**
+     * 获取 增加 皮肤id
+     * @return skinIdIncrement
+     */
+    public Long getSkinIdIncrement(){
+        return this.skinIdIncrement;
+    }
+
+    /**
+     * 设置 增加 皮肤id
+     * @param skinIdIncrement
+     */
+    public void setSkinIdIncrement(Long skinIdIncrement){
+        this.skinIdIncrement = skinIdIncrement;
+    }
+
+    /**
+     * 获取 皮肤id
+     * @return skinIdList
+     */
+    public List<Long> getSkinIdList(){
+        return this.skinIdList;
+    }
+
+    /**
+     * 设置 皮肤id
+     * @param skinIdList
+     */
+    public void setSkinIdList(List<Long> skinIdList){
+        this.skinIdList = skinIdList;
+    }
+
+    /**
+     * 获取 皮肤名称
+     * @return skinNameList
+     */
+    public List<String> getSkinNameList(){
+        return this.skinNameList;
+    }
+
+    /**
+     * 设置 皮肤名称
+     * @param skinNameList
+     */
+    public void setSkinNameList(List<String> skinNameList){
+        this.skinNameList = skinNameList;
+    }
     /**
      * 获取 首页地址
      * @return homeUrlList
@@ -277,6 +358,21 @@ public class ProductQuery extends ProductEntity {
     public void setHomeUrlList(List<String> homeUrlList){
         this.homeUrlList = homeUrlList;
     }
+    /**
+     * 获取 事件地址，评价器使用
+     * @return eventUrlList
+     */
+    public List<String> getEventUrlList(){
+        return this.eventUrlList;
+    }
+
+    /**
+     * 设置 事件地址，评价器使用
+     * @param eventUrlList
+     */
+    public void setEventUrlList(List<String> eventUrlList){
+        this.eventUrlList = eventUrlList;
+    }
     /**
      * 获取 备注
      * @return productRemarkList
@@ -484,85 +580,6 @@ public class ProductQuery extends ProductEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
-    /**
-     * 获取 开始 皮肤id
-     * @return skinIdStart
-     */
-    public Long getSkinIdStart(){
-        return this.skinIdStart;
-    }
-
-    /**
-     * 设置 开始 皮肤id
-     * @param skinIdStart
-     */
-    public void setSkinIdStart(Long skinIdStart){
-        this.skinIdStart = skinIdStart;
-    }
-
-    /**
-     * 获取 结束 皮肤id
-     * @return $skinIdEnd
-     */
-    public Long getSkinIdEnd(){
-        return this.skinIdEnd;
-    }
-
-    /**
-     * 设置 结束 皮肤id
-     * @param skinIdEnd
-     */
-    public void setSkinIdEnd(Long skinIdEnd){
-        this.skinIdEnd = skinIdEnd;
-    }
-
-    /**
-     * 获取 增加 皮肤id
-     * @return skinIdIncrement
-     */
-    public Long getSkinIdIncrement(){
-        return this.skinIdIncrement;
-    }
-
-    /**
-     * 设置 增加 皮肤id
-     * @param skinIdIncrement
-     */
-    public void setSkinIdIncrement(Long skinIdIncrement){
-        this.skinIdIncrement = skinIdIncrement;
-    }
-
-    /**
-     * 获取 皮肤id
-     * @return skinIdList
-     */
-    public List<Long> getSkinIdList(){
-        return this.skinIdList;
-    }
-
-    /**
-     * 设置 皮肤id
-     * @param skinIdList
-     */
-    public void setSkinIdList(List<Long> skinIdList){
-        this.skinIdList = skinIdList;
-    }
-
-    /**
-     * 获取 皮肤名称
-     * @return skinNameList
-     */
-    public List<String> getSkinNameList(){
-        return this.skinNameList;
-    }
-
-    /**
-     * 设置 皮肤名称
-     * @param skinNameList
-     */
-    public void setSkinNameList(List<String> skinNameList){
-        this.skinNameList = skinNameList;
-    }
     /**
      * 设置  主键ID，主键，自增长
      * @param id
@@ -691,6 +708,70 @@ public class ProductQuery extends ProductEntity {
         return this;
     }
 
+    /**
+     * 设置  皮肤id
+     * @param skinId
+     */
+    public ProductQuery skinId(Long skinId){
+        setSkinId(skinId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 皮肤id
+     * @param skinIdStart
+     */
+    public ProductQuery skinIdStart(Long skinIdStart){
+        this.skinIdStart = skinIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 皮肤id
+     * @param skinIdEnd
+     */
+    public ProductQuery skinIdEnd(Long skinIdEnd){
+        this.skinIdEnd = skinIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 皮肤id
+     * @param skinIdIncrement
+     */
+    public ProductQuery skinIdIncrement(Long skinIdIncrement){
+        this.skinIdIncrement = skinIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 皮肤id
+     * @param skinIdList
+     */
+    public ProductQuery skinIdList(List<Long> skinIdList){
+        this.skinIdList = skinIdList;
+        return this;
+    }
+
+
+    /**
+     * 设置 皮肤名称
+     * @param skinName
+     */
+    public ProductQuery skinName(String skinName){
+        setSkinName(skinName);
+        return this;
+    }
+
+    /**
+     * 设置 皮肤名称
+     * @param skinNameList
+     */
+    public ProductQuery skinNameList(List<String> skinNameList){
+        this.skinNameList = skinNameList;
+        return this;
+    }
+
 
     /**
      * 设置 首页地址
@@ -711,6 +792,25 @@ public class ProductQuery extends ProductEntity {
     }
 
 
+    /**
+     * 设置 事件地址，评价器使用
+     * @param eventUrl
+     */
+    public ProductQuery eventUrl(String eventUrl){
+        setEventUrl(eventUrl);
+        return this;
+    }
+
+    /**
+     * 设置 事件地址，评价器使用
+     * @param eventUrlList
+     */
+    public ProductQuery eventUrlList(List<String> eventUrlList){
+        this.eventUrlList = eventUrlList;
+        return this;
+    }
+
+
     /**
      * 设置 备注
      * @param productRemark
@@ -821,70 +921,6 @@ public class ProductQuery extends ProductEntity {
     }
 
 
-    /**
-     * 设置  皮肤id
-     * @param skinId
-     */
-    public ProductQuery skinId(Long skinId){
-        setSkinId(skinId);
-        return this;
-    }
-
-    /**
-     * 设置 开始 皮肤id
-     * @param skinIdStart
-     */
-    public ProductQuery skinIdStart(Long skinIdStart){
-        this.skinIdStart = skinIdStart;
-        return this;
-    }
-
-    /**
-     * 设置 结束 皮肤id
-     * @param skinIdEnd
-     */
-    public ProductQuery skinIdEnd(Long skinIdEnd){
-        this.skinIdEnd = skinIdEnd;
-        return this;
-    }
-
-    /**
-     * 设置 增加 皮肤id
-     * @param skinIdIncrement
-     */
-    public ProductQuery skinIdIncrement(Long skinIdIncrement){
-        this.skinIdIncrement = skinIdIncrement;
-        return this;
-    }
-
-    /**
-     * 设置 皮肤id
-     * @param skinIdList
-     */
-    public ProductQuery skinIdList(List<Long> skinIdList){
-        this.skinIdList = skinIdList;
-        return this;
-    }
-
-
-    /**
-     * 设置 皮肤名称
-     * @param skinName
-     */
-    public ProductQuery skinName(String skinName){
-        setSkinName(skinName);
-        return this;
-    }
-
-    /**
-     * 设置 皮肤名称
-     * @param skinNameList
-     */
-    public ProductQuery skinNameList(List<String> skinNameList){
-        this.skinNameList = skinNameList;
-        return this;
-    }
-
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

device-manager/src/main/resources/sqlmap/module/product/ProductMapper.xml

@@ -12,6 +12,7 @@
         <result property="skinId" column="skinId" />
         <result property="skinName" column="skinName" />
         <result property="homeUrl" column="homeUrl" />
+        <result property="eventUrl" column="eventUrl" />
         <result property="productRemark" column="productRemark" />
         <result property="createUserId" column="createUserId" />
         <result property="createTime" column="createTime" />
@@ -45,6 +46,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('homeUrl') or colPickMode == 1 and data.containsKey('homeUrl')))">
                 a.homeUrl,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('eventUrl') or colPickMode == 1 and data.containsKey('eventUrl')))">
+                a.eventUrl,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productRemark') or colPickMode == 1 and data.containsKey('productRemark')))">
                 a.productRemark,
             </if>
@@ -65,18 +69,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="ProductEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_product
-        (platformId,productName,productCode,skinId,skinName,homeUrl,productRemark,createUserId,createTime,updateUserId,updateTime)
+        (platformId,productName,productCode,skinId,skinName,homeUrl,eventUrl,productRemark,createUserId,createTime,updateUserId,updateTime)
         VALUES
-        (#{platformId},#{productName},#{productCode},#{skinId},#{skinName},#{homeUrl},#{productRemark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{platformId},#{productName},#{productCode},#{skinId},#{skinName},#{homeUrl},#{eventUrl},#{productRemark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_product
-        (platformId,productName,productCode,skinId,skinName,homeUrl,productRemark,createUserId,createTime,updateUserId,updateTime)
+        (platformId,productName,productCode,skinId,skinName,homeUrl,eventUrl,productRemark,createUserId,createTime,updateUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.platformId},#{item.productName},#{item.productCode},#{item.skinId},#{item.skinName},#{item.homeUrl},#{item.productRemark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.platformId},#{item.productName},#{item.productCode},#{item.skinId},#{item.skinName},#{item.homeUrl},#{item.eventUrl},#{item.productRemark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -110,6 +114,9 @@
             <if test="(colPickMode==0 and data.containsKey('homeUrl')) or (colPickMode==1 and !data.containsKey('homeUrl'))">
                 a.homeUrl=#{data.homeUrl},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('eventUrl')) or (colPickMode==1 and !data.containsKey('eventUrl'))">
+                a.eventUrl=#{data.eventUrl},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('productRemark')) or (colPickMode==1 and !data.containsKey('productRemark'))">
                 a.productRemark=#{data.productRemark},
             </if>
@@ -195,6 +202,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="eventUrl=(case" suffix="ELSE eventUrl end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('eventUrl')) or (colPickMode==1 and !item.containsKey('eventUrl'))">
+                        when a.id=#{item.id} then #{item.eventUrl}
+                    </if>
+                </foreach>
+            </trim>
             <trim prefix="productRemark=(case" suffix="ELSE productRemark end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('productRemark')) or (colPickMode==1 and !item.containsKey('productRemark'))">
@@ -465,6 +479,21 @@
             </foreach>
         </if>
 
+        <if test="conditionParamRef.containsKey('eventUrl')">
+            <if test="conditionParamRef.eventUrl != null and conditionParamRef.eventUrl != ''">
+                ${_conditionType_} a.eventUrl like #{${_conditionParam_}.eventUrl}
+            </if>
+            <if test="conditionParamRef.eventUrl == null">
+                ${_conditionType_} a.eventUrl is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('eventUrlList')">
+            ${_conditionType_} a.eventUrl in
+            <foreach collection="conditionParamRef.eventUrlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="conditionParamRef.containsKey('productRemark')">
             <if test="conditionParamRef.productRemark != null and conditionParamRef.productRemark != ''">
                 ${_conditionType_} a.productRemark like #{${_conditionParam_}.productRemark}
@@ -599,6 +628,11 @@
                     <if test='orderCol.homeUrl != null and "DESC".equalsIgnoreCase(orderCol.homeUrl)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('eventUrl')">
+                    a.eventUrl
+                    <if test='orderCol.eventUrl != null and "DESC".equalsIgnoreCase(orderCol.eventUrl)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('productRemark')">
                     a.productRemark
                     <if test='orderCol.productRemark != null and "DESC".equalsIgnoreCase(orderCol.productRemark)'>DESC</if>

doc/api.md

@@ -110,29 +110,30 @@ data|object|数据对象|-
 
 **content解密参数:**
 
-参数名称 |参数类型|备注|其它
----|---|---|---
-rabbmitInfo|Object|rabbmit相关链接信息|-
- downTopicFilter|String|下行队列topic|-
- uploadTopicFilter|String|上行队列topic|-
- username|String|rabbmit用户名|-
- password|String|rabbmit密码|-
- host|String|ip|-
- port|String|端口|-
- virtualHost|String|虚拟机|-
- exchangeName|String|交换机名称|-
- messageTtl|String|队列消息超时时间，毫秒|-
-serviceInfo|Object|服务接口连接信息|-
- homeUrl|String|首页|-
- serverUrl|String|前端服务接口地址|-
-deviceInfo|Object|设备基础信息|-
- siteId|Long|站点ID|-
- siteCode|String|站点编码|-
- siteName|String|站点名称|-
- productId|Long|设备产品类型Id|-
- productName|String|设备产品类型|-
- enabled|Integer|设备启用状态 (0.停止，1.启用)|-
- source|Integer|设备来源,默认1(0.旧设备，1.新设备)|-
+参数名称 |参数类型| 备注                    |其它
+---|---|-----------------------|---
+rabbmitInfo|Object| rabbmit相关链接信息         |-
+ downTopicFilter|String| 下行队列topic             |-
+ uploadTopicFilter|String| 上行队列topic             |-
+ username|String| rabbmit用户名            |-
+ password|String| rabbmit密码             |-
+ host|String| ip                    |-
+ port|String| 端口                    |-
+ virtualHost|String| 虚拟机                   |-
+ exchangeName|String| 交换机名称                 |-
+ messageTtl|String| 队列消息超时时间，毫秒           |-
+serviceInfo|Object| 服务接口连接信息              |-
+ homeUrl|String| 首页                    |-
+ eventUrl|String| 事件地址                  |-
+ serverUrl|String| 前端服务接口地址              |-
+deviceInfo|Object| 设备基础信息                |-
+ siteId|Long| 站点ID                  |-
+ siteCode|String| 站点编码                  |-
+ siteName|String| 站点名称                  |-
+ productId|Long| 设备产品类型Id              |-
+ productName|String| 设备产品类型                |-
+ enabled|Integer| 设备启用状态 (0.停止，1.启用)    |-
+ source|Integer| 设备来源,默认1(0.旧设备，1.新设备) |-
 
 
 
@@ -297,7 +298,7 @@ data|object|数据对象|-
 **content解密参数:**
 
 参数名称 |参数类型|备注|其它
----|---|---|---
+---|---|--|---
 rabbmitInfo|Object|rabbmit相关链接信息|-
  downTopicFilter|String|下行队列topic|-
  uploadTopicFilter|String|上行队列topic|-
@@ -313,6 +314,7 @@ serviceInfo|Object|服务接口连接信息|-
  serverUrl|String|前端服务接口地址|-
 serviceInfo|Object|服务接口连接信息|-
  homeUrl|String|首页|-
+ eventUrl|String|事件地址|-
  serverUrl|String|前端服务接口地址|-
 deviceInfo|Object|设备基础信息|-
  siteId|Long|站点ID|-